From: Vitaly Kuznetsov Date: Fri, 20 Nov 2015 23:57:24 +0000 (-0800) Subject: kernel/panic.c: turn off locks debug before releasing console lock X-Git-Tag: v4.1.12-92~150^2~291 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6c0666b1096af6beaf8ffcf90f72b0ed692b6d06;p=users%2Fjedix%2Flinux-maple.git kernel/panic.c: turn off locks debug before releasing console lock Orabug: 23330642 [ Upstream commit 7625b3a0007decf2b135cb47ca67abc78a7b1bc1 ] Commit 08d78658f393 ("panic: release stale console lock to always get the logbuf printed out") introduced an 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") Reported-by: kernel test robot Signed-off-by: Vitaly Kuznetsov Cc: HATAYAMA Daisuke Cc: Masami Hiramatsu Cc: Jiri Kosina Cc: Baoquan He Cc: Prarit Bhargava Cc: Xie XiuQi Cc: Seth Jennings Cc: "K. Y. Srinivasan" Cc: Jan Kara Cc: Petr Mladek Cc: Yasuaki Ishimatsu Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin (cherry picked from commit 0e19e24c3fe0abde8e2c5f4543616a251ccea6bf) Signed-off-by: Dan Duval --- diff --git a/kernel/panic.c b/kernel/panic.c index dae109ea89eb..466c16f8190d 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -151,8 +151,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();