]> git.baikalelectronics.ru Git - kernel.git/commit
locking/lockdep: Fix TRACE_IRQFLAGS vs. NMIs
authorpeterz@infradead.org <peterz@infradead.org>
Mon, 27 Jul 2020 12:48:52 +0000 (14:48 +0200)
committerIngo Molnar <mingo@kernel.org>
Mon, 27 Jul 2020 13:13:29 +0000 (15:13 +0200)
commit166add0845e612f3c7f3397c2324e69be695a419
tree64882e5a738ab148341521d4ac598038ce8afd81
parent68e0860a4838c0b9bd05653e84d09e169f6e6f6c
locking/lockdep: Fix TRACE_IRQFLAGS vs. NMIs

Prior to commit:

  460e7f8d66ab ("lockdep: Prepare for NMI IRQ state tracking")

IRQ state tracking was disabled in NMIs due to nmi_enter()
doing lockdep_off() -- with the obvious requirement that NMI entry
call nmi_enter() before trace_hardirqs_off().

[ AFAICT, PowerPC and SH violate this order on their NMI entry ]

However, that commit explicitly changed lockdep_hardirqs_*() to ignore
lockdep_off() and breaks every architecture that has irq-tracing in
it's NMI entry that hasn't been fixed up (x86 being the only fixed one
at this point).

The reason for this change is that by ignoring lockdep_off() we can:

  - get rid of 'current->lockdep_recursion' in lockdep_assert_irqs*()
    which was going to to give header-recursion issues with the
    seqlock rework.

  - allow these lockdep_assert_*() macros to function in NMI context.

Restore the previous state of things and allow an architecture to
opt-in to the NMI IRQ tracking support, however instead of relying on
lockdep_off(), rely on in_nmi(), both are part of nmi_enter() and so
over-all entry ordering doesn't need to change.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20200727124852.GK119549@hirez.programming.kicks-ass.net
arch/x86/Kconfig.debug
kernel/locking/lockdep.c
lib/Kconfig.debug