Skip to content

Commit

Permalink
rcu: Allow rcu_irq_enter_check_tick() from NMI
Browse files Browse the repository at this point in the history
[ Upstream commit 6dbce04 ]

Eugenio managed to tickle #PF from NMI context which resulted in
hitting a WARN in RCU through irqentry_enter() ->
__rcu_irq_enter_check_tick().

However, this situation is perfectly sane and does not warrant an
WARN. The #PF will (necessarily) be atomic and not require messing
with the tick state, so early return is correct.  This commit
therefore removes the WARN.

Fixes: aaf2bc5 ("rcu: Abstract out rcu_irq_enter_check_tick() from rcu_nmi_enter()")
Reported-by: "Eugenio Pérez" <eupm90@gmail.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Andy Lutomirski <luto@kernel.org>
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Peter Zijlstra authored and gregkh committed Dec 30, 2020
1 parent bbab483 commit 4540e84
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions kernel/rcu/tree.c
Expand Up @@ -928,8 +928,8 @@ void __rcu_irq_enter_check_tick(void)
{
struct rcu_data *rdp = this_cpu_ptr(&rcu_data);

// Enabling the tick is unsafe in NMI handlers.
if (WARN_ON_ONCE(in_nmi()))
// If we're here from NMI there's nothing to do.
if (in_nmi())
return;

RCU_LOCKDEP_WARN(rcu_dynticks_curr_cpu_in_eqs(),
Expand Down

0 comments on commit 4540e84

Please sign in to comment.