Re: [PATCH] lockdep: Noinstr annotate warn_bogus_irq_restore()
From: Mark Rutland <mark.rutland@arm.com>
Date: 2021-02-09 16:14:40
Also in:
lkml
On Tue, Feb 09, 2021 at 05:03:46PM +0100, Peter Zijlstra wrote:
On Tue, Feb 09, 2021 at 01:24:30PM +0000, Mark Rutland wrote:quoted
On Tue, Feb 09, 2021 at 09:34:10AM +0100, Peter Zijlstra wrote:quoted
Subject: lockdep: Noinstr annotate warn_bogus_irq_restore() From: Peter Zijlstra <peterz@infradead.org> Date: Tue Feb 9 09:30:03 CET 2021 vmlinux.o: warning: objtool: lock_is_held_type()+0x107: call to warn_bogus_irq_restore() leaves .noinstr.text section As per the general rule that WARNs are allowed to violate noinstr to get out, annotate it away. Fixes: 997acaf6b4b5 ("lockdep: report broken irq restoration") Reported-by: Randy Dunlap <rdunlap@infradead.org> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>Whoops; sorry for missing that! Acked-by: Mark Rutland <mark.rutland@arm.com>This runs into sodding header hell on mips (and possibly others) How's this then?
Looks fine to me, FWIW. Mark.
quoted hunk ↗ jump to hunk
--- Subject: lockdep: Noinstr annotate warn_bogus_irq_restore() From: Peter Zijlstra <peterz@infradead.org> Date: Tue Feb 9 09:30:03 CET 2021 vmlinux.o: warning: objtool: lock_is_held_type()+0x107: call to warn_bogus_irq_restore() leaves .noinstr.text section As per the general rule that WARNs are allowed to violate noinstr to get out, annotate it away. Fixes: 997acaf6b4b5 ("lockdep: report broken irq restoration") Reported-by: Randy Dunlap <rdunlap@infradead.org> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Acked-by: Mark Rutland <mark.rutland@arm.com> --- include/linux/irqflags.h | 5 ++++- kernel/locking/irqflag-debug.c | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-)--- a/kernel/locking/irqflag-debug.c +++ b/kernel/locking/irqflag-debug.c@@ -4,8 +4,10 @@ #include <linux/export.h> #include <linux/irqflags.h> -void warn_bogus_irq_restore(void) +noinstr void warn_bogus_irq_restore(void) { + instrumentation_begin(); WARN_ONCE(1, "raw_local_irq_restore() called with IRQs enabled\n"); + instrumentation_end(); } EXPORT_SYMBOL(warn_bogus_irq_restore);