Commit 5e7de581 authored Apr 19, 2020 by Linus Torvalds

Merge tag 'core-urgent-2020-04-19' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull RCU fix from Thomas Gleixner:
 "A single bugfix for RCU to prevent taking a lock in NMI context"

* tag 'core-urgent-2020-04-19' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  rcu: Don't acquire lock in NMI handler in rcu_nmi_enter_common()

parents 439f1da9 40e7d7bd

kernel/rcu/tree.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -825,7 +825,7 @@ static __always_inline void rcu_nmi_enter_common(bool irq)
		rcu_cleanup_after_idle();

		incby = 1;
		} else if (tick_nohz_full_cpu(rdp->cpu) &&
		} else if (irq && tick_nohz_full_cpu(rdp->cpu) &&
		rdp->dynticks_nmi_nesting == DYNTICK_IRQ_NONIDLE &&
		READ_ONCE(rdp->rcu_urgent_qs) &&
		!READ_ONCE(rdp->rcu_forced_tick)) {

Admin message