Commit 8211e922 authored by Liu Song's avatar Liu Song Committed by Paul E. McKenney
Browse files

rcu: Use per_cpu_ptr to get the pointer of per_cpu variable 



There are a few remaining locations in kernel/rcu that still use
"&per_cpu()".  This commit replaces them with "per_cpu_ptr(&)", and does
not introduce any functional change.

Reviewed-by: default avatarUladzislau Rezki (Sony) <urezki@gmail.com>
Reviewed-by: default avatarNeeraj Upadhyay <neeraju@codeaurora.org>
Reviewed-by: default avatarJoel Fernandes (Google) <joel@joelfernandes.org>
Signed-off-by: default avatarLiu Song <liu.song11@zte.com.cn>
Signed-off-by: default avatarPaul E. McKenney <paulmck@kernel.org>
parent eb880949

kernel/rcu/tasks.h

+1 −1
Original line number Diff line number Diff line
@@ -920,7 +920,7 @@ static void trc_read_check_handler(void *t_in) 
	// Allow future IPIs to be sent on CPU and for task.

	// Also order this IPI handler against any later manipulations of

	// the intended task.

	smp_store_release(&per_cpu(trc_ipi_to_cpu, smp_processor_id()), false); // ^^^

	smp_store_release(per_cpu_ptr(&trc_ipi_to_cpu, smp_processor_id()), false); // ^^^

	smp_store_release(&texp->trc_ipi_to_cpu, -1); // ^^^

}

kernel/rcu/tree.c

+1 −1
Original line number Diff line number Diff line
@@ -1286,7 +1286,7 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp) 
	 */

	jtsq = READ_ONCE(jiffies_to_sched_qs);

	ruqp = per_cpu_ptr(&rcu_data.rcu_urgent_qs, rdp->cpu);

	rnhqp = &per_cpu(rcu_data.rcu_need_heavy_qs, rdp->cpu);

	rnhqp = per_cpu_ptr(&rcu_data.rcu_need_heavy_qs, rdp->cpu);

	if (!READ_ONCE(*rnhqp) &&

	    (time_after(jiffies, rcu_state.gp_start + jtsq * 2) ||

	     time_after(jiffies, rcu_state.jiffies_resched) ||

kernel/rcu/tree_stall.h

+1 −1
Original line number Diff line number Diff line
@@ -351,7 +351,7 @@ static void rcu_dump_cpu_stacks(void) 


static void print_cpu_stall_fast_no_hz(char *cp, int cpu)

{

	struct rcu_data *rdp = &per_cpu(rcu_data, cpu);

	struct rcu_data *rdp = per_cpu_ptr(&rcu_data, cpu);



	sprintf(cp, "last_accelerate: %04lx/%04lx dyntick_enabled: %d",

		rdp->last_accelerate & 0xffff, jiffies & 0xffff,