From: "tip-bot2 for Peter Zijlstra" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: "Peter Zijlstra (Intel)" <peterz@infradead.org>,
Ingo Molnar <mingo@kernel.org>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: objtool/urgent] locking/lockdep: Improve noinstr vs errors
Date: Tue, 22 Jun 2021 12:03:37 -0000 [thread overview]
Message-ID: <162436341730.395.6717706594403277990.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20210621120120.784404944@infradead.org>
The following commit has been merged into the objtool/urgent branch of tip:
Commit-ID: 49faa77759b211fff344898edc23bb780707fff5
Gitweb: https://git.kernel.org/tip/49faa77759b211fff344898edc23bb780707fff5
Author: Peter Zijlstra <peterz@infradead.org>
AuthorDate: Mon, 21 Jun 2021 13:12:38 +02:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Tue, 22 Jun 2021 13:56:43 +02:00
locking/lockdep: Improve noinstr vs errors
Better handle the failure paths.
vmlinux.o: warning: objtool: debug_locks_off()+0x23: call to console_verbose() leaves .noinstr.text section
vmlinux.o: warning: objtool: debug_locks_off()+0x19: call to __kasan_check_write() leaves .noinstr.text section
debug_locks_off+0x19/0x40:
instrument_atomic_write at include/linux/instrumented.h:86
(inlined by) __debug_locks_off at include/linux/debug_locks.h:17
(inlined by) debug_locks_off at lib/debug_locks.c:41
Fixes: 6eebad1ad303 ("lockdep: __always_inline more for noinstr")
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20210621120120.784404944@infradead.org
---
include/linux/debug_locks.h | 2 ++
kernel/locking/lockdep.c | 4 +++-
lib/debug_locks.c | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/include/linux/debug_locks.h b/include/linux/debug_locks.h
index 2915f56..edb5c18 100644
--- a/include/linux/debug_locks.h
+++ b/include/linux/debug_locks.h
@@ -27,8 +27,10 @@ extern int debug_locks_off(void);
int __ret = 0; \
\
if (!oops_in_progress && unlikely(c)) { \
+ instrumentation_begin(); \
if (debug_locks_off() && !debug_locks_silent) \
WARN(1, "DEBUG_LOCKS_WARN_ON(%s)", #c); \
+ instrumentation_end(); \
__ret = 1; \
} \
__ret; \
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index 7641bd4..e323130 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -843,7 +843,7 @@ static int count_matching_names(struct lock_class *new_class)
}
/* used from NMI context -- must be lockless */
-static __always_inline struct lock_class *
+static noinstr struct lock_class *
look_up_lock_class(const struct lockdep_map *lock, unsigned int subclass)
{
struct lockdep_subclass_key *key;
@@ -851,12 +851,14 @@ look_up_lock_class(const struct lockdep_map *lock, unsigned int subclass)
struct lock_class *class;
if (unlikely(subclass >= MAX_LOCKDEP_SUBCLASSES)) {
+ instrumentation_begin();
debug_locks_off();
printk(KERN_ERR
"BUG: looking up invalid subclass: %u\n", subclass);
printk(KERN_ERR
"turning off the locking correctness validator.\n");
dump_stack();
+ instrumentation_end();
return NULL;
}
diff --git a/lib/debug_locks.c b/lib/debug_locks.c
index 06d3135..a75ee30 100644
--- a/lib/debug_locks.c
+++ b/lib/debug_locks.c
@@ -36,7 +36,7 @@ EXPORT_SYMBOL_GPL(debug_locks_silent);
/*
* Generic 'turn off all lock debugging' function:
*/
-noinstr int debug_locks_off(void)
+int debug_locks_off(void)
{
if (debug_locks && __debug_locks_off()) {
if (!debug_locks_silent) {
next prev parent reply other threads:[~2021-06-22 12:03 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-21 11:12 [RFC][PATCH 00/18] objtool/x86: noinstr vs PARAVIRT Peter Zijlstra
2021-06-21 11:12 ` [PATCH 01/18] x86/entry: Fix noinstr fail in __do_fast_syscall_32() Peter Zijlstra
2021-06-22 12:03 ` [tip: objtool/urgent] " tip-bot2 for Peter Zijlstra
2021-06-21 11:12 ` [PATCH 02/18] x86/xen: Fix noinstr fail in xen_pv_evtchn_do_upcall() Peter Zijlstra
2021-06-22 12:03 ` [tip: objtool/urgent] " tip-bot2 for Peter Zijlstra
2021-06-21 11:12 ` [PATCH 03/18] x86/xen: Fix noinstr fail in exc_xen_unknown_trap() Peter Zijlstra
2021-06-22 12:03 ` [tip: objtool/urgent] " tip-bot2 for Peter Zijlstra
2021-06-21 11:12 ` [PATCH 04/18] x86: Always inline task_size_max() Peter Zijlstra
2021-06-22 12:03 ` [tip: objtool/urgent] " tip-bot2 for Peter Zijlstra
2021-06-21 11:12 ` [PATCH 05/18] locking/lockdep: Improve noinstr vs errors Peter Zijlstra
2021-06-22 12:03 ` tip-bot2 for Peter Zijlstra [this message]
2021-06-21 11:12 ` [RFC][PATCH 06/18] x86/paravirt: Mark arch_local_irq_*() __always_inline Peter Zijlstra
2021-06-21 11:12 ` [RFC][PATCH 07/18] x86/paravirt: Use PVOP_* for paravirt calls Peter Zijlstra
2021-06-21 11:12 ` [RFC][PATCH 08/18] x86/xen: Make read_cr2() noinstr Peter Zijlstra
2021-06-21 11:12 ` [RFC][PATCH 09/18] x86/xen: Make write_cr2() noinstr Peter Zijlstra
2021-06-21 11:12 ` [RFC][PATCH 10/18] x86/xen: Make get_debugreg() noinstr Peter Zijlstra
2021-06-21 11:12 ` [RFC][PATCH 11/18] x86/xen: Make set_debugreg() noinstr Peter Zijlstra
2021-06-21 11:12 ` [RFC][PATCH 12/18] x86/xen: Make save_fl() noinstr Peter Zijlstra
2021-06-21 11:12 ` [RFC][PATCH 13/18] x86/xen: Make hypercall_page noinstr Peter Zijlstra
2021-06-21 11:12 ` [RFC][PATCH 14/18] x86/xen: Make irq_enable() noinstr Peter Zijlstra
2021-06-21 11:12 ` [RFC][PATCH 15/18] x86/xen: Make irq_disable() noinstr Peter Zijlstra
2021-06-21 11:12 ` [RFC][PATCH 16/18] x86/xen: Mark xen_force_evtchn_callback() noinstr Peter Zijlstra
2021-06-21 11:12 ` [RFC][PATCH 17/18] x86/xen: Rework the xen_{cpu,irq,mmu}_ops[] arrays Peter Zijlstra
2021-06-21 11:12 ` [RFC][PATCH 18/18] objtool: Support pv_opsindirect calls for noinstr Peter Zijlstra
2021-06-21 13:17 ` [RFC][PATCH 00/18] objtool/x86: noinstr vs PARAVIRT Ingo Molnar
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=162436341730.395.6717706594403277990.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@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).