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 v12 26/39] arm64/ptrace: Expose GCS via ptrace and core files
Date: Thu, 29 Aug 2024 00:27:42 +0100 [thread overview]
Message-ID: <20240829-arm64-gcs-v12-26-42fec947436a@kernel.org> (raw)
In-Reply-To: <20240829-arm64-gcs-v12-0-42fec947436a@kernel.org>
Provide a new register type NT_ARM_GCS reporting the current GCS mode
and pointer for EL0. Due to the interactions with allocation and
deallocation of Guarded Control Stacks we do not permit any changes to
the GCS mode via ptrace, only GCSPR_EL0 may be changed.
Reviewed-by: Thiago Jung Bauermann <thiago.bauermann@linaro.org>
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
arch/arm64/include/uapi/asm/ptrace.h | 8 ++++++
arch/arm64/kernel/ptrace.c | 54 ++++++++++++++++++++++++++++++++++++
include/uapi/linux/elf.h | 1 +
3 files changed, 63 insertions(+)
diff --git a/arch/arm64/include/uapi/asm/ptrace.h b/arch/arm64/include/uapi/asm/ptrace.h
index 7fa2f7036aa7..0f39ba4f3efd 100644
--- a/arch/arm64/include/uapi/asm/ptrace.h
+++ b/arch/arm64/include/uapi/asm/ptrace.h
@@ -324,6 +324,14 @@ struct user_za_header {
#define ZA_PT_SIZE(vq) \
(ZA_PT_ZA_OFFSET + ZA_PT_ZA_SIZE(vq))
+/* GCS state (NT_ARM_GCS) */
+
+struct user_gcs {
+ __u64 features_enabled;
+ __u64 features_locked;
+ __u64 gcspr_el0;
+};
+
#endif /* __ASSEMBLY__ */
#endif /* _UAPI__ASM_PTRACE_H */
diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c
index 0d022599eb61..88f525b0c4fb 100644
--- a/arch/arm64/kernel/ptrace.c
+++ b/arch/arm64/kernel/ptrace.c
@@ -34,6 +34,7 @@
#include <asm/cpufeature.h>
#include <asm/debug-monitors.h>
#include <asm/fpsimd.h>
+#include <asm/gcs.h>
#include <asm/mte.h>
#include <asm/pointer_auth.h>
#include <asm/stacktrace.h>
@@ -1440,6 +1441,46 @@ static int tagged_addr_ctrl_set(struct task_struct *target, const struct
}
#endif
+#ifdef CONFIG_ARM64_GCS
+static int gcs_get(struct task_struct *target,
+ const struct user_regset *regset,
+ struct membuf to)
+{
+ struct user_gcs user_gcs;
+
+ if (target == current)
+ gcs_preserve_current_state();
+
+ user_gcs.features_enabled = target->thread.gcs_el0_mode;
+ user_gcs.features_locked = target->thread.gcs_el0_locked;
+ user_gcs.gcspr_el0 = target->thread.gcspr_el0;
+
+ return membuf_write(&to, &user_gcs, sizeof(user_gcs));
+}
+
+static int gcs_set(struct task_struct *target, const struct
+ user_regset *regset, unsigned int pos,
+ unsigned int count, const void *kbuf, const
+ void __user *ubuf)
+{
+ int ret;
+ struct user_gcs user_gcs;
+
+ ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, &user_gcs, 0, -1);
+ if (ret)
+ return ret;
+
+ if (user_gcs.features_enabled & ~PR_SHADOW_STACK_SUPPORTED_STATUS_MASK)
+ return -EINVAL;
+
+ target->thread.gcs_el0_mode = user_gcs.features_enabled;
+ target->thread.gcs_el0_locked = user_gcs.features_locked;
+ target->thread.gcspr_el0 = user_gcs.gcspr_el0;
+
+ return 0;
+}
+#endif
+
enum aarch64_regset {
REGSET_GPR,
REGSET_FPR,
@@ -1469,6 +1510,9 @@ enum aarch64_regset {
#ifdef CONFIG_ARM64_TAGGED_ADDR_ABI
REGSET_TAGGED_ADDR_CTRL,
#endif
+#ifdef CONFIG_ARM64_GCS
+ REGSET_GCS,
+#endif
};
static const struct user_regset aarch64_regsets[] = {
@@ -1628,6 +1672,16 @@ static const struct user_regset aarch64_regsets[] = {
.set = tagged_addr_ctrl_set,
},
#endif
+#ifdef CONFIG_ARM64_GCS
+ [REGSET_GCS] = {
+ .core_note_type = NT_ARM_GCS,
+ .n = sizeof(struct user_gcs) / sizeof(u64),
+ .size = sizeof(u64),
+ .align = sizeof(u64),
+ .regset_get = gcs_get,
+ .set = gcs_set,
+ },
+#endif
};
static const struct user_regset_view user_aarch64_view = {
diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h
index b54b313bcf07..77d4910bbb9d 100644
--- a/include/uapi/linux/elf.h
+++ b/include/uapi/linux/elf.h
@@ -441,6 +441,7 @@ typedef struct elf64_shdr {
#define NT_ARM_ZA 0x40c /* ARM SME ZA registers */
#define NT_ARM_ZT 0x40d /* ARM SME ZT registers */
#define NT_ARM_FPMR 0x40e /* ARM floating point mode register */
+#define NT_ARM_GCS 0x40f /* ARM GCS state */
#define NT_ARC_V2 0x600 /* ARCv2 accumulator/extra registers */
#define NT_VMCOREDD 0x700 /* Vmcore Device Dump Note */
#define NT_MIPS_DSP 0x800 /* MIPS DSP ASE registers */
--
2.39.2
next prev parent reply other threads:[~2024-08-28 23:31 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-28 23:27 [PATCH v12 00/39] arm64/gcs: Provide support for GCS in userspace Mark Brown
2024-08-28 23:27 ` [PATCH v12 01/39] mm: Introduce ARCH_HAS_USER_SHADOW_STACK Mark Brown
2024-08-28 23:27 ` [PATCH v12 02/39] arm64/mm: Restructure arch_validate_flags() for extensibility Mark Brown
2024-08-28 23:27 ` [PATCH v12 03/39] prctl: arch-agnostic prctl for shadow stack Mark Brown
2024-09-03 8:55 ` [PATCH v12 3/39] " Yury Khrustalev
2024-08-28 23:27 ` [PATCH v12 04/39] mman: Add map_shadow_stack() flags Mark Brown
2024-09-03 8:57 ` [PATCH v12 4/39] " Yury Khrustalev
2024-08-28 23:27 ` [PATCH v12 05/39] arm64: Document boot requirements for Guarded Control Stacks Mark Brown
2024-08-28 23:27 ` [PATCH v12 06/39] arm64/gcs: Document the ABI " Mark Brown
2024-09-03 8:59 ` [PATCH v12 6/39] " Yury Khrustalev
2024-08-28 23:27 ` [PATCH v12 07/39] arm64/sysreg: Add definitions for architected GCS caps Mark Brown
2024-08-28 23:27 ` [PATCH v12 08/39] arm64/gcs: Add manual encodings of GCS instructions Mark Brown
2024-08-28 23:27 ` [PATCH v12 09/39] arm64/gcs: Provide put_user_gcs() Mark Brown
2024-08-28 23:27 ` [PATCH v12 10/39] arm64/gcs: Provide basic EL2 setup to allow GCS usage at EL0 and EL1 Mark Brown
2024-08-28 23:27 ` [PATCH v12 11/39] arm64/cpufeature: Runtime detection of Guarded Control Stack (GCS) Mark Brown
2024-08-28 23:27 ` [PATCH v12 12/39] arm64/mm: Allocate PIE slots for EL0 guarded control stack Mark Brown
2024-08-28 23:27 ` [PATCH v12 13/39] mm: Define VM_SHADOW_STACK for arm64 when we support GCS Mark Brown
2024-08-28 23:27 ` [PATCH v12 14/39] arm64/mm: Map pages for guarded control stack Mark Brown
2024-08-28 23:27 ` [PATCH v12 15/39] KVM: arm64: Manage GCS access and registers for guests Mark Brown
2024-09-03 16:24 ` Marc Zyngier
2024-08-28 23:27 ` [PATCH v12 16/39] arm64/idreg: Add overrride for GCS Mark Brown
2024-08-28 23:27 ` [PATCH v12 17/39] arm64/hwcap: Add hwcap " Mark Brown
2024-09-03 9:00 ` Yury Khrustalev
2024-08-28 23:27 ` [PATCH v12 18/39] arm64/traps: Handle GCS exceptions Mark Brown
2024-08-28 23:27 ` [PATCH v12 19/39] arm64/mm: Handle GCS data aborts Mark Brown
2024-09-02 18:54 ` Catalin Marinas
2024-08-28 23:27 ` [PATCH v12 20/39] arm64/gcs: Context switch GCS state for EL0 Mark Brown
2024-08-28 23:27 ` [PATCH v12 21/39] arm64/gcs: Ensure that new threads have a GCS Mark Brown
2024-09-03 9:04 ` Yury Khrustalev
2024-09-06 11:07 ` Szabolcs Nagy
2024-08-28 23:27 ` [PATCH v12 22/39] arm64/gcs: Implement shadow stack prctl() interface Mark Brown
2024-08-28 23:27 ` [PATCH v12 23/39] arm64/mm: Implement map_shadow_stack() Mark Brown
2024-09-03 9:05 ` Yury Khrustalev
2024-08-28 23:27 ` [PATCH v12 24/39] arm64/signal: Set up and restore the GCS context for signal handlers Mark Brown
2024-08-28 23:27 ` [PATCH v12 25/39] arm64/signal: Expose GCS state in signal frames Mark Brown
2024-09-02 18:55 ` Catalin Marinas
2024-09-03 12:13 ` Yury Khrustalev
2024-08-28 23:27 ` Mark Brown [this message]
2024-09-02 18:56 ` [PATCH v12 26/39] arm64/ptrace: Expose GCS via ptrace and core files Catalin Marinas
2024-09-02 18:58 ` Mark Brown
2024-09-03 16:38 ` Catalin Marinas
2024-08-28 23:27 ` [PATCH v12 27/39] arm64: Add Kconfig for Guarded Control Stack (GCS) Mark Brown
2024-08-28 23:27 ` [PATCH v12 28/39] kselftest/arm64: Verify the GCS hwcap Mark Brown
2024-08-28 23:27 ` [PATCH v12 29/39] kselftest/arm64: Add GCS as a detected feature in the signal tests Mark Brown
2024-08-28 23:27 ` [PATCH v12 30/39] kselftest/arm64: Add framework support for GCS to signal handling tests Mark Brown
2024-08-28 23:27 ` [PATCH v12 31/39] kselftest/arm64: Allow signals tests to specify an expected si_code Mark Brown
2024-08-28 23:27 ` [PATCH v12 32/39] kselftest/arm64: Always run signals tests with GCS enabled Mark Brown
2024-08-28 23:27 ` [PATCH v12 33/39] kselftest/arm64: Add very basic GCS test program Mark Brown
2024-08-28 23:27 ` [PATCH v12 34/39] kselftest/arm64: Add a GCS test program built with the system libc Mark Brown
2024-08-28 23:27 ` [PATCH v12 35/39] kselftest/arm64: Add test coverage for GCS mode locking Mark Brown
2024-08-28 23:27 ` [PATCH v12 36/39] kselftest/arm64: Add GCS signal tests Mark Brown
2024-08-28 23:27 ` [PATCH v12 37/39] kselftest/arm64: Add a GCS stress test Mark Brown
2024-08-28 23:27 ` [PATCH v12 38/39] kselftest/arm64: Enable GCS for the FP stress tests Mark Brown
2024-08-28 23:27 ` [PATCH v12 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=20240829-arm64-gcs-v12-26-42fec947436a@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