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>,
	 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 v11 32/39] kselftest/arm64: Always run signals tests with GCS enabled
Date: Thu, 22 Aug 2024 02:15:35 +0100	[thread overview]
Message-ID: <20240822-arm64-gcs-v11-32-41b81947ecb5@kernel.org> (raw)
In-Reply-To: <20240822-arm64-gcs-v11-0-41b81947ecb5@kernel.org>

Since it is not possible to return from the function that enabled GCS
without disabling GCS it is very inconvenient to use the signal handling
tests to cover GCS when GCS is not enabled by the toolchain and runtime,
something that no current distribution does. Since none of the testcases
do anything with stacks that would cause problems with GCS we can sidestep
this issue by unconditionally enabling GCS on startup and exiting with a
call to exit() rather than a return from main().

Reviewed-by: Thiago Jung Bauermann <thiago.bauermann@linaro.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 .../testing/selftests/arm64/signal/test_signals.c  | 17 ++++++++++++-
 .../selftests/arm64/signal/test_signals_utils.h    | 29 ++++++++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/tools/testing/selftests/arm64/signal/test_signals.c b/tools/testing/selftests/arm64/signal/test_signals.c
index 00051b40d71e..30e95f50db19 100644
--- a/tools/testing/selftests/arm64/signal/test_signals.c
+++ b/tools/testing/selftests/arm64/signal/test_signals.c
@@ -7,6 +7,10 @@
  * Each test provides its own tde struct tdescr descriptor to link with
  * this wrapper. Framework provides common helpers.
  */
+
+#include <sys/auxv.h>
+#include <sys/prctl.h>
+
 #include <kselftest.h>
 
 #include "test_signals.h"
@@ -16,6 +20,16 @@ struct tdescr *current = &tde;
 
 int main(int argc, char *argv[])
 {
+	/*
+	 * Ensure GCS is at least enabled throughout the tests if
+	 * supported, otherwise the inability to return from the
+	 * function that enabled GCS makes it very inconvenient to set
+	 * up test cases.  The prctl() may fail if GCS was locked by
+	 * libc setup code.
+	 */
+	if (getauxval(AT_HWCAP2) & HWCAP2_GCS)
+		gcs_set_state(PR_SHADOW_STACK_ENABLE);
+
 	ksft_print_msg("%s :: %s\n", current->name, current->descr);
 	if (test_setup(current) && test_init(current)) {
 		test_run(current);
@@ -23,5 +37,6 @@ int main(int argc, char *argv[])
 	}
 	test_result(current);
 
-	return current->result;
+	/* Do not return in case GCS was enabled */
+	exit(current->result);
 }
diff --git a/tools/testing/selftests/arm64/signal/test_signals_utils.h b/tools/testing/selftests/arm64/signal/test_signals_utils.h
index 762c8fe9c54a..1e80808ee105 100644
--- a/tools/testing/selftests/arm64/signal/test_signals_utils.h
+++ b/tools/testing/selftests/arm64/signal/test_signals_utils.h
@@ -18,6 +18,35 @@ void test_cleanup(struct tdescr *td);
 int test_run(struct tdescr *td);
 void test_result(struct tdescr *td);
 
+#ifndef __NR_prctl
+#define __NR_prctl 167
+#endif
+
+/*
+ * The prctl takes 1 argument but we need to ensure that the other
+ * values passed in registers to the syscall are zero since the kernel
+ * validates them.
+ */
+#define gcs_set_state(state)					\
+	({								\
+		register long _num  __asm__ ("x8") = __NR_prctl;	\
+		register long _arg1 __asm__ ("x0") =  PR_SET_SHADOW_STACK_STATUS; \
+		register long _arg2 __asm__ ("x1") = (long)(state);	\
+		register long _arg3 __asm__ ("x2") = 0;			\
+		register long _arg4 __asm__ ("x3") = 0;			\
+		register long _arg5 __asm__ ("x4") = 0;			\
+	                                                                      \
+		__asm__  volatile (					\
+			"svc #0\n"					\
+			: "=r"(_arg1)					\
+			: "r"(_arg1), "r"(_arg2),			\
+			  "r"(_arg3), "r"(_arg4),			\
+			  "r"(_arg5), "r"(_num)				\
+			: "memory", "cc"				\
+			);						\
+		_arg1;							\
+	})
+
 static inline bool feats_ok(struct tdescr *td)
 {
 	if (td->feats_incompatible & td->feats_supported)

-- 
2.39.2



  parent reply	other threads:[~2024-08-22  1:22 UTC|newest]

Thread overview: 65+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-08-22  1:15 [PATCH v11 00/39] arm64/gcs: Provide support for GCS in userspace Mark Brown
2024-08-22  1:15 ` [PATCH v11 01/39] mm: Introduce ARCH_HAS_USER_SHADOW_STACK Mark Brown
2024-08-22  1:15 ` [PATCH v11 02/39] arm64/mm: Restructure arch_validate_flags() for extensibility Mark Brown
2024-08-22  1:15 ` [PATCH v11 03/39] prctl: arch-agnostic prctl for shadow stack Mark Brown
2024-08-22  1:15 ` [PATCH v11 04/39] mman: Add map_shadow_stack() flags Mark Brown
2024-08-22  1:15 ` [PATCH v11 05/39] arm64: Document boot requirements for Guarded Control Stacks Mark Brown
2024-08-22  8:58   ` Catalin Marinas
2024-08-22  1:15 ` [PATCH v11 06/39] arm64/gcs: Document the ABI " Mark Brown
2024-08-22 10:04   ` Catalin Marinas
2024-08-22  1:15 ` [PATCH v11 07/39] arm64/sysreg: Add definitions for architected GCS caps Mark Brown
2024-08-22  1:15 ` [PATCH v11 08/39] arm64/gcs: Add manual encodings of GCS instructions Mark Brown
2024-08-22  1:15 ` [PATCH v11 09/39] arm64/gcs: Provide put_user_gcs() Mark Brown
2024-08-22  1:15 ` [PATCH v11 10/39] arm64/gcs: Provide basic EL2 setup to allow GCS usage at EL0 and EL1 Mark Brown
2024-08-22  1:15 ` [PATCH v11 11/39] arm64/cpufeature: Runtime detection of Guarded Control Stack (GCS) Mark Brown
2024-08-22  1:15 ` [PATCH v11 12/39] arm64/mm: Allocate PIE slots for EL0 guarded control stack Mark Brown
2024-08-22  1:15 ` [PATCH v11 13/39] mm: Define VM_SHADOW_STACK for arm64 when we support GCS Mark Brown
2024-08-22 10:14   ` Catalin Marinas
2024-08-22  1:15 ` [PATCH v11 14/39] arm64/mm: Map pages for guarded control stack Mark Brown
2024-08-22 10:19   ` Catalin Marinas
2024-08-22  1:15 ` [PATCH v11 15/39] KVM: arm64: Manage GCS access and registers for guests Mark Brown
2024-08-22  1:15 ` [PATCH v11 16/39] arm64/idreg: Add overrride for GCS Mark Brown
2024-08-22 11:30   ` Catalin Marinas
2024-08-22  1:15 ` [PATCH v11 17/39] arm64/hwcap: Add hwcap " Mark Brown
2024-08-22 11:31   ` Catalin Marinas
2024-08-22  1:15 ` [PATCH v11 18/39] arm64/traps: Handle GCS exceptions Mark Brown
2024-08-22 11:31   ` Catalin Marinas
2024-08-22 15:44   ` Catalin Marinas
2024-08-22 16:31     ` Mark Brown
2024-08-22  1:15 ` [PATCH v11 19/39] arm64/mm: Handle GCS data aborts Mark Brown
2024-08-22 16:12   ` Catalin Marinas
2024-08-22 16:44     ` Mark Brown
2024-08-22 17:19       ` Catalin Marinas
2024-08-22 17:30         ` Mark Brown
2024-08-22  1:15 ` [PATCH v11 20/39] arm64/gcs: Context switch GCS state for EL0 Mark Brown
2024-08-22 16:15   ` Catalin Marinas
2024-08-22  1:15 ` [PATCH v11 21/39] arm64/gcs: Ensure that new threads have a GCS Mark Brown
2024-08-22 16:17   ` Catalin Marinas
2024-08-22 16:24     ` Mark Brown
2024-08-22  1:15 ` [PATCH v11 22/39] arm64/gcs: Implement shadow stack prctl() interface Mark Brown
2024-08-22  1:15 ` [PATCH v11 23/39] arm64/mm: Implement map_shadow_stack() Mark Brown
2024-08-22  1:15 ` [PATCH v11 24/39] arm64/signal: Set up and restore the GCS context for signal handlers Mark Brown
2024-08-23  9:11   ` Catalin Marinas
2024-08-22  1:15 ` [PATCH v11 25/39] arm64/signal: Expose GCS state in signal frames Mark Brown
2024-08-23  9:37   ` Catalin Marinas
2024-08-23 10:25     ` Mark Brown
2024-08-23 15:59       ` Catalin Marinas
2024-08-23 22:01         ` Mark Brown
2024-08-26 10:00           ` Catalin Marinas
2024-08-28 17:32             ` Mark Brown
2024-08-22  1:15 ` [PATCH v11 26/39] arm64/ptrace: Expose GCS via ptrace and core files Mark Brown
2024-08-23  9:41   ` Catalin Marinas
2024-08-22  1:15 ` [PATCH v11 27/39] arm64: Add Kconfig for Guarded Control Stack (GCS) Mark Brown
2024-08-23  9:48   ` Catalin Marinas
2024-08-22  1:15 ` [PATCH v11 28/39] kselftest/arm64: Verify the GCS hwcap Mark Brown
2024-08-22  1:15 ` [PATCH v11 29/39] kselftest/arm64: Add GCS as a detected feature in the signal tests Mark Brown
2024-08-22  1:15 ` [PATCH v11 30/39] kselftest/arm64: Add framework support for GCS to signal handling tests Mark Brown
2024-08-22  1:15 ` [PATCH v11 31/39] kselftest/arm64: Allow signals tests to specify an expected si_code Mark Brown
2024-08-22  1:15 ` Mark Brown [this message]
2024-08-22  1:15 ` [PATCH v11 33/39] kselftest/arm64: Add very basic GCS test program Mark Brown
2024-08-22  1:15 ` [PATCH v11 34/39] kselftest/arm64: Add a GCS test program built with the system libc Mark Brown
2024-08-22  1:15 ` [PATCH v11 35/39] kselftest/arm64: Add test coverage for GCS mode locking Mark Brown
2024-08-22  1:15 ` [PATCH v11 36/39] kselftest/arm64: Add GCS signal tests Mark Brown
2024-08-22  1:15 ` [PATCH v11 37/39] kselftest/arm64: Add a GCS stress test Mark Brown
2024-08-22  1:15 ` [PATCH v11 38/39] kselftest/arm64: Enable GCS for the FP stress tests Mark Brown
2024-08-22  1:15 ` [PATCH v11 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=20240822-arm64-gcs-v11-32-41b81947ecb5@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