From: "tip-bot2 for Josh Poimboeuf" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: "Paul E. McKenney" <paulmck@kernel.org>,
Josh Poimboeuf <jpoimboe@kernel.org>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: objtool/core] sched/idle: Mark arch_cpu_idle_dead() __noreturn
Date: Fri, 10 Mar 2023 20:54:47 -0000 [thread overview]
Message-ID: <167848168727.5837.3929313333702203573.tip-bot2@tip-bot2> (raw)
In-Reply-To: <60d527353da8c99d4cf13b6473131d46719ed16d.1676358308.git.jpoimboe@kernel.org>
The following commit has been merged into the objtool/core branch of tip:
Commit-ID: 071c44e4278156f18a6a56958617223b6bffa6ab
Gitweb: https://git.kernel.org/tip/071c44e4278156f18a6a56958617223b6bffa6ab
Author: Josh Poimboeuf <jpoimboe@kernel.org>
AuthorDate: Mon, 13 Feb 2023 23:05:58 -08:00
Committer: Josh Poimboeuf <jpoimboe@kernel.org>
CommitterDate: Wed, 08 Mar 2023 08:44:28 -08:00
sched/idle: Mark arch_cpu_idle_dead() __noreturn
Before commit 076cbf5d2163 ("x86/xen: don't let xen_pv_play_dead()
return"), in Xen, when a previously offlined CPU was brought back
online, it unexpectedly resumed execution where it left off in the
middle of the idle loop.
There were some hacks to make that work, but the behavior was surprising
as do_idle() doesn't expect an offlined CPU to return from the dead (in
arch_cpu_idle_dead()).
Now that Xen has been fixed, and the arch-specific implementations of
arch_cpu_idle_dead() also don't return, give it a __noreturn attribute.
This will cause the compiler to complain if an arch-specific
implementation might return. It also improves code generation for both
caller and callee.
Also fixes the following warning:
vmlinux.o: warning: objtool: do_idle+0x25f: unreachable instruction
Reported-by: Paul E. McKenney <paulmck@kernel.org>
Tested-by: Paul E. McKenney <paulmck@kernel.org>
Link: https://lore.kernel.org/r/60d527353da8c99d4cf13b6473131d46719ed16d.1676358308.git.jpoimboe@kernel.org
Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
---
arch/alpha/kernel/process.c | 2 +-
arch/arm/kernel/smp.c | 2 +-
arch/arm64/kernel/process.c | 2 +-
arch/csky/kernel/smp.c | 2 +-
arch/ia64/kernel/process.c | 2 +-
arch/loongarch/kernel/process.c | 2 +-
arch/mips/kernel/process.c | 2 +-
arch/parisc/kernel/process.c | 2 +-
arch/powerpc/kernel/smp.c | 2 +-
arch/riscv/kernel/cpu-hotplug.c | 2 +-
arch/s390/kernel/idle.c | 2 +-
arch/sh/kernel/idle.c | 2 +-
arch/sparc/kernel/process_64.c | 2 +-
arch/x86/kernel/process.c | 2 +-
arch/xtensa/kernel/smp.c | 2 +-
include/linux/cpu.h | 2 +-
kernel/sched/idle.c | 2 +-
tools/objtool/check.c | 1 +
18 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/arch/alpha/kernel/process.c b/arch/alpha/kernel/process.c
index a82fefa..582d965 100644
--- a/arch/alpha/kernel/process.c
+++ b/arch/alpha/kernel/process.c
@@ -60,7 +60,7 @@ void arch_cpu_idle(void)
wtint(0);
}
-void arch_cpu_idle_dead(void)
+void __noreturn arch_cpu_idle_dead(void)
{
wtint(INT_MAX);
BUG();
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index 441ea5c..d6be450 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -320,7 +320,7 @@ void __cpu_die(unsigned int cpu)
* of the other hotplug-cpu capable cores, so presumably coming
* out of idle fixes this.
*/
-void arch_cpu_idle_dead(void)
+void __noreturn arch_cpu_idle_dead(void)
{
unsigned int cpu = smp_processor_id();
diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c
index 71d59b5..089ced6 100644
--- a/arch/arm64/kernel/process.c
+++ b/arch/arm64/kernel/process.c
@@ -69,7 +69,7 @@ void (*pm_power_off)(void);
EXPORT_SYMBOL_GPL(pm_power_off);
#ifdef CONFIG_HOTPLUG_CPU
-void arch_cpu_idle_dead(void)
+void __noreturn arch_cpu_idle_dead(void)
{
cpu_die();
}
diff --git a/arch/csky/kernel/smp.c b/arch/csky/kernel/smp.c
index 0ec20ef..9c7a20b 100644
--- a/arch/csky/kernel/smp.c
+++ b/arch/csky/kernel/smp.c
@@ -300,7 +300,7 @@ void __cpu_die(unsigned int cpu)
pr_notice("CPU%u: shutdown\n", cpu);
}
-void arch_cpu_idle_dead(void)
+void __noreturn arch_cpu_idle_dead(void)
{
idle_task_exit();
diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c
index 78f5794..9a5cd9f 100644
--- a/arch/ia64/kernel/process.c
+++ b/arch/ia64/kernel/process.c
@@ -225,7 +225,7 @@ static inline void __noreturn play_dead(void)
}
#endif /* CONFIG_HOTPLUG_CPU */
-void arch_cpu_idle_dead(void)
+void __noreturn arch_cpu_idle_dead(void)
{
play_dead();
}
diff --git a/arch/loongarch/kernel/process.c b/arch/loongarch/kernel/process.c
index fa2443c..b71e17c 100644
--- a/arch/loongarch/kernel/process.c
+++ b/arch/loongarch/kernel/process.c
@@ -62,7 +62,7 @@ unsigned long boot_option_idle_override = IDLE_NO_OVERRIDE;
EXPORT_SYMBOL(boot_option_idle_override);
#ifdef CONFIG_HOTPLUG_CPU
-void arch_cpu_idle_dead(void)
+void __noreturn arch_cpu_idle_dead(void)
{
play_dead();
}
diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
index 093dbbd..a322591 100644
--- a/arch/mips/kernel/process.c
+++ b/arch/mips/kernel/process.c
@@ -40,7 +40,7 @@
#include <asm/stacktrace.h>
#ifdef CONFIG_HOTPLUG_CPU
-void arch_cpu_idle_dead(void)
+void __noreturn arch_cpu_idle_dead(void)
{
play_dead();
}
diff --git a/arch/parisc/kernel/process.c b/arch/parisc/kernel/process.c
index c064719..97c6f87 100644
--- a/arch/parisc/kernel/process.c
+++ b/arch/parisc/kernel/process.c
@@ -159,7 +159,7 @@ EXPORT_SYMBOL(running_on_qemu);
/*
* Called from the idle thread for the CPU which has been shutdown.
*/
-void arch_cpu_idle_dead(void)
+void __noreturn arch_cpu_idle_dead(void)
{
#ifdef CONFIG_HOTPLUG_CPU
idle_task_exit();
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index 6b90f10..f62e5e6 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -1752,7 +1752,7 @@ void __cpu_die(unsigned int cpu)
smp_ops->cpu_die(cpu);
}
-void arch_cpu_idle_dead(void)
+void __noreturn arch_cpu_idle_dead(void)
{
/*
* Disable on the down path. This will be re-enabled by
diff --git a/arch/riscv/kernel/cpu-hotplug.c b/arch/riscv/kernel/cpu-hotplug.c
index f7a832e..59b8021 100644
--- a/arch/riscv/kernel/cpu-hotplug.c
+++ b/arch/riscv/kernel/cpu-hotplug.c
@@ -71,7 +71,7 @@ void __cpu_die(unsigned int cpu)
/*
* Called from the idle thread for the CPU which has been shutdown.
*/
-void arch_cpu_idle_dead(void)
+void __noreturn arch_cpu_idle_dead(void)
{
idle_task_exit();
diff --git a/arch/s390/kernel/idle.c b/arch/s390/kernel/idle.c
index 38e267c..e7239aa 100644
--- a/arch/s390/kernel/idle.c
+++ b/arch/s390/kernel/idle.c
@@ -88,7 +88,7 @@ void arch_cpu_idle_exit(void)
{
}
-void arch_cpu_idle_dead(void)
+void __noreturn arch_cpu_idle_dead(void)
{
cpu_die();
}
diff --git a/arch/sh/kernel/idle.c b/arch/sh/kernel/idle.c
index 114f0c4..d662503 100644
--- a/arch/sh/kernel/idle.c
+++ b/arch/sh/kernel/idle.c
@@ -30,7 +30,7 @@ void default_idle(void)
clear_bl_bit();
}
-void arch_cpu_idle_dead(void)
+void __noreturn arch_cpu_idle_dead(void)
{
play_dead();
}
diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
index 91c2b81..b51d8fb 100644
--- a/arch/sparc/kernel/process_64.c
+++ b/arch/sparc/kernel/process_64.c
@@ -95,7 +95,7 @@ void arch_cpu_idle(void)
}
#ifdef CONFIG_HOTPLUG_CPU
-void arch_cpu_idle_dead(void)
+void __noreturn arch_cpu_idle_dead(void)
{
sched_preempt_enable_no_resched();
cpu_play_dead();
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
index f1ec36c..3e30147 100644
--- a/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
@@ -727,7 +727,7 @@ void arch_cpu_idle_enter(void)
local_touch_nmi();
}
-void arch_cpu_idle_dead(void)
+void __noreturn arch_cpu_idle_dead(void)
{
play_dead();
}
diff --git a/arch/xtensa/kernel/smp.c b/arch/xtensa/kernel/smp.c
index 7bad784..054bd64 100644
--- a/arch/xtensa/kernel/smp.c
+++ b/arch/xtensa/kernel/smp.c
@@ -322,7 +322,7 @@ void __cpu_die(unsigned int cpu)
pr_err("CPU%u: unable to kill\n", cpu);
}
-void arch_cpu_idle_dead(void)
+void __noreturn arch_cpu_idle_dead(void)
{
cpu_die();
}
diff --git a/include/linux/cpu.h b/include/linux/cpu.h
index f83e451..8582a71 100644
--- a/include/linux/cpu.h
+++ b/include/linux/cpu.h
@@ -182,7 +182,7 @@ void arch_cpu_idle(void);
void arch_cpu_idle_prepare(void);
void arch_cpu_idle_enter(void);
void arch_cpu_idle_exit(void);
-void arch_cpu_idle_dead(void);
+void __noreturn arch_cpu_idle_dead(void);
int cpu_report_state(int cpu);
int cpu_check_up_prepare(int cpu);
diff --git a/kernel/sched/idle.c b/kernel/sched/idle.c
index 56e152f..342f58a 100644
--- a/kernel/sched/idle.c
+++ b/kernel/sched/idle.c
@@ -75,7 +75,7 @@ static noinline int __cpuidle cpu_idle_poll(void)
void __weak arch_cpu_idle_prepare(void) { }
void __weak arch_cpu_idle_enter(void) { }
void __weak arch_cpu_idle_exit(void) { }
-void __weak arch_cpu_idle_dead(void) { while (1); }
+void __weak __noreturn arch_cpu_idle_dead(void) { while (1); }
void __weak arch_cpu_idle(void)
{
cpu_idle_force_poll = 1;
diff --git a/tools/objtool/check.c b/tools/objtool/check.c
index f937be1..37c36dc 100644
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -202,6 +202,7 @@ static bool __dead_end_function(struct objtool_file *file, struct symbol *func,
"__reiserfs_panic",
"__stack_chk_fail",
"__ubsan_handle_builtin_unreachable",
+ "arch_cpu_idle_dead",
"cpu_bringup_and_idle",
"cpu_startup_entry",
"do_exit",
next prev parent reply other threads:[~2023-03-10 20:55 UTC|newest]
Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-14 7:05 [PATCH v2 00/24] cpu,sched: " Josh Poimboeuf
2023-02-14 7:05 ` [PATCH v2 01/24] alpha/cpu: Expose arch_cpu_idle_dead()'s prototype declaration Josh Poimboeuf
2023-03-10 20:54 ` [tip: objtool/core] " tip-bot2 for Josh Poimboeuf
2023-02-14 7:05 ` [PATCH v2 02/24] alpha/cpu: Make sure arch_cpu_idle_dead() doesn't return Josh Poimboeuf
2023-03-10 20:54 ` [tip: objtool/core] " tip-bot2 for Josh Poimboeuf
2023-02-14 7:05 ` [PATCH v2 03/24] arm/cpu: " Josh Poimboeuf
2023-02-14 11:15 ` Russell King (Oracle)
2023-02-14 18:39 ` Josh Poimboeuf
2023-02-14 22:01 ` Russell King (Oracle)
2023-02-16 18:38 ` [PATCH v2.1 03/24] arm/cpu: Add unreachable() to arch_cpu_idle_dead() Josh Poimboeuf
2023-03-10 20:54 ` [tip: objtool/core] " tip-bot2 for Josh Poimboeuf
2023-02-14 7:05 ` [PATCH v2 04/24] arm64/cpu: Mark cpu_die() __noreturn Josh Poimboeuf
2023-02-14 8:13 ` Philippe Mathieu-Daudé
2023-02-15 13:09 ` Mark Rutland
2023-02-15 19:45 ` Josh Poimboeuf
2023-02-16 18:41 ` [PATCH v2.1 " Josh Poimboeuf
2023-03-02 10:55 ` Philippe Mathieu-Daudé
2023-03-10 20:54 ` [tip: objtool/core] " tip-bot2 for Josh Poimboeuf
2023-02-14 7:05 ` [PATCH v2 05/24] csky/cpu: Make sure arch_cpu_idle_dead() doesn't return Josh Poimboeuf
2023-03-10 20:54 ` [tip: objtool/core] " tip-bot2 for Josh Poimboeuf
2023-02-14 7:05 ` [PATCH v2 06/24] ia64/cpu: Mark play_dead() __noreturn Josh Poimboeuf
2023-02-14 8:07 ` Philippe Mathieu-Daudé
2023-03-10 20:54 ` [tip: objtool/core] " tip-bot2 for Josh Poimboeuf
2023-02-14 7:05 ` [PATCH v2 07/24] loongarch/cpu: Make sure play_dead() doesn't return Josh Poimboeuf
2023-03-10 20:54 ` [tip: objtool/core] " tip-bot2 for Josh Poimboeuf
2023-02-14 7:05 ` [PATCH v2 08/24] loongarch/cpu: Mark play_dead() __noreturn Josh Poimboeuf
2023-02-14 8:06 ` Philippe Mathieu-Daudé
2023-03-10 20:54 ` [tip: objtool/core] " tip-bot2 for Josh Poimboeuf
2023-02-14 7:05 ` [PATCH v2 09/24] mips/cpu: Expose play_dead()'s prototype definition Josh Poimboeuf
2023-02-14 7:46 ` Philippe Mathieu-Daudé
2023-02-14 18:11 ` Josh Poimboeuf
2023-02-15 8:29 ` Philippe Mathieu-Daudé
2023-02-16 18:42 ` [PATCH v2.1 " Josh Poimboeuf
2023-03-01 18:16 ` Josh Poimboeuf
2023-03-02 10:54 ` Philippe Mathieu-Daudé
2023-03-10 20:54 ` [tip: objtool/core] " tip-bot2 for Josh Poimboeuf
2023-02-14 7:05 ` [PATCH v2 10/24] mips/cpu: Make sure play_dead() doesn't return Josh Poimboeuf
2023-02-14 7:50 ` Philippe Mathieu-Daudé
2023-03-10 20:54 ` [tip: objtool/core] " tip-bot2 for Josh Poimboeuf
2023-02-14 7:05 ` [PATCH v2 11/24] mips/cpu: Mark play_dead() __noreturn Josh Poimboeuf
2023-02-14 7:50 ` Philippe Mathieu-Daudé
2023-03-10 20:54 ` [tip: objtool/core] " tip-bot2 for Josh Poimboeuf
2023-02-14 7:05 ` [PATCH v2 12/24] powerpc/cpu: Mark start_secondary_resume() __noreturn Josh Poimboeuf
2023-02-14 7:19 ` Christophe Leroy
2023-03-10 20:54 ` [tip: objtool/core] " tip-bot2 for Josh Poimboeuf
2023-02-14 7:05 ` [PATCH v2 13/24] sh/cpu: Make sure play_dead() doesn't return Josh Poimboeuf
2023-02-14 7:57 ` Philippe Mathieu-Daudé
2023-02-14 18:28 ` Josh Poimboeuf
2023-03-10 20:54 ` [tip: objtool/core] " tip-bot2 for Josh Poimboeuf
2023-02-14 7:05 ` [PATCH v2 14/24] sh/cpu: Mark play_dead() __noreturn Josh Poimboeuf
2023-03-10 20:54 ` [tip: objtool/core] " tip-bot2 for Josh Poimboeuf
2023-02-14 7:05 ` [PATCH v2 15/24] sh/cpu: Expose arch_cpu_idle_dead()'s prototype definition Josh Poimboeuf
2023-03-10 20:54 ` [tip: objtool/core] " tip-bot2 for Josh Poimboeuf
2023-02-14 7:05 ` [PATCH v2 16/24] sparc/cpu: Mark cpu_play_dead() __noreturn Josh Poimboeuf
2023-02-14 7:52 ` Philippe Mathieu-Daudé
2023-03-10 20:54 ` [tip: objtool/core] " tip-bot2 for Josh Poimboeuf
2023-02-14 7:05 ` [PATCH v2 17/24] x86/cpu: Make sure play_dead() doesn't return Josh Poimboeuf
2023-02-14 8:05 ` Philippe Mathieu-Daudé
2023-03-10 20:54 ` [tip: objtool/core] " tip-bot2 for Josh Poimboeuf
2023-02-14 7:05 ` [PATCH v2 18/24] x86/cpu: Mark play_dead() __noreturn Josh Poimboeuf
2023-03-10 20:54 ` [tip: objtool/core] " tip-bot2 for Josh Poimboeuf
2023-02-14 7:05 ` [PATCH v2 19/24] xtensa/cpu: Make sure cpu_die() doesn't return Josh Poimboeuf
2023-02-14 7:55 ` Philippe Mathieu-Daudé
2023-02-14 18:23 ` Josh Poimboeuf
2023-02-14 19:29 ` Steven Rostedt
2023-02-14 19:48 ` Max Filippov
2023-02-14 20:19 ` Josh Poimboeuf
2023-03-10 20:54 ` [tip: objtool/core] " tip-bot2 for Josh Poimboeuf
2023-02-14 7:05 ` [PATCH v2 20/24] xtensa/cpu: Mark cpu_die() __noreturn Josh Poimboeuf
2023-02-14 12:47 ` Max Filippov
2023-03-10 20:54 ` [tip: objtool/core] " tip-bot2 for Josh Poimboeuf
2023-02-14 7:05 ` [PATCH v2 21/24] sched/idle: Make sure weak version of arch_cpu_idle_dead() doesn't return Josh Poimboeuf
2023-03-10 20:54 ` [tip: objtool/core] " tip-bot2 for Josh Poimboeuf
2023-02-14 7:05 ` [PATCH v2 22/24] objtool: Include weak functions in 'global_noreturns' check Josh Poimboeuf
2023-02-14 7:05 ` [PATCH v2 23/24] init: Make arch_call_rest_init() and rest_init() __noreturn Josh Poimboeuf
2023-02-14 7:05 ` [PATCH v2 24/24] sched/idle: Mark arch_cpu_idle_dead() __noreturn Josh Poimboeuf
2023-03-10 20:54 ` tip-bot2 for Josh Poimboeuf [this message]
2023-02-14 8:38 ` [PATCH v2 25/24] x86/cpu: Expose arch_cpu_idle_dead()'s prototype definition Philippe Mathieu-Daudé
2023-03-10 20:54 ` [tip: objtool/core] " tip-bot2 for Philippe Mathieu-Daudé
2023-02-14 9:25 ` [PATCH v2 00/24] cpu,sched: Mark arch_cpu_idle_dead() __noreturn Philippe Mathieu-Daudé
2023-02-14 18:29 ` Josh Poimboeuf
2023-02-15 22:22 ` Paul E. McKenney
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=167848168727.5837.3929313333702203573.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=jpoimboe@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=paulmck@kernel.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®