linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
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>,
	David Spickett <david.spickett@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 v13 26/40] arm64/signal: Expose GCS state in signal frames
Date: Tue, 01 Oct 2024 23:59:05 +0100	[thread overview]
Message-ID: <20241001-arm64-gcs-v13-26-222b78d87eee@kernel.org> (raw)
In-Reply-To: <20241001-arm64-gcs-v13-0-222b78d87eee@kernel.org>

Add a context for the GCS state and include it in the signal context when
running on a system that supports GCS. We reuse the same flags that the
prctl() uses to specify which GCS features are enabled and also provide the
current GCS pointer.

We do not support enabling GCS via signal return, there is a conflict
between specifying GCSPR_EL0 and allocation of a new GCS and this is not
an ancticipated use case.  We also enforce GCS configuration locking on
signal return.

Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Reviewed-by: Thiago Jung Bauermann <thiago.bauermann@linaro.org>
Acked-by: Yury Khrustalev <yury.khrustalev@arm.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 arch/arm64/include/uapi/asm/sigcontext.h |   9 +++
 arch/arm64/kernel/signal.c               | 109 +++++++++++++++++++++++++++++++
 2 files changed, 118 insertions(+)

diff --git a/arch/arm64/include/uapi/asm/sigcontext.h b/arch/arm64/include/uapi/asm/sigcontext.h
index bb7af77a30a7..d42f7a92238b 100644
--- a/arch/arm64/include/uapi/asm/sigcontext.h
+++ b/arch/arm64/include/uapi/asm/sigcontext.h
@@ -183,6 +183,15 @@ struct zt_context {
 	__u16 __reserved[3];
 };
 
+#define GCS_MAGIC	0x47435300
+
+struct gcs_context {
+	struct _aarch64_ctx head;
+	__u64 gcspr;
+	__u64 features_enabled;
+	__u64 reserved;
+};
+
 #endif /* !__ASSEMBLY__ */
 
 #include <asm/sve_context.h>
diff --git a/arch/arm64/kernel/signal.c b/arch/arm64/kernel/signal.c
index b5ab0e229a78..62d666278264 100644
--- a/arch/arm64/kernel/signal.c
+++ b/arch/arm64/kernel/signal.c
@@ -66,6 +66,7 @@ struct rt_sigframe_user_layout {
 
 	unsigned long fpsimd_offset;
 	unsigned long esr_offset;
+	unsigned long gcs_offset;
 	unsigned long sve_offset;
 	unsigned long tpidr2_offset;
 	unsigned long za_offset;
@@ -198,6 +199,8 @@ struct user_ctxs {
 	u32 fpmr_size;
 	struct poe_context __user *poe;
 	u32 poe_size;
+	struct gcs_context __user *gcs;
+	u32 gcs_size;
 };
 
 static int preserve_fpsimd_context(struct fpsimd_context __user *ctx)
@@ -643,6 +646,82 @@ extern int restore_zt_context(struct user_ctxs *user);
 
 #endif /* ! CONFIG_ARM64_SME */
 
+#ifdef CONFIG_ARM64_GCS
+
+static int preserve_gcs_context(struct gcs_context __user *ctx)
+{
+	int err = 0;
+	u64 gcspr = read_sysreg_s(SYS_GCSPR_EL0);
+
+	/*
+	 * If GCS is enabled we will add a cap token to the frame,
+	 * include it in the GCSPR_EL0 we report to support stack
+	 * switching via sigreturn if GCS is enabled.  We do not allow
+	 * enabling via sigreturn so the token is only relevant for
+	 * threads with GCS enabled.
+	 */
+	if (task_gcs_el0_enabled(current))
+		gcspr -= 8;
+
+	__put_user_error(GCS_MAGIC, &ctx->head.magic, err);
+	__put_user_error(sizeof(*ctx), &ctx->head.size, err);
+	__put_user_error(gcspr, &ctx->gcspr, err);
+	__put_user_error(0, &ctx->reserved, err);
+	__put_user_error(current->thread.gcs_el0_mode,
+			 &ctx->features_enabled, err);
+
+	return err;
+}
+
+static int restore_gcs_context(struct user_ctxs *user)
+{
+	u64 gcspr, enabled;
+	int err = 0;
+
+	if (user->gcs_size != sizeof(*user->gcs))
+		return -EINVAL;
+
+	__get_user_error(gcspr, &user->gcs->gcspr, err);
+	__get_user_error(enabled, &user->gcs->features_enabled, err);
+	if (err)
+		return err;
+
+	/* Don't allow unknown modes */
+	if (enabled & ~PR_SHADOW_STACK_SUPPORTED_STATUS_MASK)
+		return -EINVAL;
+
+	err = gcs_check_locked(current, enabled);
+	if (err != 0)
+		return err;
+
+	/* Don't allow enabling */
+	if (!task_gcs_el0_enabled(current) &&
+	    (enabled & PR_SHADOW_STACK_ENABLE))
+		return -EINVAL;
+
+	/* If we are disabling disable everything */
+	if (!(enabled & PR_SHADOW_STACK_ENABLE))
+		enabled = 0;
+
+	current->thread.gcs_el0_mode = enabled;
+
+	/*
+	 * We let userspace set GCSPR_EL0 to anything here, we will
+	 * validate later in gcs_restore_signal().
+	 */
+	write_sysreg_s(gcspr, SYS_GCSPR_EL0);
+
+	return 0;
+}
+
+#else /* ! CONFIG_ARM64_GCS */
+
+/* Turn any non-optimised out attempts to use these into a link error: */
+extern int preserve_gcs_context(void __user *ctx);
+extern int restore_gcs_context(struct user_ctxs *user);
+
+#endif /* ! CONFIG_ARM64_GCS */
+
 static int parse_user_sigframe(struct user_ctxs *user,
 			       struct rt_sigframe __user *sf)
 {
@@ -661,6 +740,7 @@ static int parse_user_sigframe(struct user_ctxs *user,
 	user->zt = NULL;
 	user->fpmr = NULL;
 	user->poe = NULL;
+	user->gcs = NULL;
 
 	if (!IS_ALIGNED((unsigned long)base, 16))
 		goto invalid;
@@ -777,6 +857,17 @@ static int parse_user_sigframe(struct user_ctxs *user,
 			user->fpmr_size = size;
 			break;
 
+		case GCS_MAGIC:
+			if (!system_supports_gcs())
+				goto invalid;
+
+			if (user->gcs)
+				goto invalid;
+
+			user->gcs = (struct gcs_context __user *)head;
+			user->gcs_size = size;
+			break;
+
 		case EXTRA_MAGIC:
 			if (have_extra_context)
 				goto invalid;
@@ -896,6 +987,9 @@ static int restore_sigframe(struct pt_regs *regs,
 			err = restore_fpsimd_context(&user);
 	}
 
+	if (err == 0 && system_supports_gcs() && user.gcs)
+		err = restore_gcs_context(&user);
+
 	if (err == 0 && system_supports_tpidr2() && user.tpidr2)
 		err = restore_tpidr2_context(&user);
 
@@ -1029,6 +1123,15 @@ static int setup_sigframe_layout(struct rt_sigframe_user_layout *user,
 			return err;
 	}
 
+#ifdef CONFIG_ARM64_GCS
+	if (system_supports_gcs() && (add_all || current->thread.gcspr_el0)) {
+		err = sigframe_alloc(user, &user->gcs_offset,
+				     sizeof(struct gcs_context));
+		if (err)
+			return err;
+	}
+#endif
+
 	if (system_supports_sve() || system_supports_sme()) {
 		unsigned int vq = 0;
 
@@ -1136,6 +1239,12 @@ static int setup_sigframe(struct rt_sigframe_user_layout *user,
 		__put_user_error(current->thread.fault_code, &esr_ctx->esr, err);
 	}
 
+	if (system_supports_gcs() && err == 0 && user->gcs_offset) {
+		struct gcs_context __user *gcs_ctx =
+			apply_user_offset(user, user->gcs_offset);
+		err |= preserve_gcs_context(gcs_ctx);
+	}
+
 	/* Scalable Vector Extension state (including streaming), if present */
 	if ((system_supports_sve() || system_supports_sme()) &&
 	    err == 0 && user->sve_offset) {

-- 
2.39.2



  parent reply	other threads:[~2024-10-01 23:04 UTC|newest]

Thread overview: 57+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-10-01 22:58 [PATCH v13 00/40] arm64/gcs: Provide support for GCS in userspace Mark Brown
2024-10-01 22:58 ` [PATCH v13 01/40] mm: Introduce ARCH_HAS_USER_SHADOW_STACK Mark Brown
2024-10-01 22:58 ` [PATCH v13 02/40] mm: Define VM_HIGH_ARCH_6 Mark Brown
2024-10-01 22:58 ` [PATCH v13 03/40] arm64/mm: Restructure arch_validate_flags() for extensibility Mark Brown
2024-10-01 22:58 ` [PATCH v13 04/40] prctl: arch-agnostic prctl for shadow stack Mark Brown
2024-10-01 23:13   ` Deepak Gupta
2024-10-01 22:58 ` [PATCH v13 05/40] mman: Add map_shadow_stack() flags Mark Brown
2024-10-01 22:58 ` [PATCH v13 06/40] arm64: Document boot requirements for Guarded Control Stacks Mark Brown
2024-10-01 22:58 ` [PATCH v13 07/40] arm64/gcs: Document the ABI " Mark Brown
2024-10-01 22:58 ` [PATCH v13 08/40] arm64/sysreg: Add definitions for architected GCS caps Mark Brown
2024-10-01 22:58 ` [PATCH v13 09/40] arm64/gcs: Add manual encodings of GCS instructions Mark Brown
2024-10-01 22:58 ` [PATCH v13 10/40] arm64/gcs: Provide put_user_gcs() Mark Brown
2024-10-01 22:58 ` [PATCH v13 11/40] arm64/gcs: Provide basic EL2 setup to allow GCS usage at EL0 and EL1 Mark Brown
2024-10-09 20:49   ` Nathan Chancellor
2024-10-10 15:18     ` Marc Zyngier
2024-10-10 17:16       ` Catalin Marinas
2024-10-11 12:55         ` Marc Zyngier
2024-10-14 16:31           ` Catalin Marinas
2024-10-15 13:05       ` Catalin Marinas
2024-10-01 22:58 ` [PATCH v13 12/40] arm64/cpufeature: Runtime detection of Guarded Control Stack (GCS) Mark Brown
2024-10-01 22:58 ` [PATCH v13 13/40] arm64/mm: Allocate PIE slots for EL0 guarded control stack Mark Brown
2024-10-01 22:58 ` [PATCH v13 14/40] mm: Define VM_SHADOW_STACK for arm64 when we support GCS Mark Brown
2024-10-01 22:58 ` [PATCH v13 15/40] arm64/mm: Map pages for guarded control stack Mark Brown
2024-10-01 22:58 ` [PATCH v13 16/40] KVM: arm64: Manage GCS access and registers for guests Mark Brown
2024-10-02  0:24   ` Marc Zyngier
2024-10-02 15:55     ` Marc Zyngier
2024-10-02 18:24       ` Mark Brown
2024-10-02 19:29         ` Marc Zyngier
2024-10-03 14:50           ` Mark Brown
2024-10-01 22:58 ` [PATCH v13 17/40] arm64/idreg: Add overrride for GCS Mark Brown
2024-10-01 22:58 ` [PATCH v13 18/40] arm64/hwcap: Add hwcap " Mark Brown
2024-10-03 16:25   ` Yury Khrustalev
2024-10-01 22:58 ` [PATCH v13 19/40] arm64/traps: Handle GCS exceptions Mark Brown
2024-10-01 22:58 ` [PATCH v13 20/40] arm64/mm: Handle GCS data aborts Mark Brown
2024-10-01 22:59 ` [PATCH v13 21/40] arm64/gcs: Context switch GCS state for EL0 Mark Brown
2024-10-01 22:59 ` [PATCH v13 22/40] arm64/gcs: Ensure that new threads have a GCS Mark Brown
2024-10-04 11:18   ` Catalin Marinas
2024-10-04 11:50     ` Mark Brown
2024-10-01 22:59 ` [PATCH v13 23/40] arm64/gcs: Implement shadow stack prctl() interface Mark Brown
2024-10-01 22:59 ` [PATCH v13 24/40] arm64/mm: Implement map_shadow_stack() Mark Brown
2024-10-01 22:59 ` [PATCH v13 25/40] arm64/signal: Set up and restore the GCS context for signal handlers Mark Brown
2024-10-01 22:59 ` Mark Brown [this message]
2024-10-01 22:59 ` [PATCH v13 27/40] arm64/ptrace: Expose GCS via ptrace and core files Mark Brown
2024-10-01 22:59 ` [PATCH v13 28/40] arm64: Add Kconfig for Guarded Control Stack (GCS) Mark Brown
2024-10-01 22:59 ` [PATCH v13 29/40] kselftest/arm64: Verify the GCS hwcap Mark Brown
2024-10-01 22:59 ` [PATCH v13 30/40] kselftest/arm64: Add GCS as a detected feature in the signal tests Mark Brown
2024-10-01 22:59 ` [PATCH v13 31/40] kselftest/arm64: Add framework support for GCS to signal handling tests Mark Brown
2024-10-01 22:59 ` [PATCH v13 32/40] kselftest/arm64: Allow signals tests to specify an expected si_code Mark Brown
2024-10-01 22:59 ` [PATCH v13 33/40] kselftest/arm64: Always run signals tests with GCS enabled Mark Brown
2024-10-01 22:59 ` [PATCH v13 34/40] kselftest/arm64: Add very basic GCS test program Mark Brown
2024-10-01 22:59 ` [PATCH v13 35/40] kselftest/arm64: Add a GCS test program built with the system libc Mark Brown
2024-10-01 22:59 ` [PATCH v13 36/40] kselftest/arm64: Add test coverage for GCS mode locking Mark Brown
2024-10-01 22:59 ` [PATCH v13 37/40] kselftest/arm64: Add GCS signal tests Mark Brown
2024-10-01 22:59 ` [PATCH v13 38/40] kselftest/arm64: Add a GCS stress test Mark Brown
2024-10-01 22:59 ` [PATCH v13 39/40] kselftest/arm64: Enable GCS for the FP stress tests Mark Brown
2024-10-01 22:59 ` [PATCH v13 40/40] KVM: selftests: arm64: Add GCS registers to get-reg-list Mark Brown
2024-10-04 13:52 ` (subset) [PATCH v13 00/40] arm64/gcs: Provide support for GCS in userspace Catalin Marinas

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=20241001-arm64-gcs-v13-26-222b78d87eee@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=david.spickett@arm.com \
    --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