]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
lib/bug.c: make panic_on_warn available for all architectures
authorHeiko Carstens <heiko.carstens@de.ibm.com>
Thu, 17 Mar 2016 21:21:38 +0000 (14:21 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 17 Mar 2016 22:09:34 +0000 (15:09 -0700)
Christian Borntraeger reported that panic_on_warn doesn't have any
effect on s390.

The panic_on_warn feature was introduced with 9e3961a09798 ("kernel: add
panic_on_warn").  However it did care only for the case when
WANT_WARN_ON_SLOWPATH is defined.  This is turn is only the case for
architectures which do not have an own __WARN_TAINT defined.

Other architectures which do have __WARN_TAINT defined call report_bug()
for warnings within lib/bug.c which does not call panic() in case
panic_on_warn is set.

Let's simply enable the panic_on_warn feature by adding the same code
like it was added to warn_slowpath_common() in panic.c.

This enables panic_on_warn also for arm64, parisc, powerpc, s390 and sh.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Reported-by: Christian Borntraeger <borntraeger@de.ibm.com>
Tested-by: Christian Borntraeger <borntraeger@de.ibm.com>
Acked-by: Prarit Bhargava <prarit@redhat.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
Cc: Helge Deller <deller@gmx.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Tested-by: Michael Ellerman <mpe@ellerman.id.au> (powerpc)
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
lib/bug.c

index cff145f032a550ff1703208cbadc033e2a6336b6..6cde380f09deac9c271adcd61951eed6666bba27 100644 (file)
--- a/lib/bug.c
+++ b/lib/bug.c
@@ -175,6 +175,17 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
                        pr_warn("WARNING: at %p [verbose debug info unavailable]\n",
                                (void *)bugaddr);
 
+               if (panic_on_warn) {
+                       /*
+                        * This thread may hit another WARN() in the panic path.
+                        * Resetting this prevents additional WARN() from
+                        * panicking the system on this thread.  Other threads
+                        * are blocked by the panic_mutex in panic().
+                        */
+                       panic_on_warn = 0;
+                       panic("panic_on_warn set ...\n");
+               }
+
                print_modules();
                show_regs(regs);
                print_oops_end_marker();