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>,
	 Kees Cook <keescook@chromium.org>, 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>
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>,
	 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 v5 21/37] arm64/gcs: Implement shadow stack prctl() interface
Date: Tue, 22 Aug 2023 14:56:54 +0100	[thread overview]
Message-ID: <20230822-arm64-gcs-v5-21-9ef181dd6324@kernel.org> (raw)
In-Reply-To: <20230822-arm64-gcs-v5-0-9ef181dd6324@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 arbatrary 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.

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                | 82 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 105 insertions(+)

diff --git a/arch/arm64/include/asm/gcs.h b/arch/arm64/include/asm/gcs.h
index 4371a2f99b4a..c150e76869a1 100644
--- a/arch/arm64/include/asm/gcs.h
+++ b/arch/arm64/include/asm/gcs.h
@@ -48,6 +48,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)
@@ -61,6 +64,20 @@ void gcs_preserve_current_state(void);
 unsigned long gcs_alloc_thread_stack(struct task_struct *tsk,
 			    unsigned long clone_flags, size_t size);
 
+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)
@@ -76,6 +93,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 c28681cf9721..029d20ea7878 100644
--- a/arch/arm64/include/asm/processor.h
+++ b/arch/arm64/include/asm/processor.h
@@ -181,6 +181,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 cb0a64bf90af..2b2223b13fc3 100644
--- a/arch/arm64/mm/gcs.c
+++ b/arch/arm64/mm/gcs.c
@@ -84,3 +84,85 @@ 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(task->thread.gcspr_el0, 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.30.2



  parent reply	other threads:[~2023-08-22 14:05 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-22 13:56 [PATCH v5 00/37] arm64/gcs: Provide support for GCS in userspace Mark Brown
2023-08-22 13:56 ` [PATCH v5 01/37] arm64/mm: Restructure arch_validate_flags() for extensibility Mark Brown
2023-08-22 13:56 ` [PATCH v5 02/37] prctl: arch-agnostic prctl for shadow stack Mark Brown
2023-08-22 13:56 ` [PATCH v5 03/37] arm64: Document boot requirements for Guarded Control Stacks Mark Brown
2023-08-22 13:56 ` [PATCH v5 04/37] arm64/gcs: Document the ABI " Mark Brown
2023-08-22 15:05   ` Szabolcs Nagy
2023-08-22 13:56 ` [PATCH v5 05/37] arm64/sysreg: Add new system registers for GCS Mark Brown
2023-08-22 13:56 ` [PATCH v5 06/37] arm64/sysreg: Add definitions for architected GCS caps Mark Brown
2023-08-22 13:56 ` [PATCH v5 07/37] arm64/gcs: Add manual encodings of GCS instructions Mark Brown
2023-08-22 13:56 ` [PATCH v5 08/37] arm64/gcs: Provide copy_to_user_gcs() Mark Brown
2023-08-22 13:56 ` [PATCH v5 09/37] arm64/cpufeature: Runtime detection of Guarded Control Stack (GCS) Mark Brown
2023-08-22 13:56 ` [PATCH v5 10/37] arm64/mm: Allocate PIE slots for EL0 guarded control stack Mark Brown
2023-08-22 13:56 ` [PATCH v5 11/37] mm: Define VM_SHADOW_STACK for arm64 when we support GCS Mark Brown
2023-08-22 15:21   ` David Hildenbrand
2023-08-22 15:41     ` Mark Brown
2023-08-22 16:47       ` Edgecombe, Rick P
2023-08-22 17:55         ` Mark Brown
2023-08-22 13:56 ` [PATCH v5 12/37] arm64/mm: Map pages for guarded control stack Mark Brown
2023-08-22 13:56 ` [PATCH v5 13/37] KVM: arm64: Manage GCS registers for guests Mark Brown
2023-08-22 13:56 ` [PATCH v5 14/37] arm64/gcs: Allow GCS usage at EL0 and EL1 Mark Brown
2023-08-22 13:56 ` [PATCH v5 15/37] arm64/idreg: Add overrride for GCS Mark Brown
2023-08-22 13:56 ` [PATCH v5 16/37] arm64/hwcap: Add hwcap " Mark Brown
2023-08-22 13:56 ` [PATCH v5 17/37] arm64/traps: Handle GCS exceptions Mark Brown
2023-08-22 13:56 ` [PATCH v5 18/37] arm64/mm: Handle GCS data aborts Mark Brown
2023-08-22 13:56 ` [PATCH v5 19/37] arm64/gcs: Context switch GCS state for EL0 Mark Brown
2023-08-22 13:56 ` [PATCH v5 20/37] arm64/gcs: Allocate a new GCS for threads with GCS enabled Mark Brown
2023-08-22 13:56 ` Mark Brown [this message]
2023-08-22 13:56 ` [PATCH v5 22/37] arm64/mm: Implement map_shadow_stack() Mark Brown
2023-08-22 13:56 ` [PATCH v5 23/37] arm64/signal: Set up and restore the GCS context for signal handlers Mark Brown
2023-08-22 13:56 ` [PATCH v5 24/37] arm64/signal: Expose GCS state in signal frames Mark Brown
2023-08-22 13:56 ` [PATCH v5 25/37] arm64/ptrace: Expose GCS via ptrace and core files Mark Brown
2023-08-22 13:56 ` [PATCH v5 26/37] arm64: Add Kconfig for Guarded Control Stack (GCS) Mark Brown
2023-08-22 13:57 ` [PATCH v5 27/37] kselftest/arm64: Verify the GCS hwcap Mark Brown
2023-08-22 13:57 ` [PATCH v5 28/37] kselftest/arm64: Add GCS as a detected feature in the signal tests Mark Brown
2023-08-22 13:57 ` [PATCH v5 29/37] kselftest/arm64: Add framework support for GCS to signal handling tests Mark Brown
2023-08-22 13:57 ` [PATCH v5 30/37] kselftest/arm64: Allow signals tests to specify an expected si_code Mark Brown
2023-08-22 13:57 ` [PATCH v5 31/37] kselftest/arm64: Always run signals tests with GCS enabled Mark Brown
2023-08-22 13:57 ` [PATCH v5 32/37] kselftest/arm64: Add very basic GCS test program Mark Brown
2023-08-22 13:57 ` [PATCH v5 33/37] kselftest/arm64: Add a GCS test program built with the system libc Mark Brown
2023-08-22 13:57 ` [PATCH v5 34/37] kselftest/arm64: Add test coverage for GCS mode locking Mark Brown
2023-08-22 13:57 ` [PATCH v5 35/37] selftests/arm64: Add GCS signal tests Mark Brown
2023-08-22 13:57 ` [PATCH v5 36/37] kselftest/arm64: Add a GCS stress test Mark Brown
2023-08-22 13:57 ` [PATCH v5 37/37] 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=20230822-arm64-gcs-v5-21-9ef181dd6324@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=catalin.marinas@arm.com \
    --cc=corbet@lwn.net \
    --cc=debug@rivosinc.com \
    --cc=ebiederm@xmission.com \
    --cc=hjl.tools@gmail.com \
    --cc=james.morse@arm.com \
    --cc=keescook@chromium.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=shuah@kernel.org \
    --cc=suzuki.poulose@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