4.2.8-ckt3 -stable review patch. If anyone has any objections, please let me
know.
---8<------------------------------------------------------------
From: Vitaly Kuznetsov <vkuzn...@redhat.com>
commit 7625b3a0007decf2b135cb47ca67abc78a7b1bc1 upstream.
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 <ying.hu...@linux.intel.com>
Signed-off-by: Vitaly Kuznetsov <vkuzn...@redhat.com>
Cc: HATAYAMA Daisuke <d.hatay...@jp.fujitsu.com>
Cc: Masami Hiramatsu <masami.hiramatsu...@hitachi.com>
Cc: Jiri Kosina <jkos...@suse.cz>
Cc: Baoquan He <b...@redhat.com>
Cc: Prarit Bhargava <pra...@redhat.com>
Cc: Xie XiuQi <xiexi...@huawei.com>
Cc: Seth Jennings <sjenn...@redhat.com>
Cc: "K. Y. Srinivasan" <k...@microsoft.com>
Cc: Jan Kara <j...@suse.cz>
Cc: Petr Mladek <pmla...@suse.cz>
Cc: Yasuaki Ishimatsu <isimatu.yasu...@jp.fujitsu.com>
Signed-off-by: Andrew Morton <a...@linux-foundation.org>
Signed-off-by: Linus Torvalds <torva...@linux-foundation.org>
[ kamal: 4.2-stable prereq for
8d91f8b printk: do cond_resched() between lines while outputting to consoles ]
Signed-off-by: Kamal Mostafa <ka...@canonical.com>
---
kernel/panic.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/kernel/panic.c b/kernel/panic.c
index 4579dbb..4b150bc 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -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();
--
1.9.1
