All of lore.kernel.org
 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 v2 13/35] arm64/el2_setup: Allow GCS usage at EL0 and EL1
Date: Mon, 24 Jul 2023 13:46:00 +0100	[thread overview]
Message-ID: <20230724-arm64-gcs-v2-13-dc2c1d44c2eb@kernel.org> (raw)
In-Reply-To: <20230724-arm64-gcs-v2-0-dc2c1d44c2eb@kernel.org>

There is a control HCRX_EL2.GCSEn which must be set to allow GCS
features to take effect at lower ELs and also fine grained traps for GCS
usage at EL0 and EL1.  Configure all these to allow GCS usage by EL0 and
EL1.

Signed-off-by: Mark Brown <broonie@kernel.org>
---
 arch/arm64/include/asm/el2_setup.h | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/arch/arm64/include/asm/el2_setup.h b/arch/arm64/include/asm/el2_setup.h
index 8e5ffb58f83e..45f3a7dcfd95 100644
--- a/arch/arm64/include/asm/el2_setup.h
+++ b/arch/arm64/include/asm/el2_setup.h
@@ -27,6 +27,14 @@
 	ubfx	x0, x0, #ID_AA64MMFR1_EL1_HCX_SHIFT, #4
 	cbz	x0, .Lskip_hcrx_\@
 	mov_q	x0, HCRX_HOST_FLAGS
+
+        /* Enable GCS if supported */
+	mrs_s	x1, SYS_ID_AA64PFR1_EL1
+	ubfx	x1, x1, #ID_AA64PFR1_EL1_GCS_SHIFT, #4
+	cbz	x1, .Lset_hcrx_\@
+	orr	x0, x0, #HCRX_EL2_GCSEn
+
+.Lset_hcrx_\@:
 	msr_s	SYS_HCRX_EL2, x0
 .Lskip_hcrx_\@:
 .endm
@@ -186,6 +194,15 @@
 	orr	x0, x0, #HFGxTR_EL2_nPIR_EL1
 	orr	x0, x0, #HFGxTR_EL2_nPIRE0_EL1
 
+	/* GCS depends on PIE so we don't check it if PIE is absent */
+	mrs_s	x1, SYS_ID_AA64PFR1_EL1
+	ubfx	x1, x1, #ID_AA64PFR1_EL1_GCS_SHIFT, #4
+	cbz	x1, .Lset_fgt_\@
+
+	/* Disable traps of access to GCS registers at EL0 and EL1 */
+	orr	x0, x0, #HFGxTR_EL2_nGCS_EL1_MASK
+	orr	x0, x0, #HFGxTR_EL2_nGCS_EL0_MASK
+
 .Lset_fgt_\@:
 	msr_s	SYS_HFGRTR_EL2, x0
 	msr_s	SYS_HFGWTR_EL2, x0

-- 
2.30.2


_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv

WARNING: multiple messages have this Message-ID (diff)
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 v2 13/35] arm64/el2_setup: Allow GCS usage at EL0 and EL1
Date: Mon, 24 Jul 2023 13:46:00 +0100	[thread overview]
Message-ID: <20230724-arm64-gcs-v2-13-dc2c1d44c2eb@kernel.org> (raw)
In-Reply-To: <20230724-arm64-gcs-v2-0-dc2c1d44c2eb@kernel.org>

There is a control HCRX_EL2.GCSEn which must be set to allow GCS
features to take effect at lower ELs and also fine grained traps for GCS
usage at EL0 and EL1.  Configure all these to allow GCS usage by EL0 and
EL1.

Signed-off-by: Mark Brown <broonie@kernel.org>
---
 arch/arm64/include/asm/el2_setup.h | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/arch/arm64/include/asm/el2_setup.h b/arch/arm64/include/asm/el2_setup.h
index 8e5ffb58f83e..45f3a7dcfd95 100644
--- a/arch/arm64/include/asm/el2_setup.h
+++ b/arch/arm64/include/asm/el2_setup.h
@@ -27,6 +27,14 @@
 	ubfx	x0, x0, #ID_AA64MMFR1_EL1_HCX_SHIFT, #4
 	cbz	x0, .Lskip_hcrx_\@
 	mov_q	x0, HCRX_HOST_FLAGS
+
+        /* Enable GCS if supported */
+	mrs_s	x1, SYS_ID_AA64PFR1_EL1
+	ubfx	x1, x1, #ID_AA64PFR1_EL1_GCS_SHIFT, #4
+	cbz	x1, .Lset_hcrx_\@
+	orr	x0, x0, #HCRX_EL2_GCSEn
+
+.Lset_hcrx_\@:
 	msr_s	SYS_HCRX_EL2, x0
 .Lskip_hcrx_\@:
 .endm
@@ -186,6 +194,15 @@
 	orr	x0, x0, #HFGxTR_EL2_nPIR_EL1
 	orr	x0, x0, #HFGxTR_EL2_nPIRE0_EL1
 
+	/* GCS depends on PIE so we don't check it if PIE is absent */
+	mrs_s	x1, SYS_ID_AA64PFR1_EL1
+	ubfx	x1, x1, #ID_AA64PFR1_EL1_GCS_SHIFT, #4
+	cbz	x1, .Lset_fgt_\@
+
+	/* Disable traps of access to GCS registers at EL0 and EL1 */
+	orr	x0, x0, #HFGxTR_EL2_nGCS_EL1_MASK
+	orr	x0, x0, #HFGxTR_EL2_nGCS_EL0_MASK
+
 .Lset_fgt_\@:
 	msr_s	SYS_HFGRTR_EL2, x0
 	msr_s	SYS_HFGWTR_EL2, x0

-- 
2.30.2


  parent reply	other threads:[~2023-07-24 12:49 UTC|newest]

Thread overview: 72+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-07-24 12:45 [PATCH v2 00/35] arm64/gcs: Provide support for GCS in userspace Mark Brown
2023-07-24 12:45 ` Mark Brown
2023-07-24 12:45 ` [PATCH v2 01/35] prctl: arch-agnostic prctl for shadow stack Mark Brown
2023-07-24 12:45   ` Mark Brown
2023-07-24 12:45 ` [PATCH v2 02/35] arm64: Document boot requirements for Guarded Control Stacks Mark Brown
2023-07-24 12:45   ` Mark Brown
2023-07-24 12:45 ` [PATCH v2 03/35] arm64/gcs: Document the ABI " Mark Brown
2023-07-24 12:45   ` Mark Brown
2023-07-24 12:45 ` [PATCH v2 04/35] arm64/sysreg: Add new system registers for GCS Mark Brown
2023-07-24 12:45   ` Mark Brown
2023-07-24 12:45 ` [PATCH v2 05/35] arm64/sysreg: Add definitions for architected GCS caps Mark Brown
2023-07-24 12:45   ` Mark Brown
2023-07-24 12:45 ` [PATCH v2 06/35] arm64/gcs: Add manual encodings of GCS instructions Mark Brown
2023-07-24 12:45   ` Mark Brown
2023-07-24 12:45 ` [PATCH v2 07/35] arm64/gcs: Provide copy_to_user_gcs() Mark Brown
2023-07-24 12:45   ` Mark Brown
2023-07-24 12:45 ` [PATCH v2 08/35] arm64/cpufeature: Runtime detection of Guarded Control Stack (GCS) Mark Brown
2023-07-24 12:45   ` Mark Brown
2023-07-24 12:45 ` [PATCH v2 09/35] arm64/mm: Allocate PIE slots for EL0 guarded control stack Mark Brown
2023-07-24 12:45   ` Mark Brown
2023-07-24 12:45 ` [PATCH v2 10/35] mm: Define VM_SHADOW_STACK for arm64 when we support GCS Mark Brown
2023-07-24 12:45   ` Mark Brown
2023-07-24 12:45 ` [PATCH v2 11/35] arm64/mm: Map pages for guarded control stack Mark Brown
2023-07-24 12:45   ` Mark Brown
2023-07-24 12:45 ` [PATCH v2 12/35] KVM: arm64: Manage GCS registers for guests Mark Brown
2023-07-24 12:45   ` Mark Brown
2023-07-24 12:46 ` Mark Brown [this message]
2023-07-24 12:46   ` [PATCH v2 13/35] arm64/el2_setup: Allow GCS usage at EL0 and EL1 Mark Brown
2023-07-24 12:46 ` [PATCH v2 14/35] arm64/idreg: Add overrride for GCS Mark Brown
2023-07-24 12:46   ` Mark Brown
2023-07-24 12:46 ` [PATCH v2 15/35] arm64/hwcap: Add hwcap " Mark Brown
2023-07-24 12:46   ` Mark Brown
2023-07-24 12:46 ` [PATCH v2 16/35] arm64/traps: Handle GCS exceptions Mark Brown
2023-07-24 12:46   ` Mark Brown
2023-07-24 12:46 ` [PATCH v2 17/35] arm64/mm: Handle GCS data aborts Mark Brown
2023-07-24 12:46   ` Mark Brown
2023-07-24 12:46 ` [PATCH v2 18/35] arm64/gcs: Context switch GCS registers for EL0 Mark Brown
2023-07-24 12:46   ` Mark Brown
2023-07-24 12:46 ` [PATCH v2 19/35] arm64/gcs: Allocate a new GCS for threads with GCS enabled Mark Brown
2023-07-24 12:46   ` Mark Brown
2023-07-24 12:46 ` [PATCH v2 20/35] arm64/gcs: Implement shadow stack prctl() interface Mark Brown
2023-07-24 12:46   ` Mark Brown
2023-07-24 12:46 ` [PATCH v2 21/35] arm64/mm: Implement map_shadow_stack() Mark Brown
2023-07-24 12:46   ` Mark Brown
2023-07-24 12:46 ` [PATCH v2 22/35] arm64/signal: Set up and restore the GCS context for signal handlers Mark Brown
2023-07-24 12:46   ` Mark Brown
2023-07-24 12:46 ` [PATCH v2 23/35] arm64/signal: Expose GCS state in signal frames Mark Brown
2023-07-24 12:46   ` Mark Brown
2023-07-24 12:46 ` [PATCH v2 24/35] arm64/ptrace: Expose GCS via ptrace and core files Mark Brown
2023-07-24 12:46   ` Mark Brown
2023-07-24 12:46 ` [PATCH v2 25/35] arm64: Add Kconfig for Guarded Control Stack (GCS) Mark Brown
2023-07-24 12:46   ` Mark Brown
2023-07-24 12:46 ` [PATCH v2 26/35] kselftest/arm64: Verify the GCS hwcap Mark Brown
2023-07-24 12:46   ` Mark Brown
2023-07-24 12:46 ` [PATCH v2 27/35] kselftest/arm64: Add GCS as a detected feature in the signal tests Mark Brown
2023-07-24 12:46   ` Mark Brown
2023-07-24 12:46 ` [PATCH v2 28/35] kselftest/arm64: Add framework support for GCS to signal handling tests Mark Brown
2023-07-24 12:46   ` Mark Brown
2023-07-24 12:46 ` [PATCH v2 29/35] kselftest/arm64: Allow signals tests to specify an expected si_code Mark Brown
2023-07-24 12:46   ` Mark Brown
2023-07-24 12:46 ` [PATCH v2 30/35] kselftest/arm64: Always run signals tests with GCS enabled Mark Brown
2023-07-24 12:46   ` Mark Brown
2023-07-24 12:46 ` [PATCH v2 31/35] kselftest/arm64: Add very basic GCS test program Mark Brown
2023-07-24 12:46   ` Mark Brown
2023-07-24 12:46 ` [PATCH v2 32/35] kselftest/arm64: Add a GCS test program built with the system libc Mark Brown
2023-07-24 12:46   ` Mark Brown
2023-07-24 12:46 ` [PATCH v2 33/35] kselftest/arm64: Add test coverage for GCS mode locking Mark Brown
2023-07-24 12:46   ` Mark Brown
2023-07-24 12:46 ` [PATCH v2 34/35] selftests/arm64: Add GCS signal tests Mark Brown
2023-07-24 12:46   ` Mark Brown
2023-07-24 12:46 ` [PATCH v2 35/35] kselftest/arm64: Enable GCS for the FP stress tests Mark Brown
2023-07-24 12:46   ` 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=20230724-arm64-gcs-v2-13-dc2c1d44c2eb@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.