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 17/39] arm64/hwcap: Add hwcap for GCS
Date: Thu, 29 Aug 2024 00:27:33 +0100 [thread overview]
Message-ID: <20240829-arm64-gcs-v12-17-42fec947436a@kernel.org> (raw)
In-Reply-To: <20240829-arm64-gcs-v12-0-42fec947436a@kernel.org>
Provide a hwcap to enable userspace to detect support for GCS.
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>
---
Documentation/arch/arm64/elf_hwcaps.rst | 2 ++
arch/arm64/include/asm/hwcap.h | 1 +
arch/arm64/include/uapi/asm/hwcap.h | 1 +
arch/arm64/kernel/cpufeature.c | 3 +++
arch/arm64/kernel/cpuinfo.c | 1 +
5 files changed, 8 insertions(+)
diff --git a/Documentation/arch/arm64/elf_hwcaps.rst b/Documentation/arch/arm64/elf_hwcaps.rst
index 448c1664879b..cf87be078f33 100644
--- a/Documentation/arch/arm64/elf_hwcaps.rst
+++ b/Documentation/arch/arm64/elf_hwcaps.rst
@@ -365,6 +365,8 @@ HWCAP2_SME_SF8DP2
HWCAP2_SME_SF8DP4
Functionality implied by ID_AA64SMFR0_EL1.SF8DP4 == 0b1.
+HWCAP2_GCS
+ Functionality implied by ID_AA64PFR1_EL1.GCS == 0b1
4. Unused AT_HWCAP bits
-----------------------
diff --git a/arch/arm64/include/asm/hwcap.h b/arch/arm64/include/asm/hwcap.h
index 4edd3b61df11..fd7e162e7e39 100644
--- a/arch/arm64/include/asm/hwcap.h
+++ b/arch/arm64/include/asm/hwcap.h
@@ -157,6 +157,7 @@
#define KERNEL_HWCAP_SME_SF8FMA __khwcap2_feature(SME_SF8FMA)
#define KERNEL_HWCAP_SME_SF8DP4 __khwcap2_feature(SME_SF8DP4)
#define KERNEL_HWCAP_SME_SF8DP2 __khwcap2_feature(SME_SF8DP2)
+#define KERNEL_HWCAP_GCS __khwcap2_feature(GCS)
/*
* This yields a mask that user programs can use to figure out what
diff --git a/arch/arm64/include/uapi/asm/hwcap.h b/arch/arm64/include/uapi/asm/hwcap.h
index 285610e626f5..328fb7843e2f 100644
--- a/arch/arm64/include/uapi/asm/hwcap.h
+++ b/arch/arm64/include/uapi/asm/hwcap.h
@@ -122,5 +122,6 @@
#define HWCAP2_SME_SF8FMA (1UL << 60)
#define HWCAP2_SME_SF8DP4 (1UL << 61)
#define HWCAP2_SME_SF8DP2 (1UL << 62)
+#define HWCAP2_GCS (1UL << 63)
#endif /* _UAPI__ASM_HWCAP_H */
diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c
index 315bd7be1106..e3e8290a4447 100644
--- a/arch/arm64/kernel/cpufeature.c
+++ b/arch/arm64/kernel/cpufeature.c
@@ -2994,6 +2994,9 @@ static const struct arm64_cpu_capabilities arm64_elf_hwcaps[] = {
HWCAP_CAP(ID_AA64ZFR0_EL1, I8MM, IMP, CAP_HWCAP, KERNEL_HWCAP_SVEI8MM),
HWCAP_CAP(ID_AA64ZFR0_EL1, F32MM, IMP, CAP_HWCAP, KERNEL_HWCAP_SVEF32MM),
HWCAP_CAP(ID_AA64ZFR0_EL1, F64MM, IMP, CAP_HWCAP, KERNEL_HWCAP_SVEF64MM),
+#endif
+#ifdef CONFIG_ARM64_GCS
+ HWCAP_CAP(ID_AA64PFR1_EL1, GCS, IMP, CAP_HWCAP, KERNEL_HWCAP_GCS),
#endif
HWCAP_CAP(ID_AA64PFR1_EL1, SSBS, SSBS2, CAP_HWCAP, KERNEL_HWCAP_SSBS),
#ifdef CONFIG_ARM64_BTI
diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c
index 09eeaa24d456..2f539e3101ee 100644
--- a/arch/arm64/kernel/cpuinfo.c
+++ b/arch/arm64/kernel/cpuinfo.c
@@ -143,6 +143,7 @@ static const char *const hwcap_str[] = {
[KERNEL_HWCAP_SME_SF8FMA] = "smesf8fma",
[KERNEL_HWCAP_SME_SF8DP4] = "smesf8dp4",
[KERNEL_HWCAP_SME_SF8DP2] = "smesf8dp2",
+ [KERNEL_HWCAP_GCS] = "gcs",
};
#ifdef CONFIG_COMPAT
--
2.39.2
next prev parent reply other threads:[~2024-08-28 23:30 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 ` Mark Brown [this message]
2024-09-03 9:00 ` [PATCH v12 17/39] arm64/hwcap: Add hwcap " 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 ` [PATCH v12 26/39] arm64/ptrace: Expose GCS via ptrace and core files Mark Brown
2024-09-02 18:56 ` 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-17-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