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>,
Florian Weimer <fweimer@redhat.com>,
Christian Brauner <brauner@kernel.org>,
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 v6 07/38] arm64/sysreg: Add definitions for architected GCS caps
Date: Mon, 09 Oct 2023 13:08:41 +0100 [thread overview]
Message-ID: <20231009-arm64-gcs-v6-7-78e55deaa4dd@kernel.org> (raw)
In-Reply-To: <20231009-arm64-gcs-v6-0-78e55deaa4dd@kernel.org>
The architecture defines a format for guarded control stack caps, used
to mark the top of an unused GCS in order to limit the potential for
exploitation via stack switching. Add definitions associated with these.
Signed-off-by: Mark Brown <broonie@kernel.org>
---
arch/arm64/include/asm/sysreg.h | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h
index 38296579a4fd..6a550781d71e 100644
--- a/arch/arm64/include/asm/sysreg.h
+++ b/arch/arm64/include/asm/sysreg.h
@@ -994,6 +994,26 @@
#define PIRx_ELx_PERM(idx, perm) ((perm) << ((idx) * 4))
+/*
+ * Definitions for Guarded Control Stack
+ */
+
+#define GCS_CAP_ADDR_MASK GENMASK(63, 12)
+#define GCS_CAP_ADDR_SHIFT 12
+#define GCS_CAP_ADDR_WIDTH 52
+#define GCS_CAP_ADDR(x) FIELD_GET(GCS_CAP_ADDR_MASK, x)
+
+#define GCS_CAP_TOKEN_MASK GENMASK(11, 0)
+#define GCS_CAP_TOKEN_SHIFT 0
+#define GCS_CAP_TOKEN_WIDTH 12
+#define GCS_CAP_TOKEN(x) FIELD_GET(GCS_CAP_TOKEN_MASK, x)
+
+#define GCS_CAP_VALID_TOKEN 0x1
+#define GCS_CAP_IN_PROGRESS_TOKEN 0x5
+
+#define GCS_CAP(x) ((((unsigned long)x) & GCS_CAP_ADDR_MASK) | \
+ GCS_CAP_VALID_TOKEN)
+
#define ARM64_FEATURE_FIELD_BITS 4
/* Defined for compatibility only, do not add new users. */
--
2.30.2
next prev parent reply other threads:[~2023-10-09 12:12 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-09 12:08 [PATCH v6 00/38] arm64/gcs: Provide support for GCS in userspace Mark Brown
2023-10-09 12:08 ` [PATCH v6 01/38] arm64/mm: Restructure arch_validate_flags() for extensibility Mark Brown
2023-10-09 12:08 ` [PATCH v6 02/38] prctl: arch-agnostic prctl for shadow stack Mark Brown
2023-10-09 12:08 ` [PATCH v6 03/38] mman: Add map_shadow_stack() flags Mark Brown
2023-10-09 12:08 ` [PATCH v6 04/38] arm64: Document boot requirements for Guarded Control Stacks Mark Brown
2023-10-09 12:08 ` [PATCH v6 05/38] arm64/gcs: Document the ABI " Mark Brown
2023-10-09 12:08 ` [PATCH v6 06/38] arm64/sysreg: Add new system registers for GCS Mark Brown
2023-10-09 12:08 ` Mark Brown [this message]
2023-10-09 12:08 ` [PATCH v6 08/38] arm64/gcs: Add manual encodings of GCS instructions Mark Brown
2023-10-09 12:08 ` [PATCH v6 09/38] arm64/gcs: Provide copy_to_user_gcs() Mark Brown
2023-10-09 12:08 ` [PATCH v6 10/38] arm64/cpufeature: Runtime detection of Guarded Control Stack (GCS) Mark Brown
2023-10-09 12:08 ` [PATCH v6 11/38] arm64/mm: Allocate PIE slots for EL0 guarded control stack Mark Brown
2023-10-09 12:08 ` [PATCH v6 12/38] mm: Define VM_SHADOW_STACK for arm64 when we support GCS Mark Brown
2023-10-09 12:08 ` [PATCH v6 13/38] arm64/mm: Map pages for guarded control stack Mark Brown
2023-10-09 12:08 ` [PATCH v6 14/38] KVM: arm64: Manage GCS registers for guests Mark Brown
2023-10-09 12:08 ` [PATCH v6 15/38] arm64/gcs: Allow GCS usage at EL0 and EL1 Mark Brown
2023-10-09 12:08 ` [PATCH v6 16/38] arm64/idreg: Add overrride for GCS Mark Brown
2023-10-09 12:08 ` [PATCH v6 17/38] arm64/hwcap: Add hwcap " Mark Brown
2023-10-09 12:08 ` [PATCH v6 18/38] arm64/traps: Handle GCS exceptions Mark Brown
2023-10-09 12:08 ` [PATCH v6 19/38] arm64/mm: Handle GCS data aborts Mark Brown
2023-10-09 12:08 ` [PATCH v6 20/38] arm64/gcs: Context switch GCS state for EL0 Mark Brown
2023-10-09 12:08 ` [PATCH v6 21/38] arm64/gcs: Allocate a new GCS for threads with GCS enabled Mark Brown
2023-10-09 12:08 ` [PATCH v6 22/38] arm64/gcs: Implement shadow stack prctl() interface Mark Brown
2023-10-09 12:08 ` [PATCH v6 23/38] arm64/mm: Implement map_shadow_stack() Mark Brown
2023-10-09 12:08 ` [PATCH v6 24/38] arm64/signal: Set up and restore the GCS context for signal handlers Mark Brown
2023-10-09 12:08 ` [PATCH v6 25/38] arm64/signal: Expose GCS state in signal frames Mark Brown
2023-10-09 12:09 ` [PATCH v6 26/38] arm64/ptrace: Expose GCS via ptrace and core files Mark Brown
2023-10-09 12:09 ` [PATCH v6 27/38] arm64: Add Kconfig for Guarded Control Stack (GCS) Mark Brown
2023-10-09 12:09 ` [PATCH v6 28/38] kselftest/arm64: Verify the GCS hwcap Mark Brown
2023-10-09 12:09 ` [PATCH v6 29/38] kselftest/arm64: Add GCS as a detected feature in the signal tests Mark Brown
2023-10-09 12:09 ` [PATCH v6 30/38] kselftest/arm64: Add framework support for GCS to signal handling tests Mark Brown
2023-10-09 12:09 ` [PATCH v6 31/38] kselftest/arm64: Allow signals tests to specify an expected si_code Mark Brown
2023-10-09 12:09 ` [PATCH v6 32/38] kselftest/arm64: Always run signals tests with GCS enabled Mark Brown
2023-10-09 12:09 ` [PATCH v6 33/38] kselftest/arm64: Add very basic GCS test program Mark Brown
2023-10-09 12:09 ` [PATCH v6 34/38] kselftest/arm64: Add a GCS test program built with the system libc Mark Brown
2023-10-09 12:09 ` [PATCH v6 35/38] kselftest/arm64: Add test coverage for GCS mode locking Mark Brown
2023-10-09 12:09 ` [PATCH v6 36/38] selftests/arm64: Add GCS signal tests Mark Brown
2023-10-09 12:09 ` [PATCH v6 37/38] kselftest/arm64: Add a GCS stress test Mark Brown
2023-10-09 12:09 ` [PATCH v6 38/38] 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=20231009-arm64-gcs-v6-7-78e55deaa4dd@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=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;
as well as URLs for NNTP newsgroup(s).