Skip to contentSkip to conversation

panic: turn off locks debug before releasing console lock

PATCH New Vitaly Kuznetsov 1 participant 1 message Nov 16, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 panic: turn off locks debug before releasing console lock

Commit 08d78658f393 ("panic: release stale console lock to always get the logbuf printed out") introduced unwanted bad unlock balance report when panic() is called directly and not from OOPS (e.g. from out_of_memory()). The difference is that in case of OOPS we disable locks debug in oops_enter() and on direct panic call nobody does that.

Fixes 08d78658f393 ("panic: release stale console lock to always get the logbuf printed out")
Cc HATAYAMA Daisuke <[email protected]>
Cc Masami Hiramatsu <[email protected]>
Cc Jiri Kosina <[email protected]>
Cc Baoquan He <[email protected]>
Cc Prarit Bhargava <[email protected]>
Cc Xie XiuQi <[email protected]>
Cc Seth Jennings <[email protected]>
Cc "K. Y. Srinivasan" <[email protected]>
Cc Jan Kara <[email protected]>
Cc Petr Mladek <[email protected]>
Cc Yasuaki Ishimatsu <[email protected]>

---
The original plan was to replace this patch with less hackish implementation from Jan's "printk: Softlockup avoidance" series but it seems it didn't get merged in 4.4 so we still need some band-aid for now.

---
 kernel/panic.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
kernel/panic.c +4 -1
index 4579dbb..4b150bc 100644
@@ -152,8 +152,11 @@ void panic(const char *fmt, ...)
 	 * We may have ended up stopping the CPU holding the lock (in
 	 * smp_send_stop()) while still having some valuable data in the console
 	 * buffer.  Try to acquire the lock then release it regardless of the
-	 * result.  The release will also print the buffers out.
+	 * result.  The release will also print the buffers out.  Locks debug
+	 * should be disabled to avoid reporting bad unlock balance when
+	 * panic() is not being callled from OOPS.
 	 */
+	debug_locks_off();
 	console_trylock();
 	console_unlock();
 
Signature · 1 line
2.4.3