summaryrefslogtreecommitdiff
path: root/include/linux/debug_locks.h
diff options
context:
space:
mode:
authorPeter Zijlstra <peterz@infradead.org>2021-06-21 14:12:38 +0300
committerIngo Molnar <mingo@kernel.org>2021-06-22 14:56:43 +0300
commit49faa77759b211fff344898edc23bb780707fff5 (patch)
tree9f36b8c797c3f312f08e12634ec2cdbafb6f0a95 /include/linux/debug_locks.h
parent1f008d46f1243899d27fd034ab5c41985bd16cee (diff)
downloadlinux-49faa77759b211fff344898edc23bb780707fff5.tar.xz
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
Diffstat (limited to 'include/linux/debug_locks.h')
-rw-r--r--include/linux/debug_locks.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/debug_locks.h b/include/linux/debug_locks.h
index 2915f56ad421..edb5c186b0b7 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; \