From: "tip-bot2 for Peter Zijlstra" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Randy Dunlap <rdunlap@infradead.org>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>,
Mark Rutland <mark.rutland@arm.com>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: locking/core] lockdep: Noinstr annotate warn_bogus_irq_restore()
Date: Wed, 10 Feb 2021 13:59:25 -0000 [thread overview]
Message-ID: <161296556600.23325.14185228723423902592.tip-bot2@tip-bot2> (raw)
In-Reply-To: <YCKyYg53mMp4E7YI@hirez.programming.kicks-ass.net>
The following commit has been merged into the locking/core branch of tip:
Commit-ID: c8cc7e853192d520ab6a5957f5081034103587ae
Gitweb: https://git.kernel.org/tip/c8cc7e853192d520ab6a5957f5081034103587ae
Author: Peter Zijlstra <peterz@infradead.org>
AuthorDate: Tue, 09 Feb 2021 09:30:03 +01:00
Committer: Peter Zijlstra <peterz@infradead.org>
CommitterDate: Wed, 10 Feb 2021 14:44:39 +01:00
lockdep: Noinstr annotate warn_bogus_irq_restore()
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>
Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested
Link: https://lkml.kernel.org/r/YCKyYg53mMp4E7YI@hirez.programming.kicks-ass.net
---
kernel/locking/irqflag-debug.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/kernel/locking/irqflag-debug.c b/kernel/locking/irqflag-debug.c
index 9603d20..810b503 100644
--- 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);
next prev parent reply other threads:[~2021-02-10 14:02 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-08 12:52 linux-next: Tree for Feb 8 Stephen Rothwell
2021-02-08 19:30 ` linux-next: Tree for Feb 8 (objtool: warnings: 5) Randy Dunlap
2021-02-08 21:21 ` Josh Poimboeuf
2021-02-08 21:39 ` Randy Dunlap
2021-02-09 22:59 ` Josh Poimboeuf
2021-02-10 0:16 ` Randy Dunlap
2021-02-09 8:06 ` Peter Zijlstra
2021-02-09 23:23 ` [PATCH] ubsan: remove overflow checks Andrey Ryabinin
2021-02-10 0:19 ` Kees Cook
2021-02-10 7:50 ` Peter Zijlstra
2021-02-10 11:55 ` Andrey Rybainin
2021-02-09 8:34 ` [PATCH] lockdep: Noinstr annotate warn_bogus_irq_restore() Peter Zijlstra
2021-02-09 13:24 ` Mark Rutland
2021-02-09 16:03 ` Peter Zijlstra
2021-02-09 16:13 ` Mark Rutland
2021-02-09 18:28 ` Randy Dunlap
2021-02-10 13:59 ` tip-bot2 for Peter Zijlstra [this message]
2021-02-09 3:33 ` linux-next: Tree for Feb 8 (Warning at arch/x86/kernel/irq.c:390) Randy Dunlap
2021-02-09 10:17 ` Borislav Petkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=161296556600.23325.14185228723423902592.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=peterz@infradead.org \
--cc=rdunlap@infradead.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).