From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: "Jason A. Donenfeld" <Jason@zx2c4.com>,
Richard Weinberger <richard@nod.at>,
Sasha Levin <sashal@kernel.org>,
anton.ivanov@cambridgegreys.com, johannes@sipsolutions.net,
linux@roeck-us.net, linux-um@lists.infradead.org
Subject: [PATCH AUTOSEL 5.10 21/31] um: add "noreboot" command line option for PANIC_TIMEOUT=-1 setups
Date: Sun, 14 Aug 2022 11:34:21 -0400 [thread overview]
Message-ID: <20220814153431.2379231-21-sashal@kernel.org> (raw)
In-Reply-To: <20220814153431.2379231-1-sashal@kernel.org>
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
[ Upstream commit dda520d07b95072a0b63f6c52a8eb566d08ea897 ]
QEMU has a -no-reboot option, which halts instead of reboots when the
guest asks to reboot. This is invaluable when used with
CONFIG_PANIC_TIMEOUT=-1 (and panic_on_warn), because it allows panics
and warnings to be caught immediately in CI. Implement this in UML too,
by way of a basic setup param.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
arch/um/os-Linux/skas/process.c | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/arch/um/os-Linux/skas/process.c b/arch/um/os-Linux/skas/process.c
index 94a7c4125ebc..eecde73b2e78 100644
--- a/arch/um/os-Linux/skas/process.c
+++ b/arch/um/os-Linux/skas/process.c
@@ -5,6 +5,7 @@
*/
#include <stdlib.h>
+#include <stdbool.h>
#include <unistd.h>
#include <sched.h>
#include <errno.h>
@@ -644,10 +645,24 @@ void halt_skas(void)
UML_LONGJMP(&initial_jmpbuf, INIT_JMP_HALT);
}
+static bool noreboot;
+
+static int __init noreboot_cmd_param(char *str, int *add)
+{
+ noreboot = true;
+ return 0;
+}
+
+__uml_setup("noreboot", noreboot_cmd_param,
+"noreboot\n"
+" Rather than rebooting, exit always, akin to QEMU's -no-reboot option.\n"
+" This is useful if you're using CONFIG_PANIC_TIMEOUT in order to catch\n"
+" crashes in CI\n");
+
void reboot_skas(void)
{
block_signals_trace();
- UML_LONGJMP(&initial_jmpbuf, INIT_JMP_REBOOT);
+ UML_LONGJMP(&initial_jmpbuf, noreboot ? INIT_JMP_HALT : INIT_JMP_REBOOT);
}
void __switch_mm(struct mm_id *mm_idp)
--
2.35.1
next prev parent reply other threads:[~2022-08-14 15:47 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-14 15:34 [PATCH AUTOSEL 5.10 01/31] PCI: Add ACS quirk for Broadcom BCM5750x NICs Sasha Levin
2022-08-14 15:34 ` [PATCH AUTOSEL 5.10 02/31] platform/chrome: cros_ec_proto: don't show MKBP version if unsupported Sasha Levin
2022-08-14 15:34 ` [PATCH AUTOSEL 5.10 03/31] usb: cdns3 fix use-after-free at workaround 2 Sasha Levin
2022-08-14 15:34 ` [PATCH AUTOSEL 5.10 04/31] usb: gadget: uvc: call uvc uvcg_warn on completed status instead of uvcg_info Sasha Levin
2022-08-14 15:34 ` [PATCH AUTOSEL 5.10 05/31] irqchip/tegra: Fix overflow implicit truncation warnings Sasha Levin
2022-08-14 15:34 ` [PATCH AUTOSEL 5.10 06/31] drm/meson: " Sasha Levin
2022-08-14 15:34 ` [PATCH AUTOSEL 5.10 07/31] clk: ti: Stop using legacy clkctrl names for omap4 and 5 Sasha Levin
2022-08-14 15:34 ` [PATCH AUTOSEL 5.10 08/31] usb: host: ohci-ppc-of: Fix refcount leak bug Sasha Levin
2022-08-14 15:34 ` [PATCH AUTOSEL 5.10 09/31] usb: renesas: " Sasha Levin
2022-08-14 15:34 ` [PATCH AUTOSEL 5.10 10/31] usb: dwc2: gadget: remove D+ pull-up while no vbus with usb-role-switch Sasha Levin
2022-08-14 15:34 ` [PATCH AUTOSEL 5.10 11/31] vboxguest: Do not use devm for irq Sasha Levin
2022-08-14 15:34 ` [PATCH AUTOSEL 5.10 12/31] clk: qcom: ipq8074: dont disable gcc_sleep_clk_src Sasha Levin
2022-08-14 15:34 ` [PATCH AUTOSEL 5.10 13/31] uacce: Handle parent device removal or parent driver module rmmod Sasha Levin
2022-08-14 15:34 ` [PATCH AUTOSEL 5.10 14/31] zram: do not lookup algorithm in backends table Sasha Levin
2022-08-14 15:34 ` [PATCH AUTOSEL 5.10 15/31] clk: qcom: clk-alpha-pll: fix clk_trion_pll_configure description Sasha Levin
2022-08-14 15:34 ` [PATCH AUTOSEL 5.10 16/31] scsi: lpfc: Prevent buffer overflow crashes in debugfs with malformed user input Sasha Levin
2022-08-14 15:34 ` [PATCH AUTOSEL 5.10 17/31] gadgetfs: ep_io - wait until IRQ finishes Sasha Levin
2022-08-14 15:34 ` [PATCH AUTOSEL 5.10 18/31] pinctrl: intel: Check against matching data instead of ACPI companion Sasha Levin
2022-08-14 15:34 ` [PATCH AUTOSEL 5.10 19/31] cxl: Fix a memory leak in an error handling path Sasha Levin
2022-08-14 15:34 ` [PATCH AUTOSEL 5.10 20/31] PCI/ACPI: Guard ARM64-specific mcfg_quirks Sasha Levin
2022-08-14 15:34 ` Sasha Levin [this message]
2022-08-14 15:34 ` [PATCH AUTOSEL 5.10 22/31] RDMA/rxe: Limit the number of calls to each tasklet Sasha Levin
2022-08-14 15:34 ` [PATCH AUTOSEL 5.10 23/31] csky/kprobe: reclaim insn_slot on kprobe unregistration Sasha Levin
2022-08-14 15:34 ` [PATCH AUTOSEL 5.10 24/31] selftests/kprobe: Do not test for GRP/ without event failures Sasha Levin
2022-08-14 15:34 ` [PATCH AUTOSEL 5.10 25/31] dmaengine: sprd: Cleanup in .remove() after pm_runtime_get_sync() failed Sasha Levin
2022-08-14 15:34 ` [PATCH AUTOSEL 5.10 26/31] ARM: 9203/1: kconfig: fix MODULE_PLTS for KASAN with KASAN_VMALLOC Sasha Levin
2022-08-14 15:34 ` [PATCH AUTOSEL 5.10 27/31] md: Notify sysfs sync_completed in md_reap_sync_thread() Sasha Levin
2022-08-14 15:34 ` [PATCH AUTOSEL 5.10 28/31] nvmet-tcp: fix lockdep complaint on nvmet_tcp_wq flush during queue teardown Sasha Levin
2022-08-14 15:34 ` [PATCH AUTOSEL 5.10 29/31] drivers:md:fix a potential use-after-free bug Sasha Levin
2022-08-14 15:34 ` [PATCH AUTOSEL 5.10 30/31] ext4: avoid remove directory when directory is corrupted Sasha Levin
2022-08-14 15:34 ` [PATCH AUTOSEL 5.10 31/31] ext4: avoid resizing to a partial cluster size Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220814153431.2379231-21-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=Jason@zx2c4.com \
--cc=anton.ivanov@cambridgegreys.com \
--cc=johannes@sipsolutions.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-um@lists.infradead.org \
--cc=linux@roeck-us.net \
--cc=richard@nod.at \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox