From: Mark Brown <broonie@kernel.org>
To: Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>, Jonathan Corbet <corbet@lwn.net>,
Andrew Morton <akpm@linux-foundation.org>,
Marc Zyngier <maz@kernel.org>,
Oliver Upton <oliver.upton@linux.dev>,
James Morse <james.morse@arm.com>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
Arnd Bergmann <arnd@arndb.de>, Oleg Nesterov <oleg@redhat.com>,
Eric Biederman <ebiederm@xmission.com>,
Shuah Khan <shuah@kernel.org>,
"Rick P. Edgecombe" <rick.p.edgecombe@intel.com>,
Deepak Gupta <debug@rivosinc.com>,
Ard Biesheuvel <ardb@kernel.org>,
Szabolcs Nagy <Szabolcs.Nagy@arm.com>,
Kees Cook <kees@kernel.org>
Cc: "H.J. Lu" <hjl.tools@gmail.com>,
Paul Walmsley <paul.walmsley@sifive.com>,
Palmer Dabbelt <palmer@dabbelt.com>,
Albert Ou <aou@eecs.berkeley.edu>,
Florian Weimer <fweimer@redhat.com>,
Christian Brauner <brauner@kernel.org>,
Thiago Jung Bauermann <thiago.bauermann@linaro.org>,
Ross Burton <ross.burton@arm.com>,
Yury Khrustalev <yury.khrustalev@arm.com>,
Wilco Dijkstra <wilco.dijkstra@arm.com>,
linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org,
kvmarm@lists.linux.dev, linux-fsdevel@vger.kernel.org,
linux-arch@vger.kernel.org, linux-mm@kvack.org,
linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-riscv@lists.infradead.org, Mark Brown <broonie@kernel.org>
Subject: [PATCH v11 21/39] arm64/gcs: Ensure that new threads have a GCS
Date: Thu, 22 Aug 2024 02:15:24 +0100 [thread overview]
Message-ID: <20240822-arm64-gcs-v11-21-41b81947ecb5@kernel.org> (raw)
In-Reply-To: <20240822-arm64-gcs-v11-0-41b81947ecb5@kernel.org>
When a new thread is created by a thread with GCS enabled the GCS needs
to be specified along with the regular stack.
Unfortunately plain clone() is not extensible and existing clone3()
users will not specify a stack so all existing code would be broken if
we mandated specifying the stack explicitly. For compatibility with
these cases and also x86 (which did not initially implement clone3()
support for shadow stacks) if no GCS is specified we will allocate one
so when a thread is created which has GCS enabled allocate one for it.
We follow the extensively discussed x86 implementation and allocate
min(RLIMIT_STACK, 2G). Since the GCS only stores the call stack and not
any variables this should be more than sufficient for most applications.
GCSs allocated via this mechanism will be freed when the thread exits.
Signed-off-by: Mark Brown <broonie@kernel.org>
---
arch/arm64/include/asm/gcs.h | 9 ++++++
arch/arm64/kernel/process.c | 38 ++++++++++++++++++++++--
arch/arm64/mm/gcs.c | 69 ++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 113 insertions(+), 3 deletions(-)
diff --git a/arch/arm64/include/asm/gcs.h b/arch/arm64/include/asm/gcs.h
index 04594ef59dad..c1f274fdb9c0 100644
--- a/arch/arm64/include/asm/gcs.h
+++ b/arch/arm64/include/asm/gcs.h
@@ -8,6 +8,8 @@
#include <asm/types.h>
#include <asm/uaccess.h>
+struct kernel_clone_args;
+
static inline void gcsb_dsync(void)
{
asm volatile(".inst 0xd503227f" : : : "memory");
@@ -58,6 +60,8 @@ static inline bool task_gcs_el0_enabled(struct task_struct *task)
void gcs_set_el0_mode(struct task_struct *task);
void gcs_free(struct task_struct *task);
void gcs_preserve_current_state(void);
+unsigned long gcs_alloc_thread_stack(struct task_struct *tsk,
+ const struct kernel_clone_args *args);
#else
@@ -69,6 +73,11 @@ static inline bool task_gcs_el0_enabled(struct task_struct *task)
static inline void gcs_set_el0_mode(struct task_struct *task) { }
static inline void gcs_free(struct task_struct *task) { }
static inline void gcs_preserve_current_state(void) { }
+static inline unsigned long gcs_alloc_thread_stack(struct task_struct *tsk,
+ const struct kernel_clone_args *args)
+{
+ return -ENOTSUPP;
+}
#endif
diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c
index a4fd25585801..de59aa16919c 100644
--- a/arch/arm64/kernel/process.c
+++ b/arch/arm64/kernel/process.c
@@ -285,9 +285,29 @@ static void flush_gcs(void)
write_sysreg_s(0, SYS_GCSPR_EL0);
}
+static int copy_thread_gcs(struct task_struct *p,
+ const struct kernel_clone_args *args)
+{
+ unsigned long gcs;
+
+ gcs = gcs_alloc_thread_stack(p, args);
+ if (IS_ERR_VALUE(gcs))
+ return PTR_ERR((void *)gcs);
+
+ p->thread.gcs_el0_mode = current->thread.gcs_el0_mode;
+ p->thread.gcs_el0_locked = current->thread.gcs_el0_locked;
+
+ return 0;
+}
+
#else
static void flush_gcs(void) { }
+static int copy_thread_gcs(struct task_struct *p,
+ const struct kernel_clone_args *args)
+{
+ return 0;
+}
#endif
@@ -303,6 +323,7 @@ void flush_thread(void)
void arch_release_task_struct(struct task_struct *tsk)
{
fpsimd_release_task(tsk);
+ gcs_free(tsk);
}
int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src)
@@ -366,6 +387,7 @@ int copy_thread(struct task_struct *p, const struct kernel_clone_args *args)
unsigned long stack_start = args->stack;
unsigned long tls = args->tls;
struct pt_regs *childregs = task_pt_regs(p);
+ int ret;
memset(&p->thread.cpu_context, 0, sizeof(struct cpu_context));
@@ -407,6 +429,10 @@ int copy_thread(struct task_struct *p, const struct kernel_clone_args *args)
p->thread.uw.tp_value = tls;
p->thread.tpidr2_el0 = 0;
}
+
+ ret = copy_thread_gcs(p, args);
+ if (ret != 0)
+ return ret;
} else {
/*
* A kthread has no context to ERET to, so ensure any buggy
@@ -512,10 +538,16 @@ static void gcs_thread_switch(struct task_struct *next)
gcs_set_el0_mode(next);
/*
- * Ensure that GCS changes are observable by/from other PEs in
- * case of migration.
+ * Ensure that GCS memory effects of the 'prev' thread are
+ * ordered before other memory accesses with release semantics
+ * (or preceded by a DMB) on the current PE. In addition, any
+ * memory accesses with acquire semantics (or succeeded by a
+ * DMB) are ordered before GCS memory effects of the 'next'
+ * thread. This will ensure that the GCS memory effects are
+ * visible to other PEs in case of migration.
*/
- gcsb_dsync();
+ if (task_gcs_el0_enabled(current) || task_gcs_el0_enabled(next))
+ gcsb_dsync();
}
#else
diff --git a/arch/arm64/mm/gcs.c b/arch/arm64/mm/gcs.c
index b0a67efc522b..adedbfc062f3 100644
--- a/arch/arm64/mm/gcs.c
+++ b/arch/arm64/mm/gcs.c
@@ -5,9 +5,68 @@
#include <linux/syscalls.h>
#include <linux/types.h>
+#include <asm/cmpxchg.h>
#include <asm/cpufeature.h>
#include <asm/page.h>
+static unsigned long alloc_gcs(unsigned long addr, unsigned long size)
+{
+ int flags = MAP_ANONYMOUS | MAP_PRIVATE;
+ struct mm_struct *mm = current->mm;
+ unsigned long mapped_addr, unused;
+
+ if (addr)
+ flags |= MAP_FIXED_NOREPLACE;
+
+ mmap_write_lock(mm);
+ mapped_addr = do_mmap(NULL, addr, size, PROT_READ, flags,
+ VM_SHADOW_STACK | VM_WRITE, 0, &unused, NULL);
+ mmap_write_unlock(mm);
+
+ return mapped_addr;
+}
+
+static unsigned long gcs_size(unsigned long size)
+{
+ if (size)
+ return PAGE_ALIGN(size);
+
+ /* Allocate RLIMIT_STACK/2 with limits of PAGE_SIZE..2G */
+ size = PAGE_ALIGN(min_t(unsigned long long,
+ rlimit(RLIMIT_STACK) / 2, SZ_2G));
+ return max(PAGE_SIZE, size);
+}
+
+unsigned long gcs_alloc_thread_stack(struct task_struct *tsk,
+ const struct kernel_clone_args *args)
+{
+ unsigned long addr, size;
+
+ if (!system_supports_gcs())
+ return 0;
+
+ if (!task_gcs_el0_enabled(tsk))
+ return 0;
+
+ if ((args->flags & (CLONE_VFORK | CLONE_VM)) != CLONE_VM) {
+ tsk->thread.gcspr_el0 = read_sysreg_s(SYS_GCSPR_EL0);
+ return 0;
+ }
+
+ size = args->stack_size;
+
+ size = gcs_size(size);
+ addr = alloc_gcs(0, size);
+ if (IS_ERR_VALUE(addr))
+ return addr;
+
+ tsk->thread.gcs_base = addr;
+ tsk->thread.gcs_size = size;
+ tsk->thread.gcspr_el0 = addr + size - sizeof(u64);
+
+ return addr;
+}
+
/*
* Apply the GCS mode configured for the specified task to the
* hardware.
@@ -30,6 +89,16 @@ void gcs_set_el0_mode(struct task_struct *task)
void gcs_free(struct task_struct *task)
{
+
+ /*
+ * When fork() with CLONE_VM fails, the child (tsk) already
+ * has a GCS allocated, and exit_thread() calls this function
+ * to free it. In this case the parent (current) and the
+ * child share the same mm struct.
+ */
+ if (!task->mm || task->mm != current->mm)
+ return;
+
if (task->thread.gcs_base)
vm_munmap(task->thread.gcs_base, task->thread.gcs_size);
--
2.39.2
next prev parent reply other threads:[~2024-08-22 1:20 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-22 1:15 [PATCH v11 00/39] arm64/gcs: Provide support for GCS in userspace Mark Brown
2024-08-22 1:15 ` [PATCH v11 01/39] mm: Introduce ARCH_HAS_USER_SHADOW_STACK Mark Brown
2024-08-22 1:15 ` [PATCH v11 02/39] arm64/mm: Restructure arch_validate_flags() for extensibility Mark Brown
2024-08-22 1:15 ` [PATCH v11 03/39] prctl: arch-agnostic prctl for shadow stack Mark Brown
2024-08-22 1:15 ` [PATCH v11 04/39] mman: Add map_shadow_stack() flags Mark Brown
2024-08-22 1:15 ` [PATCH v11 05/39] arm64: Document boot requirements for Guarded Control Stacks Mark Brown
2024-08-22 8:58 ` Catalin Marinas
2024-08-22 1:15 ` [PATCH v11 06/39] arm64/gcs: Document the ABI " Mark Brown
2024-08-22 10:04 ` Catalin Marinas
2024-08-22 1:15 ` [PATCH v11 07/39] arm64/sysreg: Add definitions for architected GCS caps Mark Brown
2024-08-22 1:15 ` [PATCH v11 08/39] arm64/gcs: Add manual encodings of GCS instructions Mark Brown
2024-08-22 1:15 ` [PATCH v11 09/39] arm64/gcs: Provide put_user_gcs() Mark Brown
2024-08-22 1:15 ` [PATCH v11 10/39] arm64/gcs: Provide basic EL2 setup to allow GCS usage at EL0 and EL1 Mark Brown
2024-08-22 1:15 ` [PATCH v11 11/39] arm64/cpufeature: Runtime detection of Guarded Control Stack (GCS) Mark Brown
2024-08-22 1:15 ` [PATCH v11 12/39] arm64/mm: Allocate PIE slots for EL0 guarded control stack Mark Brown
2024-08-22 1:15 ` [PATCH v11 13/39] mm: Define VM_SHADOW_STACK for arm64 when we support GCS Mark Brown
2024-08-22 10:14 ` Catalin Marinas
2024-08-22 1:15 ` [PATCH v11 14/39] arm64/mm: Map pages for guarded control stack Mark Brown
2024-08-22 10:19 ` Catalin Marinas
2024-08-22 1:15 ` [PATCH v11 15/39] KVM: arm64: Manage GCS access and registers for guests Mark Brown
2024-08-22 1:15 ` [PATCH v11 16/39] arm64/idreg: Add overrride for GCS Mark Brown
2024-08-22 11:30 ` Catalin Marinas
2024-08-22 1:15 ` [PATCH v11 17/39] arm64/hwcap: Add hwcap " Mark Brown
2024-08-22 11:31 ` Catalin Marinas
2024-08-22 1:15 ` [PATCH v11 18/39] arm64/traps: Handle GCS exceptions Mark Brown
2024-08-22 11:31 ` Catalin Marinas
2024-08-22 15:44 ` Catalin Marinas
2024-08-22 16:31 ` Mark Brown
2024-08-22 1:15 ` [PATCH v11 19/39] arm64/mm: Handle GCS data aborts Mark Brown
2024-08-22 16:12 ` Catalin Marinas
2024-08-22 16:44 ` Mark Brown
2024-08-22 17:19 ` Catalin Marinas
2024-08-22 17:30 ` Mark Brown
2024-08-22 1:15 ` [PATCH v11 20/39] arm64/gcs: Context switch GCS state for EL0 Mark Brown
2024-08-22 16:15 ` Catalin Marinas
2024-08-22 1:15 ` Mark Brown [this message]
2024-08-22 16:17 ` [PATCH v11 21/39] arm64/gcs: Ensure that new threads have a GCS Catalin Marinas
2024-08-22 16:24 ` Mark Brown
2024-08-22 1:15 ` [PATCH v11 22/39] arm64/gcs: Implement shadow stack prctl() interface Mark Brown
2024-08-22 1:15 ` [PATCH v11 23/39] arm64/mm: Implement map_shadow_stack() Mark Brown
2024-08-22 1:15 ` [PATCH v11 24/39] arm64/signal: Set up and restore the GCS context for signal handlers Mark Brown
2024-08-23 9:11 ` Catalin Marinas
2024-08-22 1:15 ` [PATCH v11 25/39] arm64/signal: Expose GCS state in signal frames Mark Brown
2024-08-23 9:37 ` Catalin Marinas
2024-08-23 10:25 ` Mark Brown
2024-08-23 15:59 ` Catalin Marinas
2024-08-23 22:01 ` Mark Brown
2024-08-26 10:00 ` Catalin Marinas
2024-08-28 17:32 ` Mark Brown
2024-08-22 1:15 ` [PATCH v11 26/39] arm64/ptrace: Expose GCS via ptrace and core files Mark Brown
2024-08-23 9:41 ` Catalin Marinas
2024-08-22 1:15 ` [PATCH v11 27/39] arm64: Add Kconfig for Guarded Control Stack (GCS) Mark Brown
2024-08-23 9:48 ` Catalin Marinas
2024-08-22 1:15 ` [PATCH v11 28/39] kselftest/arm64: Verify the GCS hwcap Mark Brown
2024-08-22 1:15 ` [PATCH v11 29/39] kselftest/arm64: Add GCS as a detected feature in the signal tests Mark Brown
2024-08-22 1:15 ` [PATCH v11 30/39] kselftest/arm64: Add framework support for GCS to signal handling tests Mark Brown
2024-08-22 1:15 ` [PATCH v11 31/39] kselftest/arm64: Allow signals tests to specify an expected si_code Mark Brown
2024-08-22 1:15 ` [PATCH v11 32/39] kselftest/arm64: Always run signals tests with GCS enabled Mark Brown
2024-08-22 1:15 ` [PATCH v11 33/39] kselftest/arm64: Add very basic GCS test program Mark Brown
2024-08-22 1:15 ` [PATCH v11 34/39] kselftest/arm64: Add a GCS test program built with the system libc Mark Brown
2024-08-22 1:15 ` [PATCH v11 35/39] kselftest/arm64: Add test coverage for GCS mode locking Mark Brown
2024-08-22 1:15 ` [PATCH v11 36/39] kselftest/arm64: Add GCS signal tests Mark Brown
2024-08-22 1:15 ` [PATCH v11 37/39] kselftest/arm64: Add a GCS stress test Mark Brown
2024-08-22 1:15 ` [PATCH v11 38/39] kselftest/arm64: Enable GCS for the FP stress tests Mark Brown
2024-08-22 1:15 ` [PATCH v11 39/39] KVM: selftests: arm64: Add GCS registers to get-reg-list Mark Brown
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=20240822-arm64-gcs-v11-21-41b81947ecb5@kernel.org \
--to=broonie@kernel.org \
--cc=Szabolcs.Nagy@arm.com \
--cc=akpm@linux-foundation.org \
--cc=aou@eecs.berkeley.edu \
--cc=ardb@kernel.org \
--cc=arnd@arndb.de \
--cc=brauner@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=corbet@lwn.net \
--cc=debug@rivosinc.com \
--cc=ebiederm@xmission.com \
--cc=fweimer@redhat.com \
--cc=hjl.tools@gmail.com \
--cc=james.morse@arm.com \
--cc=kees@kernel.org \
--cc=kvmarm@lists.linux.dev \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-riscv@lists.infradead.org \
--cc=maz@kernel.org \
--cc=oleg@redhat.com \
--cc=oliver.upton@linux.dev \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
--cc=rick.p.edgecombe@intel.com \
--cc=ross.burton@arm.com \
--cc=shuah@kernel.org \
--cc=suzuki.poulose@arm.com \
--cc=thiago.bauermann@linaro.org \
--cc=wilco.dijkstra@arm.com \
--cc=will@kernel.org \
--cc=yury.khrustalev@arm.com \
/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