From c7560fd0e0b5aba307a9cd5e9eb7c998a059c8a4 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Thu, 5 May 2022 16:16:40 +0200 Subject: qemu: set panic_on_warn=1 from cmdline Rather than setting this once init is running, set panic_on_warn from the kernel command line, so that it catches splats from WireGuard initialization code and the various crypto selftests. Signed-off-by: Jason A. Donenfeld --- src/tests/qemu/arch/aarch64.config | 2 +- src/tests/qemu/arch/aarch64_be.config | 2 +- src/tests/qemu/arch/arm.config | 2 +- src/tests/qemu/arch/armeb.config | 2 +- src/tests/qemu/arch/i686.config | 2 +- src/tests/qemu/arch/m68k.config | 2 +- src/tests/qemu/arch/mips.config | 2 +- src/tests/qemu/arch/mips64.config | 2 +- src/tests/qemu/arch/mips64el.config | 2 +- src/tests/qemu/arch/mipsel.config | 2 +- src/tests/qemu/arch/powerpc.config | 2 +- src/tests/qemu/arch/powerpc64le.config | 2 +- src/tests/qemu/arch/x86_64.config | 2 +- src/tests/qemu/init.c | 6 ------ 14 files changed, 13 insertions(+), 19 deletions(-) diff --git a/src/tests/qemu/arch/aarch64.config b/src/tests/qemu/arch/aarch64.config index e9ac41f..0901688 100644 --- a/src/tests/qemu/arch/aarch64.config +++ b/src/tests/qemu/arch/aarch64.config @@ -4,5 +4,5 @@ CONFIG_VIRTIO_MENU=y CONFIG_VIRTIO_MMIO=y CONFIG_VIRTIO_CONSOLE=y CONFIG_CMDLINE_BOOL=y -CONFIG_CMDLINE="console=ttyAMA0 wg.success=vport0p1" +CONFIG_CMDLINE="console=ttyAMA0 wg.success=vport0p1 panic_on_warn=1" CONFIG_FRAME_WARN=1280 diff --git a/src/tests/qemu/arch/aarch64_be.config b/src/tests/qemu/arch/aarch64_be.config index 03609a2..19ff66e 100644 --- a/src/tests/qemu/arch/aarch64_be.config +++ b/src/tests/qemu/arch/aarch64_be.config @@ -5,5 +5,5 @@ CONFIG_VIRTIO_MENU=y CONFIG_VIRTIO_MMIO=y CONFIG_VIRTIO_CONSOLE=y CONFIG_CMDLINE_BOOL=y -CONFIG_CMDLINE="console=ttyAMA0 wg.success=vport0p1" +CONFIG_CMDLINE="console=ttyAMA0 wg.success=vport0p1 panic_on_warn=1" CONFIG_FRAME_WARN=1280 diff --git a/src/tests/qemu/arch/arm.config b/src/tests/qemu/arch/arm.config index c616124..fc7959b 100644 --- a/src/tests/qemu/arch/arm.config +++ b/src/tests/qemu/arch/arm.config @@ -8,5 +8,5 @@ CONFIG_VIRTIO_MENU=y CONFIG_VIRTIO_MMIO=y CONFIG_VIRTIO_CONSOLE=y CONFIG_CMDLINE_BOOL=y -CONFIG_CMDLINE="console=ttyAMA0 wg.success=vport0p1" +CONFIG_CMDLINE="console=ttyAMA0 wg.success=vport0p1 panic_on_warn=1" CONFIG_FRAME_WARN=1024 diff --git a/src/tests/qemu/arch/armeb.config b/src/tests/qemu/arch/armeb.config index d3a40a9..f3066be 100644 --- a/src/tests/qemu/arch/armeb.config +++ b/src/tests/qemu/arch/armeb.config @@ -8,6 +8,6 @@ CONFIG_VIRTIO_MENU=y CONFIG_VIRTIO_MMIO=y CONFIG_VIRTIO_CONSOLE=y CONFIG_CMDLINE_BOOL=y -CONFIG_CMDLINE="console=ttyAMA0 wg.success=vport0p1" +CONFIG_CMDLINE="console=ttyAMA0 wg.success=vport0p1 panic_on_warn=1" CONFIG_CPU_BIG_ENDIAN=y CONFIG_FRAME_WARN=1024 diff --git a/src/tests/qemu/arch/i686.config b/src/tests/qemu/arch/i686.config index a9b4fe7..6d90892 100644 --- a/src/tests/qemu/arch/i686.config +++ b/src/tests/qemu/arch/i686.config @@ -2,5 +2,5 @@ CONFIG_ACPI=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_CMDLINE_BOOL=y -CONFIG_CMDLINE="console=ttyS0 wg.success=ttyS1" +CONFIG_CMDLINE="console=ttyS0 wg.success=ttyS1 panic_on_warn=1" CONFIG_FRAME_WARN=1024 diff --git a/src/tests/qemu/arch/m68k.config b/src/tests/qemu/arch/m68k.config index 62a15bd..82c925e 100644 --- a/src/tests/qemu/arch/m68k.config +++ b/src/tests/qemu/arch/m68k.config @@ -5,5 +5,5 @@ CONFIG_MAC=y CONFIG_SERIAL_PMACZILOG=y CONFIG_SERIAL_PMACZILOG_TTYS=y CONFIG_SERIAL_PMACZILOG_CONSOLE=y -CONFIG_CMDLINE="console=ttyS0 wg.success=ttyS1" +CONFIG_CMDLINE="console=ttyS0 wg.success=ttyS1 panic_on_warn=1" CONFIG_FRAME_WARN=1024 diff --git a/src/tests/qemu/arch/mips.config b/src/tests/qemu/arch/mips.config index df71d6b..d7ec63c 100644 --- a/src/tests/qemu/arch/mips.config +++ b/src/tests/qemu/arch/mips.config @@ -7,5 +7,5 @@ CONFIG_POWER_RESET_SYSCON=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_CMDLINE_BOOL=y -CONFIG_CMDLINE="console=ttyS0 wg.success=ttyS1" +CONFIG_CMDLINE="console=ttyS0 wg.success=ttyS1 panic_on_warn=1" CONFIG_FRAME_WARN=1024 diff --git a/src/tests/qemu/arch/mips64.config b/src/tests/qemu/arch/mips64.config index 90c783f..0994947 100644 --- a/src/tests/qemu/arch/mips64.config +++ b/src/tests/qemu/arch/mips64.config @@ -10,5 +10,5 @@ CONFIG_POWER_RESET_SYSCON=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_CMDLINE_BOOL=y -CONFIG_CMDLINE="console=ttyS0 wg.success=ttyS1" +CONFIG_CMDLINE="console=ttyS0 wg.success=ttyS1 panic_on_warn=1" CONFIG_FRAME_WARN=1280 diff --git a/src/tests/qemu/arch/mips64el.config b/src/tests/qemu/arch/mips64el.config index 435b0b4..5911843 100644 --- a/src/tests/qemu/arch/mips64el.config +++ b/src/tests/qemu/arch/mips64el.config @@ -11,5 +11,5 @@ CONFIG_POWER_RESET_SYSCON=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_CMDLINE_BOOL=y -CONFIG_CMDLINE="console=ttyS0 wg.success=ttyS1" +CONFIG_CMDLINE="console=ttyS0 wg.success=ttyS1 panic_on_warn=1" CONFIG_FRAME_WARN=1280 diff --git a/src/tests/qemu/arch/mipsel.config b/src/tests/qemu/arch/mipsel.config index 62bb50c..18a4982 100644 --- a/src/tests/qemu/arch/mipsel.config +++ b/src/tests/qemu/arch/mipsel.config @@ -8,5 +8,5 @@ CONFIG_POWER_RESET_SYSCON=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_CMDLINE_BOOL=y -CONFIG_CMDLINE="console=ttyS0 wg.success=ttyS1" +CONFIG_CMDLINE="console=ttyS0 wg.success=ttyS1 panic_on_warn=1" CONFIG_FRAME_WARN=1024 diff --git a/src/tests/qemu/arch/powerpc.config b/src/tests/qemu/arch/powerpc.config index 5795709..5e04882 100644 --- a/src/tests/qemu/arch/powerpc.config +++ b/src/tests/qemu/arch/powerpc.config @@ -6,5 +6,5 @@ CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_MATH_EMULATION=y CONFIG_CMDLINE_BOOL=y -CONFIG_CMDLINE="console=ttyS0 wg.success=ttyS1" +CONFIG_CMDLINE="console=ttyS0 wg.success=ttyS1 panic_on_warn=1" CONFIG_FRAME_WARN=1024 diff --git a/src/tests/qemu/arch/powerpc64le.config b/src/tests/qemu/arch/powerpc64le.config index f52f1e2..8148b9d 100644 --- a/src/tests/qemu/arch/powerpc64le.config +++ b/src/tests/qemu/arch/powerpc64le.config @@ -7,7 +7,7 @@ CONFIG_PPC_RADIX_MMU=y CONFIG_HVC_CONSOLE=y CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_CMDLINE_BOOL=y -CONFIG_CMDLINE="console=hvc0 wg.success=hvc1" +CONFIG_CMDLINE="console=hvc0 wg.success=hvc1 panic_on_warn=1" CONFIG_SECTION_MISMATCH_WARN_ONLY=y CONFIG_FRAME_WARN=1280 CONFIG_THREAD_SHIFT=14 diff --git a/src/tests/qemu/arch/x86_64.config b/src/tests/qemu/arch/x86_64.config index 45dd53a..efa0069 100644 --- a/src/tests/qemu/arch/x86_64.config +++ b/src/tests/qemu/arch/x86_64.config @@ -2,5 +2,5 @@ CONFIG_ACPI=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_CMDLINE_BOOL=y -CONFIG_CMDLINE="console=ttyS0 wg.success=ttyS1" +CONFIG_CMDLINE="console=ttyS0 wg.success=ttyS1 panic_on_warn=1" CONFIG_FRAME_WARN=1280 diff --git a/src/tests/qemu/init.c b/src/tests/qemu/init.c index 263c659..6be8064 100644 --- a/src/tests/qemu/init.c +++ b/src/tests/qemu/init.c @@ -116,12 +116,6 @@ static void enable_logging(void) panic("write(exception-trace)"); close(fd); } - fd = open("/proc/sys/kernel/panic_on_warn", O_WRONLY); - if (fd >= 0) { - if (write(fd, "1\n", 2) != 2) - panic("write(panic_on_warn)"); - close(fd); - } } static void kmod_selftests(void) -- cgit v1.2.3-59-g8ed1b