lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 407/917] rcu: Fix rcu_dynticks_curr_cpu_in_eqs() vs noinstr
    Date
    From: Peter Zijlstra <peterz@infradead.org>

    [ Upstream commit 74aece72f95f399dd29363669dc32a1344c8fab4 ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    kernel/rcu/tree.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
    index bce848e50512e..bdd1dc6de71ab 100644
    --- a/kernel/rcu/tree.c
    +++ b/kernel/rcu/tree.c
    @@ -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);
    }

    /*
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-16 00:39    [W:4.755 / U:1.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site