rcu: Fix rcu_dynticks_curr_cpu_in_eqs() vs noinstr
authorPeter Zijlstra <peterz@infradead.org>
Tue, 28 Sep 2021 08:40:22 +0000 (10:40 +0200)
committerPaul E. McKenney <paulmck@kernel.org>
Thu, 7 Oct 2021 17:00:07 +0000 (10:00 -0700)
  vmlinux.o: warning: objtool: rcu_nmi_enter()+0x36: call to __kasan_check_read() leaves .noinstr.text section

noinstr cannot have atomic_*() functions in because they're explicitly
annotated, use arch_atomic_*().

Fixes: 2be57f732889 ("rcu: Weaken ->dynticks accesses and updates")
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
kernel/rcu/tree.c

index 6a1e9d3..ef8d36f 100644 (file)
@@ -327,7 +327,7 @@ static void rcu_dynticks_eqs_online(void)
  */
 static __always_inline bool rcu_dynticks_curr_cpu_in_eqs(void)
 {
-       return !(atomic_read(this_cpu_ptr(&rcu_data.dynticks)) & 0x1);
+       return !(arch_atomic_read(this_cpu_ptr(&rcu_data.dynticks)) & 0x1);
 }
 
 /*