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>,
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 v9 21/39] arm64/gcs: Implement shadow stack prctl() interface
Date: Tue, 25 Jun 2024 15:57:49 +0100 [thread overview]
Message-ID: <20240625-arm64-gcs-v9-21-0f634469b8f0@kernel.org> (raw)
In-Reply-To: <20240625-arm64-gcs-v9-0-0f634469b8f0@kernel.org>
Implement the architecture neutral prtctl() interface for setting the
shadow stack status, this supports setting and reading the current GCS
configuration for the current thread.
Userspace can enable basic GCS functionality and additionally also
support for GCS pushes and arbitrary GCS stores. It is expected that
this prctl() will be called very early in application startup, for
example by the dynamic linker, and not subsequently adjusted during
normal operation. Users should carefully note that after enabling GCS
for a thread GCS will become active with no call stack so it is not
normally possible to return from the function that invoked the prctl().
State is stored per thread, enabling GCS for a thread causes a GCS to be
allocated for that thread.
Userspace may lock the current GCS configuration by specifying
PR_SHADOW_STACK_ENABLE_LOCK, this prevents any further changes to the
GCS configuration via any means.
If GCS is not being enabled then all flags other than _LOCK are ignored,
it is not possible to enable stores or pops without enabling GCS.
When disabling the GCS we do not free the allocated stack, this allows
for inspection of the GCS after disabling as part of fault reporting.
Since it is not an expected use case and since it presents some
complications in determining what to do with previously initialsed data
on the GCS attempts to reenable GCS after this are rejected. This can
be revisted if a use case arises.
Reviewed-by: Thiago Jung Bauermann <thiago.bauermann@linaro.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
arch/arm64/include/asm/gcs.h | 22 +++++++++++
arch/arm64/include/asm/processor.h | 1 +
arch/arm64/mm/gcs.c | 81 ++++++++++++++++++++++++++++++++++++++
3 files changed, 104 insertions(+)
diff --git a/arch/arm64/include/asm/gcs.h b/arch/arm64/include/asm/gcs.h
index c1f274fdb9c0..48c97e63e56a 100644
--- a/arch/arm64/include/asm/gcs.h
+++ b/arch/arm64/include/asm/gcs.h
@@ -50,6 +50,9 @@ static inline u64 gcsss2(void)
return Xt;
}
+#define PR_SHADOW_STACK_SUPPORTED_STATUS_MASK \
+ (PR_SHADOW_STACK_ENABLE | PR_SHADOW_STACK_WRITE | PR_SHADOW_STACK_PUSH)
+
#ifdef CONFIG_ARM64_GCS
static inline bool task_gcs_el0_enabled(struct task_struct *task)
@@ -63,6 +66,20 @@ void gcs_preserve_current_state(void);
unsigned long gcs_alloc_thread_stack(struct task_struct *tsk,
const struct kernel_clone_args *args);
+static inline int gcs_check_locked(struct task_struct *task,
+ unsigned long new_val)
+{
+ unsigned long cur_val = task->thread.gcs_el0_mode;
+
+ cur_val &= task->thread.gcs_el0_locked;
+ new_val &= task->thread.gcs_el0_locked;
+
+ if (cur_val != new_val)
+ return -EBUSY;
+
+ return 0;
+}
+
#else
static inline bool task_gcs_el0_enabled(struct task_struct *task)
@@ -78,6 +95,11 @@ static inline unsigned long gcs_alloc_thread_stack(struct task_struct *tsk,
{
return -ENOTSUPP;
}
+static inline int gcs_check_locked(struct task_struct *task,
+ unsigned long new_val)
+{
+ return 0;
+}
#endif
diff --git a/arch/arm64/include/asm/processor.h b/arch/arm64/include/asm/processor.h
index c55e3600604a..58eb48cd539f 100644
--- a/arch/arm64/include/asm/processor.h
+++ b/arch/arm64/include/asm/processor.h
@@ -186,6 +186,7 @@ struct thread_struct {
u64 tpidr2_el0;
#ifdef CONFIG_ARM64_GCS
unsigned int gcs_el0_mode;
+ unsigned int gcs_el0_locked;
u64 gcspr_el0;
u64 gcs_base;
u64 gcs_size;
diff --git a/arch/arm64/mm/gcs.c b/arch/arm64/mm/gcs.c
index 4a3ce8e3bdfb..c6fae0eb9bd6 100644
--- a/arch/arm64/mm/gcs.c
+++ b/arch/arm64/mm/gcs.c
@@ -180,3 +180,84 @@ void gcs_free(struct task_struct *task)
task->thread.gcs_base = 0;
task->thread.gcs_size = 0;
}
+
+int arch_set_shadow_stack_status(struct task_struct *task, unsigned long arg)
+{
+ unsigned long gcs, size;
+ int ret;
+
+ if (!system_supports_gcs())
+ return -EINVAL;
+
+ if (is_compat_thread(task_thread_info(task)))
+ return -EINVAL;
+
+ /* Reject unknown flags */
+ if (arg & ~PR_SHADOW_STACK_SUPPORTED_STATUS_MASK)
+ return -EINVAL;
+
+ ret = gcs_check_locked(task, arg);
+ if (ret != 0)
+ return ret;
+
+ /* If we are enabling GCS then make sure we have a stack */
+ if (arg & PR_SHADOW_STACK_ENABLE) {
+ if (!task_gcs_el0_enabled(task)) {
+ /* Do not allow GCS to be reenabled */
+ if (task->thread.gcs_base)
+ return -EINVAL;
+
+ if (task != current)
+ return -EBUSY;
+
+ size = gcs_size(0);
+ gcs = alloc_gcs(0, size, 0, 0);
+ if (!gcs)
+ return -ENOMEM;
+
+ task->thread.gcspr_el0 = gcs + size - sizeof(u64);
+ task->thread.gcs_base = gcs;
+ task->thread.gcs_size = size;
+ if (task == current)
+ write_sysreg_s(task->thread.gcspr_el0,
+ SYS_GCSPR_EL0);
+
+ }
+ }
+
+ task->thread.gcs_el0_mode = arg;
+ if (task == current)
+ gcs_set_el0_mode(task);
+
+ return 0;
+}
+
+int arch_get_shadow_stack_status(struct task_struct *task,
+ unsigned long __user *arg)
+{
+ if (!system_supports_gcs())
+ return -EINVAL;
+
+ if (is_compat_thread(task_thread_info(task)))
+ return -EINVAL;
+
+ return put_user(task->thread.gcs_el0_mode, arg);
+}
+
+int arch_lock_shadow_stack_status(struct task_struct *task,
+ unsigned long arg)
+{
+ if (!system_supports_gcs())
+ return -EINVAL;
+
+ if (is_compat_thread(task_thread_info(task)))
+ return -EINVAL;
+
+ /*
+ * We support locking unknown bits so applications can prevent
+ * any changes in a future proof manner.
+ */
+ task->thread.gcs_el0_locked |= arg;
+
+ return 0;
+}
--
2.39.2
next prev parent reply other threads:[~2024-06-25 15:03 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-25 14:57 [PATCH v9 00/39] arm64/gcs: Provide support for GCS in userspace Mark Brown
2024-06-25 14:57 ` [PATCH v9 01/39] arm64/mm: Restructure arch_validate_flags() for extensibility Mark Brown
2024-06-25 14:57 ` [PATCH v9 02/39] prctl: arch-agnostic prctl for shadow stack Mark Brown
2024-06-25 14:57 ` [PATCH v9 03/39] mman: Add map_shadow_stack() flags Mark Brown
2024-06-25 14:57 ` [PATCH v9 04/39] arm64: Document boot requirements for Guarded Control Stacks Mark Brown
2024-06-25 14:57 ` [PATCH v9 05/39] arm64/gcs: Document the ABI " Mark Brown
2024-06-25 22:51 ` Randy Dunlap
2024-07-10 10:36 ` Florian Weimer
2024-07-10 18:27 ` Mark Brown
2024-07-16 18:50 ` Edgecombe, Rick P
2024-07-17 15:28 ` Mark Brown
2024-07-17 1:21 ` Thiago Jung Bauermann
2024-06-25 14:57 ` [PATCH v9 06/39] arm64/sysreg: Add definitions for architected GCS caps Mark Brown
2024-06-25 14:57 ` [PATCH v9 07/39] arm64/gcs: Add manual encodings of GCS instructions Mark Brown
2024-06-25 14:57 ` [PATCH v9 08/39] arm64/gcs: Provide put_user_gcs() Mark Brown
2024-06-25 14:57 ` [PATCH v9 09/39] arm64/cpufeature: Runtime detection of Guarded Control Stack (GCS) Mark Brown
2024-06-25 14:57 ` [PATCH v9 10/39] arm64/mm: Allocate PIE slots for EL0 guarded control stack Mark Brown
2024-06-25 14:57 ` [PATCH v9 11/39] mm: Define VM_SHADOW_STACK for arm64 when we support GCS Mark Brown
2024-06-25 14:57 ` [PATCH v9 12/39] arm64/mm: Map pages for guarded control stack Mark Brown
2024-06-25 14:57 ` [PATCH v9 13/39] KVM: arm64: Manage GCS registers for guests Mark Brown
2024-07-10 15:17 ` Marc Zyngier
2024-07-10 17:16 ` Mark Brown
2024-07-10 18:28 ` Marc Zyngier
2024-07-10 22:05 ` Mark Brown
2024-06-25 14:57 ` [PATCH v9 14/39] arm64/gcs: Allow GCS usage at EL0 and EL1 Mark Brown
2024-06-25 14:57 ` [PATCH v9 15/39] arm64/idreg: Add overrride for GCS Mark Brown
2024-06-25 14:57 ` [PATCH v9 16/39] arm64/hwcap: Add hwcap " Mark Brown
2024-06-25 14:57 ` [PATCH v9 17/39] arm64/traps: Handle GCS exceptions Mark Brown
2024-06-25 14:57 ` [PATCH v9 18/39] arm64/mm: Handle GCS data aborts Mark Brown
2024-06-25 14:57 ` [PATCH v9 19/39] arm64/gcs: Context switch GCS state for EL0 Mark Brown
2024-06-25 14:57 ` [PATCH v9 20/39] arm64/gcs: Ensure that new threads have a GCS Mark Brown
2024-07-17 2:05 ` Thiago Jung Bauermann
2024-06-25 14:57 ` Mark Brown [this message]
2024-06-25 14:57 ` [PATCH v9 22/39] arm64/mm: Implement map_shadow_stack() Mark Brown
2024-06-25 14:57 ` [PATCH v9 23/39] arm64/signal: Set up and restore the GCS context for signal handlers Mark Brown
2024-06-25 14:57 ` [PATCH v9 24/39] arm64/signal: Expose GCS state in signal frames Mark Brown
2024-06-25 14:57 ` [PATCH v9 25/39] arm64/ptrace: Expose GCS via ptrace and core files Mark Brown
2024-06-25 14:57 ` [PATCH v9 26/39] arm64: Add Kconfig for Guarded Control Stack (GCS) Mark Brown
2024-06-25 14:57 ` [PATCH v9 27/39] kselftest/arm64: Verify the GCS hwcap Mark Brown
2024-06-25 14:57 ` [PATCH v9 28/39] kselftest: Provide shadow stack enable helpers for arm64 Mark Brown
2024-06-25 14:57 ` [PATCH v9 29/39] selftests/clone3: Enable arm64 shadow stack testing Mark Brown
2024-06-25 14:57 ` [PATCH v9 30/39] kselftest/arm64: Add GCS as a detected feature in the signal tests Mark Brown
2024-06-25 14:57 ` [PATCH v9 31/39] kselftest/arm64: Add framework support for GCS to signal handling tests Mark Brown
2024-06-25 14:58 ` [PATCH v9 32/39] kselftest/arm64: Allow signals tests to specify an expected si_code Mark Brown
2024-06-25 14:58 ` [PATCH v9 33/39] kselftest/arm64: Always run signals tests with GCS enabled Mark Brown
2024-06-25 14:58 ` [PATCH v9 34/39] kselftest/arm64: Add very basic GCS test program Mark Brown
2024-06-25 14:58 ` [PATCH v9 35/39] kselftest/arm64: Add a GCS test program built with the system libc Mark Brown
2024-07-18 16:14 ` Thiago Jung Bauermann
2024-07-18 16:16 ` Mark Brown
2024-07-18 22:28 ` Thiago Jung Bauermann
2024-07-22 8:57 ` Mark Brown
2024-06-25 14:58 ` [PATCH v9 36/39] kselftest/arm64: Add test coverage for GCS mode locking Mark Brown
2024-06-25 14:58 ` [PATCH v9 37/39] kselftest/arm64: Add GCS signal tests Mark Brown
2024-07-18 23:03 ` Thiago Jung Bauermann
2024-06-25 14:58 ` [PATCH v9 38/39] kselftest/arm64: Add a GCS stress test Mark Brown
2024-07-18 23:34 ` Thiago Jung Bauermann
2024-07-18 23:47 ` Thiago Jung Bauermann
2024-07-22 10:08 ` Mark Brown
2024-07-22 14:31 ` Mark Brown
2024-06-25 14:58 ` [PATCH v9 39/39] kselftest/arm64: Enable GCS for the FP stress tests 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=20240625-arm64-gcs-v9-21-0f634469b8f0@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=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