Skip to content

Commit 5fd4551

Browse files
paulmckgregkh
authored andcommitted
rcu: Allow for page faults in NMI handlers
commit 28585a832602747cbfa88ad8934013177a3aae38 upstream. A number of architecture invoke rcu_irq_enter() on exception entry in order to allow RCU read-side critical sections in the exception handler when the exception is from an idle or nohz_full CPU. This works, at least unless the exception happens in an NMI handler. In that case, rcu_nmi_enter() would already have exited the extended quiescent state, which would mean that rcu_irq_enter() would (incorrectly) cause RCU to think that it is again in an extended quiescent state. This will in turn result in lockdep splats in response to later RCU read-side critical sections. This commit therefore causes rcu_irq_enter() and rcu_irq_exit() to take no action if there is an rcu_nmi_enter() in effect, thus avoiding the unscheduled return to RCU quiescent state. This in turn should make the kernel safe for on-demand RCU voyeurism. Link: http://lkml.kernel.org/r/20170922211022.GA18084@linux.vnet.ibm.com Cc: stable@vger.kernel.org Fixes: 0be964b ("module: Sanitize RCU usage and locking") Reported-by: Steven Rostedt <rostedt@goodmis.org> Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 45bd4e4 commit 5fd4551

1 file changed

Lines changed: 12 additions & 0 deletions

File tree

kernel/rcu/tree.c

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -759,6 +759,12 @@ void rcu_irq_exit(void)
759759

760760
local_irq_save(flags);
761761
rdtp = this_cpu_ptr(&rcu_dynticks);
762+
763+
/* Page faults can happen in NMI handlers, so check... */
764+
if (READ_ONCE(rdtp->dynticks_nmi_nesting))
765+
return;
766+
767+
RCU_LOCKDEP_WARN(!irqs_disabled(), "rcu_irq_exit() invoked with irqs enabled!!!");
762768
oldval = rdtp->dynticks_nesting;
763769
rdtp->dynticks_nesting--;
764770
WARN_ON_ONCE(IS_ENABLED(CONFIG_RCU_EQS_DEBUG) &&
@@ -887,6 +893,12 @@ void rcu_irq_enter(void)
887893

888894
local_irq_save(flags);
889895
rdtp = this_cpu_ptr(&rcu_dynticks);
896+
897+
/* Page faults can happen in NMI handlers, so check... */
898+
if (READ_ONCE(rdtp->dynticks_nmi_nesting))
899+
return;
900+
901+
RCU_LOCKDEP_WARN(!irqs_disabled(), "rcu_irq_enter() invoked with irqs enabled!!!");
890902
oldval = rdtp->dynticks_nesting;
891903
rdtp->dynticks_nesting++;
892904
WARN_ON_ONCE(IS_ENABLED(CONFIG_RCU_EQS_DEBUG) &&

0 commit comments

Comments
 (0)