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 3/8] arm64: Remove CONFIG_VMAP_STACK conditionals from THREAD_SHIFT and THREAD_ALIGN
Date: Mon, 07 Jul 2025 09:01:03 -0700 [thread overview]
Message-ID: <20250707-arm64_vmap-v1-3-8de98ca0f91c@debian.org> (raw)
In-Reply-To: <20250707-arm64_vmap-v1-0-8de98ca0f91c@debian.org>
Now that VMAP_STACK is always enabled on arm64, remove the
CONFIG_VMAP_STACK conditional logic from the definitions of THREAD_SHIFT
and THREAD_ALIGN in arch/arm64/include/asm/memory.h. This simplifies the
code by unconditionally setting THREAD_ALIGN to (2 * THREAD_SIZE) and
adjusting the THREAD_SHIFT definition to only depend on MIN_THREAD_SHIFT
and PAGE_SHIFT.
This change reflects the updated arm64 stack model, where all kernel
threads use virtually mapped stacks with guard pages, and ensures
alignment and stack sizing are consistently handled.
Signed-off-by: Breno Leitao <leitao@debian.org>
---
arch/arm64/include/asm/memory.h | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h
index 717829df294e..5213248e081b 100644
--- a/arch/arm64/include/asm/memory.h
+++ b/arch/arm64/include/asm/memory.h
@@ -118,7 +118,7 @@
* VMAP'd stacks are allocated at page granularity, so we must ensure that such
* stacks are a multiple of page size.
*/
-#if defined(CONFIG_VMAP_STACK) && (MIN_THREAD_SHIFT < PAGE_SHIFT)
+#if (MIN_THREAD_SHIFT < PAGE_SHIFT)
#define THREAD_SHIFT PAGE_SHIFT
#else
#define THREAD_SHIFT MIN_THREAD_SHIFT
@@ -135,11 +135,7 @@
* checking sp & (1 << THREAD_SHIFT), which we can do cheaply in the entry
* assembly.
*/
-#ifdef CONFIG_VMAP_STACK
#define THREAD_ALIGN (2 * THREAD_SIZE)
-#else
-#define THREAD_ALIGN THREAD_SIZE
-#endif
#define IRQ_STACK_SIZE THREAD_SIZE
--
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 ` Breno Leitao [this message]
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 ` [PATCH 7/8] arm64: remove CONFIG_VMAP_STACK checks from SDEI stack handling Breno Leitao
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-3-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