From: Breno Leitao <leitao@debian.org>
To: Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>, Ard Biesheuvel <ardb@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-efi@vger.kernel.org,
Breno Leitao <leitao@debian.org>,
leo.yan@arm.com, kernel-team@meta.com, mark.rutland@arm.com
Subject: [PATCH 7/8] arm64: remove CONFIG_VMAP_STACK checks from SDEI stack handling
Date: Mon, 07 Jul 2025 09:01:07 -0700 [thread overview]
Message-ID: <20250707-arm64_vmap-v1-7-8de98ca0f91c@debian.org> (raw)
In-Reply-To: <20250707-arm64_vmap-v1-0-8de98ca0f91c@debian.org>
With VMAP_STACK now always enabled on arm64, remove all
CONFIG_VMAP_STACK conditionals from SDEI stack allocation and
initialization in arch/arm64/kernel/sdei.c.
This change unconditionally defines the SDEI stack pointers and replaces
runtime checks with BUILD_BUG_ON() assertions, ensuring that the code is
only built when VMAP_STACK is enabled. This simplifies the logic and
reflects the mandatory use of VMAP_STACK for all arm64 kernel builds.
Signed-off-by: Breno Leitao <leitao@debian.org>
---
arch/arm64/kernel/sdei.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/arch/arm64/kernel/sdei.c b/arch/arm64/kernel/sdei.c
index 255d12f881c2..6f24a0251e18 100644
--- a/arch/arm64/kernel/sdei.c
+++ b/arch/arm64/kernel/sdei.c
@@ -34,10 +34,8 @@ unsigned long sdei_exit_mode;
DECLARE_PER_CPU(unsigned long *, sdei_stack_normal_ptr);
DECLARE_PER_CPU(unsigned long *, sdei_stack_critical_ptr);
-#ifdef CONFIG_VMAP_STACK
DEFINE_PER_CPU(unsigned long *, sdei_stack_normal_ptr);
DEFINE_PER_CPU(unsigned long *, sdei_stack_critical_ptr);
-#endif
DECLARE_PER_CPU(unsigned long *, sdei_shadow_call_stack_normal_ptr);
DECLARE_PER_CPU(unsigned long *, sdei_shadow_call_stack_critical_ptr);
@@ -65,8 +63,7 @@ static void free_sdei_stacks(void)
{
int cpu;
- if (!IS_ENABLED(CONFIG_VMAP_STACK))
- return;
+ BUILD_BUG_ON(!IS_ENABLED(CONFIG_VMAP_STACK));
for_each_possible_cpu(cpu) {
_free_sdei_stack(&sdei_stack_normal_ptr, cpu);
@@ -91,8 +88,7 @@ static int init_sdei_stacks(void)
int cpu;
int err = 0;
- if (!IS_ENABLED(CONFIG_VMAP_STACK))
- return 0;
+ BUILD_BUG_ON(!IS_ENABLED(CONFIG_VMAP_STACK));
for_each_possible_cpu(cpu) {
err = _init_sdei_stack(&sdei_stack_normal_ptr, cpu);
--
2.47.1
next prev parent reply other threads:[~2025-07-07 16:01 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-07 16:01 [PATCH 0/8] arm64: set VMAP_STACK by default Breno Leitao
2025-07-07 16:01 ` [PATCH 1/8] arm64: Enable VMAP_STACK support Breno Leitao
2025-07-07 17:23 ` Mark Rutland
2025-07-08 9:39 ` Breno Leitao
2025-07-08 12:14 ` Will Deacon
2025-07-07 16:01 ` [PATCH 2/8] arm64: efi: Remove CONFIG_VMAP_STACK check Breno Leitao
2025-07-07 16:01 ` [PATCH 3/8] arm64: Remove CONFIG_VMAP_STACK conditionals from THREAD_SHIFT and THREAD_ALIGN Breno Leitao
2025-07-07 16:01 ` [PATCH 4/8] arm64: remove CONFIG_VMAP_STACK conditionals from irq stack setup Breno Leitao
2025-07-07 16:01 ` [PATCH 5/8] arm64: remove CONFIG_VMAP_STACK conditionals from traps overflow stack Breno Leitao
2025-07-07 16:01 ` [PATCH 6/8] arm64: remove CONFIG_VMAP_STACK checks from stacktrace overflow logic Breno Leitao
2025-07-07 16:01 ` Breno Leitao [this message]
2025-07-07 16:01 ` [PATCH 8/8] arm64: remove CONFIG_VMAP_STACK checks from entry code Breno Leitao
2025-07-07 17:25 ` [PATCH 0/8] arm64: set VMAP_STACK by default Mark Rutland
2025-07-08 1:13 ` Ard Biesheuvel
2025-07-08 14:44 ` Will Deacon
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=20250707-arm64_vmap-v1-7-8de98ca0f91c@debian.org \
--to=leitao@debian.org \
--cc=ardb@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=kernel-team@meta.com \
--cc=leo.yan@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-efi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=will@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