From: Josh Poimboeuf <jpoimboe@kernel.org>
To: x86@kernel.org
Cc: linux-kernel@vger.kernel.org,
Peter Zijlstra <peterz@infradead.org>,
Miroslav Benes <mbenes@suse.cz>,
linux-btrfs@vger.kernel.org, Mark Rutland <mark.rutland@arm.com>,
linux-scsi@vger.kernel.org, linux-hyperv@vger.kernel.org,
Arnd Bergmann <arnd@arndb.de>,
"Guilherme G . Piccoli" <gpiccoli@igalia.com>,
Michael Kelley <mikelley@microsoft.com>,
Nick Desaulniers <ndesaulniers@google.com>,
Nathan Chancellor <nathan@kernel.org>
Subject: [PATCH v2 06/11] cpu: Mark nmi_panic_self_stop() __noreturn
Date: Wed, 12 Apr 2023 16:49:36 -0700 [thread overview]
Message-ID: <316fc6dfab5a8c4e024c7185484a1ee5fb0afb79.1681342859.git.jpoimboe@kernel.org> (raw)
In-Reply-To: <cover.1681342859.git.jpoimboe@kernel.org>
In preparation for improving objtool's handling of weak noreturn
functions, mark nmi_panic_self_stop() __noreturn.
Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
---
arch/x86/include/asm/reboot.h | 1 -
arch/x86/kernel/reboot.c | 2 +-
include/linux/smp.h | 2 +-
kernel/panic.c | 2 +-
tools/objtool/check.c | 1 +
5 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/x86/include/asm/reboot.h b/arch/x86/include/asm/reboot.h
index bc5b4d788c08..9177b4354c3f 100644
--- a/arch/x86/include/asm/reboot.h
+++ b/arch/x86/include/asm/reboot.h
@@ -28,7 +28,6 @@ void __noreturn machine_real_restart(unsigned int type);
void cpu_emergency_disable_virtualization(void);
typedef void (*nmi_shootdown_cb)(int, struct pt_regs*);
-void nmi_panic_self_stop(struct pt_regs *regs);
void nmi_shootdown_cpus(nmi_shootdown_cb callback);
void run_crash_ipi_callback(struct pt_regs *regs);
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index d03c551defcc..3adbe97015c1 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -920,7 +920,7 @@ void run_crash_ipi_callback(struct pt_regs *regs)
}
/* Override the weak function in kernel/panic.c */
-void nmi_panic_self_stop(struct pt_regs *regs)
+void __noreturn nmi_panic_self_stop(struct pt_regs *regs)
{
while (1) {
/* If no CPU is preparing crash dump, we simply loop here. */
diff --git a/include/linux/smp.h b/include/linux/smp.h
index 2a737b39cf0a..7b93504eed26 100644
--- a/include/linux/smp.h
+++ b/include/linux/smp.h
@@ -60,7 +60,7 @@ int smp_call_function_single_async(int cpu, struct __call_single_data *csd);
* Architecture-dependent code may override them.
*/
void __noreturn panic_smp_self_stop(void);
-void nmi_panic_self_stop(struct pt_regs *regs);
+void __noreturn nmi_panic_self_stop(struct pt_regs *regs);
void crash_smp_send_stop(void);
/*
diff --git a/kernel/panic.c b/kernel/panic.c
index 5e4982db8dc9..886d2ebd0a0d 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -151,7 +151,7 @@ void __weak __noreturn panic_smp_self_stop(void)
* Stop ourselves in NMI context if another CPU has already panicked. Arch code
* may override this to prepare for crash dumping, e.g. save regs info.
*/
-void __weak nmi_panic_self_stop(struct pt_regs *regs)
+void __weak __noreturn nmi_panic_self_stop(struct pt_regs *regs)
{
panic_smp_self_stop();
}
diff --git a/tools/objtool/check.c b/tools/objtool/check.c
index 43946188cd2c..ed42717463f9 100644
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -217,6 +217,7 @@ static bool __dead_end_function(struct objtool_file *file, struct symbol *func,
"lbug_with_loc",
"machine_real_restart",
"make_task_dead",
+ "nmi_panic_self_stop",
"panic",
"panic_smp_self_stop",
"rest_init",
--
2.39.2
next prev parent reply other threads:[~2023-04-12 23:50 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-12 23:49 [PATCH v2 00/11] Sprinkle more __noreturn Josh Poimboeuf
2023-04-12 23:49 ` [PATCH v2 01/11] init: Mark [arch_call_]rest_init() __noreturn Josh Poimboeuf
2023-04-17 10:46 ` [tip: objtool/core] " tip-bot2 for Josh Poimboeuf
2023-04-12 23:49 ` [PATCH v2 02/11] init: Mark start_kernel() __noreturn Josh Poimboeuf
2023-04-17 10:46 ` [tip: objtool/core] " tip-bot2 for Josh Poimboeuf
2023-04-12 23:49 ` [PATCH v2 03/11] x86/head: Mark *_start_kernel() __noreturn Josh Poimboeuf
2023-04-17 10:46 ` [tip: objtool/core] " tip-bot2 for Josh Poimboeuf
2023-04-12 23:49 ` [PATCH v2 04/11] arm64/cpu: Mark cpu_park_loop() and friends __noreturn Josh Poimboeuf
2023-04-17 10:46 ` [tip: objtool/core] " tip-bot2 for Josh Poimboeuf
2023-04-12 23:49 ` [PATCH v2 05/11] cpu: Mark panic_smp_self_stop() __noreturn Josh Poimboeuf
2023-04-17 10:46 ` [tip: objtool/core] " tip-bot2 for Josh Poimboeuf
2023-04-12 23:49 ` Josh Poimboeuf [this message]
2023-04-17 10:46 ` [tip: objtool/core] cpu: Mark nmi_panic_self_stop() __noreturn tip-bot2 for Josh Poimboeuf
2023-04-12 23:49 ` [PATCH v2 07/11] objtool: Include weak functions in global_noreturns check Josh Poimboeuf
2023-04-14 14:32 ` Miroslav Benes
2023-04-17 10:46 ` [tip: objtool/core] " tip-bot2 for Josh Poimboeuf
2023-04-12 23:49 ` [PATCH v2 08/11] btrfs: Mark btrfs_assertfail() __noreturn Josh Poimboeuf
2023-04-13 14:57 ` David Sterba
2023-04-15 7:19 ` Anand Jain
2023-04-17 10:46 ` [tip: objtool/core] " tip-bot2 for Josh Poimboeuf
2023-04-12 23:49 ` [PATCH v2 09/11] x86/cpu: Mark {hlt,resume}_play_dead() __noreturn Josh Poimboeuf
2023-04-17 10:46 ` [tip: objtool/core] " tip-bot2 for Josh Poimboeuf
2023-04-12 23:49 ` [PATCH v2 10/11] scsi: message: fusion: Mark mpt_halt_firmware() __noreturn Josh Poimboeuf
2023-04-17 10:46 ` [tip: objtool/core] " tip-bot2 for Josh Poimboeuf
2023-04-12 23:49 ` [PATCH v2 11/11] x86/hyperv: Mark hv_ghcb_terminate() as noreturn Josh Poimboeuf
2023-04-17 10:46 ` [tip: objtool/core] " tip-bot2 for Guilherme G. Piccoli
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=316fc6dfab5a8c4e024c7185484a1ee5fb0afb79.1681342859.git.jpoimboe@kernel.org \
--to=jpoimboe@kernel.org \
--cc=arnd@arndb.de \
--cc=gpiccoli@igalia.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-hyperv@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mbenes@suse.cz \
--cc=mikelley@microsoft.com \
--cc=nathan@kernel.org \
--cc=ndesaulniers@google.com \
--cc=peterz@infradead.org \
--cc=x86@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
all inboxes | Powered by JetHome®