rcu: Switch force_qs_rnp() to for_each_leaf_node_cpu_mask() (7441e766) · Commits · 戴 / test

Currently, force_qs_rnp() uses a for_each_leaf_node_possible_cpu() loop containing a check of the current CPU's bit in ->qsmask. This works, but this commit saves three lines by instead using for_each_leaf_node_cpu_mask(), which combines the functionality of for_each_leaf_node_possible_cpu() and leaf_node_cpu_bit(). This commit also replaces the use of the local variable "bit" with rdp->grpmask. Signed-off-by:

Paul E. McKenney <paulmck@kernel.org>

kernel/rcu/tree.c

+5 −8

Original line number	Diff line number	Diff line
		@@ -2298,16 +2298,13 @@ static void force_qs_rnp(int (f)(struct rcu_data rdp))
		raw_spin_unlock_irqrestore_rcu_node(rnp, flags);
		continue;
		}
		for_each_leaf_node_possible_cpu(rnp, cpu) {
		unsigned long bit = leaf_node_cpu_bit(rnp, cpu);
		if ((rnp->qsmask & bit) != 0) {
		for_each_leaf_node_cpu_mask(rnp, cpu, rnp->qsmask) {
		rdp = per_cpu_ptr(&rcu_data, cpu);
		if (f(rdp)) {
		mask \|= bit;
		mask \|= rdp->grpmask;
		rcu_disable_urgency_upon_qs(rdp);
		}
		}
		}
		if (mask != 0) {
		/* Idle/offline CPUs, report (releases rnp->lock). */
		rcu_report_qs_rnp(mask, rnp, rnp->gp_seq, flags);

Admin message