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 33/35] kselftest/arm64: Add a GCS test program built with the system libc
Date: Sun, 16 Jul 2023 22:51:29 +0100	[thread overview]
Message-ID: <20230716-arm64-gcs-v1-33-bf567f93bba6@kernel.org> (raw)
In-Reply-To: <20230716-arm64-gcs-v1-0-bf567f93bba6@kernel.org>

There are things like threads which nolibc struggles with which we want
to add coverage for, and the ABI allows us to test most of these even if
libc itself does not understand GCS so add a test application built
using the system libc.

Signed-off-by: Mark Brown <broonie@kernel.org>
---
 tools/testing/selftests/arm64/gcs/.gitignore |   1 +
 tools/testing/selftests/arm64/gcs/Makefile   |   4 +-
 tools/testing/selftests/arm64/gcs/libc-gcs.c | 217 +++++++++++++++++++++++++++
 3 files changed, 221 insertions(+), 1 deletion(-)

diff --git a/tools/testing/selftests/arm64/gcs/.gitignore b/tools/testing/selftests/arm64/gcs/.gitignore
index 0e5e695ecba5..5810c4a163d4 100644
--- a/tools/testing/selftests/arm64/gcs/.gitignore
+++ b/tools/testing/selftests/arm64/gcs/.gitignore
@@ -1 +1,2 @@
 basic-gcs
+libc-gcs
diff --git a/tools/testing/selftests/arm64/gcs/Makefile b/tools/testing/selftests/arm64/gcs/Makefile
index 322c40d25f2e..31fbd3a6bf27 100644
--- a/tools/testing/selftests/arm64/gcs/Makefile
+++ b/tools/testing/selftests/arm64/gcs/Makefile
@@ -6,7 +6,9 @@
 # nolibc.
 #
 
-TEST_GEN_PROGS := basic-gcs
+TEST_GEN_PROGS := basic-gcs libc-gcs
+
+LDLIBS+=-lpthread
 
 include ../../lib.mk
 
diff --git a/tools/testing/selftests/arm64/gcs/libc-gcs.c b/tools/testing/selftests/arm64/gcs/libc-gcs.c
new file mode 100644
index 000000000000..7ac3c3a2da52
--- /dev/null
+++ b/tools/testing/selftests/arm64/gcs/libc-gcs.c
@@ -0,0 +1,217 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (C) 2023 ARM Limited.
+ */
+
+#include <pthread.h>
+#include <stdbool.h>
+
+#include <sys/auxv.h>
+#include <sys/prctl.h>
+
+#include <asm/hwcap.h>
+
+#include "kselftest_harness.h"
+
+#include "gcs-util.h"
+
+#define my_syscall2(num, arg1, arg2)                                          \
+({                                                                            \
+	register long _num  __asm__ ("x8") = (num);                           \
+	register long _arg1 __asm__ ("x0") = (long)(arg1);                    \
+	register long _arg2 __asm__ ("x1") = (long)(arg2);                    \
+	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  __attribute__((noinline)) void valid_gcs_function(void)
+{
+	/* Do something the compiler can't optimise out */
+	prctl(PR_SVE_GET_VL);
+}
+
+/* Smoke test that a function call and return works*/
+TEST(can_call_function)
+{
+	valid_gcs_function();
+}
+
+/* Smoke test that GCS is enabled in the current thread */
+TEST(gcs_locked)
+{
+	unsigned long gcs_mode;
+	int ret;
+
+	ret = my_syscall2(__NR_prctl, PR_GET_SHADOW_STACK_STATUS, &gcs_mode);
+	ASSERT_EQ(ret, 0);
+	if (ret != 0)
+		return;
+
+	/* We are locked, even a noop reconfiguration should fail */
+	ret = my_syscall2(__NR_prctl, PR_SET_SHADOW_STACK_STATUS, gcs_mode);
+	ASSERT_NE(0, ret);
+}
+
+static void *gcs_test_thread(void *arg)
+{
+	int ret;
+	unsigned long mode;
+
+	/*
+	 * Some libcs don't seem to fill unused arguments with 0 but
+	 * the kernel validates this so we supply all 5 arguments.
+	 */
+	ret = prctl(PR_GET_SHADOW_STACK_STATUS, &mode, 0, 0, 0);
+	if (ret != 0) {
+		ksft_print_msg("PR_GET_SHADOW_STACK_STATUS failed: %d\n", ret);
+		return NULL;
+	}
+
+	if (!(mode & PR_SHADOW_STACK_ENABLE)) {
+		ksft_print_msg("GCS not enabled in thread, mode is %u\n",
+			       mode);
+		return NULL;
+	}
+
+	/* Just in case... */
+	valid_gcs_function();
+
+	/* Use a non-NULL value to indicate a pass */
+	return &gcs_test_thread;
+}
+
+/* Verify that if we start a new thread it has GCS enabled */
+TEST(gcs_enabled_thread)
+{
+	pthread_t thread;
+	void *thread_ret;
+	int ret;
+
+	ret = pthread_create(&thread, NULL, gcs_test_thread, NULL);
+	ASSERT_TRUE(ret == 0);
+	if (ret != 0)
+		return;
+
+	ret = pthread_join(thread, &thread_ret);
+	ASSERT_TRUE(ret == 0);
+	if (ret != 0)
+		return;
+
+	ASSERT_TRUE(thread_ret != NULL);
+}
+
+/* Read the GCS until we find the terminator */
+TEST(gcs_find_terminator)
+{
+	uint64_t *gcs, *cur;
+
+	gcs = get_gcspr();
+	cur = gcs;
+	while (*cur)
+		cur++;
+
+	ksft_print_msg("GCS in use from %p-%p\n", gcs, cur);
+
+	/*
+	 * We should have at least whatever called into this test so
+	 * the two pointer should differ.
+	 */
+	ASSERT_TRUE(gcs != cur);
+}
+
+/* We can switch between stacks */
+TEST(switch_stacks)
+{
+	unsigned long orig_gcspr_el0, pivot_gcspr_el0;
+	unsigned long buf_base, buf_end;
+	int ret;
+	void *buf;
+
+	buf = (void *)syscall(__NR_map_shadow_stack, 0,
+			      sysconf(_SC_PAGE_SIZE), 0);
+	ASSERT_FALSE(buf == MAP_FAILED);
+	buf_base = (unsigned long)buf;
+	buf_end = buf_base + sysconf(_SC_PAGE_SIZE);
+
+	/* Skip over the stack terminator and point at the cap */
+	pivot_gcspr_el0 = buf_end - 16;
+
+	ksft_print_msg("Mapped GCS at %p-%p\n", buf, buf_end);
+
+	/* Pivot to the new GCS */
+	ksft_print_msg("pivoting to %p from %p, target has value 0x%lx\n",
+		       pivot_gcspr_el0, get_gcspr(),
+		       *((unsigned long *)pivot_gcspr_el0));
+	gcsss1(pivot_gcspr_el0);
+	orig_gcspr_el0 = gcsss2();
+	ksft_print_msg("pivoted to %p from %p, target has value 0x%lx\n",
+		       pivot_gcspr_el0, get_gcspr(),
+		       *((uint64_t *)pivot_gcspr_el0));
+
+	/* New GCS must be in the new buffer */
+	ASSERT_TRUE((unsigned long)get_gcspr() < buf_base);
+	ASSERT_TRUE((unsigned long)get_gcspr() > buf_end);
+
+	/* Make sure we can still do calls */
+	valid_gcs_function();
+	ksft_print_msg("Pivoted to %p\n", get_gcspr());
+
+	/* Pivot back to the original GCS */
+	gcsss1(orig_gcspr_el0);
+	pivot_gcspr_el0 = gcsss2();
+
+	valid_gcs_function();
+	ksft_print_msg("Pivoted back to 0x%lx\n", get_gcspr());
+
+	ret = munmap(buf, sysconf(_SC_PAGE_SIZE));
+	ASSERT_EQ(ret, 0);
+}
+
+int main(int argc, char **argv)
+{
+	unsigned long gcs_mode;
+	int ret;
+
+	if (!(getauxval(AT_HWCAP2) & HWCAP2_GCS))
+		ksft_exit_skip("SKIP GCS not supported\n");
+
+	/* 
+	 * Force shadow stacks on, our tests *should* be fine with or
+	 * without libc support and with or without this having ended
+	 * up tagged for GCS and enabled by the dynamic linker.  We
+	 * can't use the libc prctl() function since we can't return
+	 * from enabling the stack.  Also lock GCS if not already
+	 * locked so we can test behaviour when it's locked.
+	 */
+	ret = my_syscall2(__NR_prctl, PR_GET_SHADOW_STACK_STATUS, &gcs_mode);
+	if (ret) {
+		ksft_print_msg("Failed to read GCS state: %d\n", ret);
+		return EXIT_FAILURE;
+	}
+	
+	/* If we are already locked we can't configure */
+	if (!(gcs_mode & PR_SHADOW_STACK_LOCK)) {
+		gcs_mode |= PR_SHADOW_STACK_ENABLE | PR_SHADOW_STACK_LOCK;
+
+		ret = my_syscall2(__NR_prctl, PR_SET_SHADOW_STACK_STATUS,
+				  gcs_mode);
+		if (ret) {
+			ksft_print_msg("Failed to configure GCS: %d\n", ret);
+			return EXIT_FAILURE;
+		}
+	}
+
+	/* Avoid returning in case libc doesn't understand GCS */
+	exit(test_harness_run(argc, argv));
+}

-- 
2.30.2


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 33/35] kselftest/arm64: Add a GCS test program built with the system libc
Date: Sun, 16 Jul 2023 22:51:29 +0100	[thread overview]
Message-ID: <20230716-arm64-gcs-v1-33-bf567f93bba6@kernel.org> (raw)
In-Reply-To: <20230716-arm64-gcs-v1-0-bf567f93bba6@kernel.org>

There are things like threads which nolibc struggles with which we want
to add coverage for, and the ABI allows us to test most of these even if
libc itself does not understand GCS so add a test application built
using the system libc.

Signed-off-by: Mark Brown <broonie@kernel.org>
---
 tools/testing/selftests/arm64/gcs/.gitignore |   1 +
 tools/testing/selftests/arm64/gcs/Makefile   |   4 +-
 tools/testing/selftests/arm64/gcs/libc-gcs.c | 217 +++++++++++++++++++++++++++
 3 files changed, 221 insertions(+), 1 deletion(-)

diff --git a/tools/testing/selftests/arm64/gcs/.gitignore b/tools/testing/selftests/arm64/gcs/.gitignore
index 0e5e695ecba5..5810c4a163d4 100644
--- a/tools/testing/selftests/arm64/gcs/.gitignore
+++ b/tools/testing/selftests/arm64/gcs/.gitignore
@@ -1 +1,2 @@
 basic-gcs
+libc-gcs
diff --git a/tools/testing/selftests/arm64/gcs/Makefile b/tools/testing/selftests/arm64/gcs/Makefile
index 322c40d25f2e..31fbd3a6bf27 100644
--- a/tools/testing/selftests/arm64/gcs/Makefile
+++ b/tools/testing/selftests/arm64/gcs/Makefile
@@ -6,7 +6,9 @@
 # nolibc.
 #
 
-TEST_GEN_PROGS := basic-gcs
+TEST_GEN_PROGS := basic-gcs libc-gcs
+
+LDLIBS+=-lpthread
 
 include ../../lib.mk
 
diff --git a/tools/testing/selftests/arm64/gcs/libc-gcs.c b/tools/testing/selftests/arm64/gcs/libc-gcs.c
new file mode 100644
index 000000000000..7ac3c3a2da52
--- /dev/null
+++ b/tools/testing/selftests/arm64/gcs/libc-gcs.c
@@ -0,0 +1,217 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (C) 2023 ARM Limited.
+ */
+
+#include <pthread.h>
+#include <stdbool.h>
+
+#include <sys/auxv.h>
+#include <sys/prctl.h>
+
+#include <asm/hwcap.h>
+
+#include "kselftest_harness.h"
+
+#include "gcs-util.h"
+
+#define my_syscall2(num, arg1, arg2)                                          \
+({                                                                            \
+	register long _num  __asm__ ("x8") = (num);                           \
+	register long _arg1 __asm__ ("x0") = (long)(arg1);                    \
+	register long _arg2 __asm__ ("x1") = (long)(arg2);                    \
+	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  __attribute__((noinline)) void valid_gcs_function(void)
+{
+	/* Do something the compiler can't optimise out */
+	prctl(PR_SVE_GET_VL);
+}
+
+/* Smoke test that a function call and return works*/
+TEST(can_call_function)
+{
+	valid_gcs_function();
+}
+
+/* Smoke test that GCS is enabled in the current thread */
+TEST(gcs_locked)
+{
+	unsigned long gcs_mode;
+	int ret;
+
+	ret = my_syscall2(__NR_prctl, PR_GET_SHADOW_STACK_STATUS, &gcs_mode);
+	ASSERT_EQ(ret, 0);
+	if (ret != 0)
+		return;
+
+	/* We are locked, even a noop reconfiguration should fail */
+	ret = my_syscall2(__NR_prctl, PR_SET_SHADOW_STACK_STATUS, gcs_mode);
+	ASSERT_NE(0, ret);
+}
+
+static void *gcs_test_thread(void *arg)
+{
+	int ret;
+	unsigned long mode;
+
+	/*
+	 * Some libcs don't seem to fill unused arguments with 0 but
+	 * the kernel validates this so we supply all 5 arguments.
+	 */
+	ret = prctl(PR_GET_SHADOW_STACK_STATUS, &mode, 0, 0, 0);
+	if (ret != 0) {
+		ksft_print_msg("PR_GET_SHADOW_STACK_STATUS failed: %d\n", ret);
+		return NULL;
+	}
+
+	if (!(mode & PR_SHADOW_STACK_ENABLE)) {
+		ksft_print_msg("GCS not enabled in thread, mode is %u\n",
+			       mode);
+		return NULL;
+	}
+
+	/* Just in case... */
+	valid_gcs_function();
+
+	/* Use a non-NULL value to indicate a pass */
+	return &gcs_test_thread;
+}
+
+/* Verify that if we start a new thread it has GCS enabled */
+TEST(gcs_enabled_thread)
+{
+	pthread_t thread;
+	void *thread_ret;
+	int ret;
+
+	ret = pthread_create(&thread, NULL, gcs_test_thread, NULL);
+	ASSERT_TRUE(ret == 0);
+	if (ret != 0)
+		return;
+
+	ret = pthread_join(thread, &thread_ret);
+	ASSERT_TRUE(ret == 0);
+	if (ret != 0)
+		return;
+
+	ASSERT_TRUE(thread_ret != NULL);
+}
+
+/* Read the GCS until we find the terminator */
+TEST(gcs_find_terminator)
+{
+	uint64_t *gcs, *cur;
+
+	gcs = get_gcspr();
+	cur = gcs;
+	while (*cur)
+		cur++;
+
+	ksft_print_msg("GCS in use from %p-%p\n", gcs, cur);
+
+	/*
+	 * We should have at least whatever called into this test so
+	 * the two pointer should differ.
+	 */
+	ASSERT_TRUE(gcs != cur);
+}
+
+/* We can switch between stacks */
+TEST(switch_stacks)
+{
+	unsigned long orig_gcspr_el0, pivot_gcspr_el0;
+	unsigned long buf_base, buf_end;
+	int ret;
+	void *buf;
+
+	buf = (void *)syscall(__NR_map_shadow_stack, 0,
+			      sysconf(_SC_PAGE_SIZE), 0);
+	ASSERT_FALSE(buf == MAP_FAILED);
+	buf_base = (unsigned long)buf;
+	buf_end = buf_base + sysconf(_SC_PAGE_SIZE);
+
+	/* Skip over the stack terminator and point at the cap */
+	pivot_gcspr_el0 = buf_end - 16;
+
+	ksft_print_msg("Mapped GCS at %p-%p\n", buf, buf_end);
+
+	/* Pivot to the new GCS */
+	ksft_print_msg("pivoting to %p from %p, target has value 0x%lx\n",
+		       pivot_gcspr_el0, get_gcspr(),
+		       *((unsigned long *)pivot_gcspr_el0));
+	gcsss1(pivot_gcspr_el0);
+	orig_gcspr_el0 = gcsss2();
+	ksft_print_msg("pivoted to %p from %p, target has value 0x%lx\n",
+		       pivot_gcspr_el0, get_gcspr(),
+		       *((uint64_t *)pivot_gcspr_el0));
+
+	/* New GCS must be in the new buffer */
+	ASSERT_TRUE((unsigned long)get_gcspr() < buf_base);
+	ASSERT_TRUE((unsigned long)get_gcspr() > buf_end);
+
+	/* Make sure we can still do calls */
+	valid_gcs_function();
+	ksft_print_msg("Pivoted to %p\n", get_gcspr());
+
+	/* Pivot back to the original GCS */
+	gcsss1(orig_gcspr_el0);
+	pivot_gcspr_el0 = gcsss2();
+
+	valid_gcs_function();
+	ksft_print_msg("Pivoted back to 0x%lx\n", get_gcspr());
+
+	ret = munmap(buf, sysconf(_SC_PAGE_SIZE));
+	ASSERT_EQ(ret, 0);
+}
+
+int main(int argc, char **argv)
+{
+	unsigned long gcs_mode;
+	int ret;
+
+	if (!(getauxval(AT_HWCAP2) & HWCAP2_GCS))
+		ksft_exit_skip("SKIP GCS not supported\n");
+
+	/* 
+	 * Force shadow stacks on, our tests *should* be fine with or
+	 * without libc support and with or without this having ended
+	 * up tagged for GCS and enabled by the dynamic linker.  We
+	 * can't use the libc prctl() function since we can't return
+	 * from enabling the stack.  Also lock GCS if not already
+	 * locked so we can test behaviour when it's locked.
+	 */
+	ret = my_syscall2(__NR_prctl, PR_GET_SHADOW_STACK_STATUS, &gcs_mode);
+	if (ret) {
+		ksft_print_msg("Failed to read GCS state: %d\n", ret);
+		return EXIT_FAILURE;
+	}
+	
+	/* If we are already locked we can't configure */
+	if (!(gcs_mode & PR_SHADOW_STACK_LOCK)) {
+		gcs_mode |= PR_SHADOW_STACK_ENABLE | PR_SHADOW_STACK_LOCK;
+
+		ret = my_syscall2(__NR_prctl, PR_SET_SHADOW_STACK_STATUS,
+				  gcs_mode);
+		if (ret) {
+			ksft_print_msg("Failed to configure GCS: %d\n", ret);
+			return EXIT_FAILURE;
+		}
+	}
+
+	/* Avoid returning in case libc doesn't understand GCS */
+	exit(test_harness_run(argc, argv));
+}

-- 
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 33/35] kselftest/arm64: Add a GCS test program built with the system libc
Date: Sun, 16 Jul 2023 22:51:29 +0100	[thread overview]
Message-ID: <20230716-arm64-gcs-v1-33-bf567f93bba6@kernel.org> (raw)
In-Reply-To: <20230716-arm64-gcs-v1-0-bf567f93bba6@kernel.org>

There are things like threads which nolibc struggles with which we want
to add coverage for, and the ABI allows us to test most of these even if
libc itself does not understand GCS so add a test application built
using the system libc.

Signed-off-by: Mark Brown <broonie@kernel.org>
---
 tools/testing/selftests/arm64/gcs/.gitignore |   1 +
 tools/testing/selftests/arm64/gcs/Makefile   |   4 +-
 tools/testing/selftests/arm64/gcs/libc-gcs.c | 217 +++++++++++++++++++++++++++
 3 files changed, 221 insertions(+), 1 deletion(-)

diff --git a/tools/testing/selftests/arm64/gcs/.gitignore b/tools/testing/selftests/arm64/gcs/.gitignore
index 0e5e695ecba5..5810c4a163d4 100644
--- a/tools/testing/selftests/arm64/gcs/.gitignore
+++ b/tools/testing/selftests/arm64/gcs/.gitignore
@@ -1 +1,2 @@
 basic-gcs
+libc-gcs
diff --git a/tools/testing/selftests/arm64/gcs/Makefile b/tools/testing/selftests/arm64/gcs/Makefile
index 322c40d25f2e..31fbd3a6bf27 100644
--- a/tools/testing/selftests/arm64/gcs/Makefile
+++ b/tools/testing/selftests/arm64/gcs/Makefile
@@ -6,7 +6,9 @@
 # nolibc.
 #
 
-TEST_GEN_PROGS := basic-gcs
+TEST_GEN_PROGS := basic-gcs libc-gcs
+
+LDLIBS+=-lpthread
 
 include ../../lib.mk
 
diff --git a/tools/testing/selftests/arm64/gcs/libc-gcs.c b/tools/testing/selftests/arm64/gcs/libc-gcs.c
new file mode 100644
index 000000000000..7ac3c3a2da52
--- /dev/null
+++ b/tools/testing/selftests/arm64/gcs/libc-gcs.c
@@ -0,0 +1,217 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (C) 2023 ARM Limited.
+ */
+
+#include <pthread.h>
+#include <stdbool.h>
+
+#include <sys/auxv.h>
+#include <sys/prctl.h>
+
+#include <asm/hwcap.h>
+
+#include "kselftest_harness.h"
+
+#include "gcs-util.h"
+
+#define my_syscall2(num, arg1, arg2)                                          \
+({                                                                            \
+	register long _num  __asm__ ("x8") = (num);                           \
+	register long _arg1 __asm__ ("x0") = (long)(arg1);                    \
+	register long _arg2 __asm__ ("x1") = (long)(arg2);                    \
+	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  __attribute__((noinline)) void valid_gcs_function(void)
+{
+	/* Do something the compiler can't optimise out */
+	prctl(PR_SVE_GET_VL);
+}
+
+/* Smoke test that a function call and return works*/
+TEST(can_call_function)
+{
+	valid_gcs_function();
+}
+
+/* Smoke test that GCS is enabled in the current thread */
+TEST(gcs_locked)
+{
+	unsigned long gcs_mode;
+	int ret;
+
+	ret = my_syscall2(__NR_prctl, PR_GET_SHADOW_STACK_STATUS, &gcs_mode);
+	ASSERT_EQ(ret, 0);
+	if (ret != 0)
+		return;
+
+	/* We are locked, even a noop reconfiguration should fail */
+	ret = my_syscall2(__NR_prctl, PR_SET_SHADOW_STACK_STATUS, gcs_mode);
+	ASSERT_NE(0, ret);
+}
+
+static void *gcs_test_thread(void *arg)
+{
+	int ret;
+	unsigned long mode;
+
+	/*
+	 * Some libcs don't seem to fill unused arguments with 0 but
+	 * the kernel validates this so we supply all 5 arguments.
+	 */
+	ret = prctl(PR_GET_SHADOW_STACK_STATUS, &mode, 0, 0, 0);
+	if (ret != 0) {
+		ksft_print_msg("PR_GET_SHADOW_STACK_STATUS failed: %d\n", ret);
+		return NULL;
+	}
+
+	if (!(mode & PR_SHADOW_STACK_ENABLE)) {
+		ksft_print_msg("GCS not enabled in thread, mode is %u\n",
+			       mode);
+		return NULL;
+	}
+
+	/* Just in case... */
+	valid_gcs_function();
+
+	/* Use a non-NULL value to indicate a pass */
+	return &gcs_test_thread;
+}
+
+/* Verify that if we start a new thread it has GCS enabled */
+TEST(gcs_enabled_thread)
+{
+	pthread_t thread;
+	void *thread_ret;
+	int ret;
+
+	ret = pthread_create(&thread, NULL, gcs_test_thread, NULL);
+	ASSERT_TRUE(ret == 0);
+	if (ret != 0)
+		return;
+
+	ret = pthread_join(thread, &thread_ret);
+	ASSERT_TRUE(ret == 0);
+	if (ret != 0)
+		return;
+
+	ASSERT_TRUE(thread_ret != NULL);
+}
+
+/* Read the GCS until we find the terminator */
+TEST(gcs_find_terminator)
+{
+	uint64_t *gcs, *cur;
+
+	gcs = get_gcspr();
+	cur = gcs;
+	while (*cur)
+		cur++;
+
+	ksft_print_msg("GCS in use from %p-%p\n", gcs, cur);
+
+	/*
+	 * We should have at least whatever called into this test so
+	 * the two pointer should differ.
+	 */
+	ASSERT_TRUE(gcs != cur);
+}
+
+/* We can switch between stacks */
+TEST(switch_stacks)
+{
+	unsigned long orig_gcspr_el0, pivot_gcspr_el0;
+	unsigned long buf_base, buf_end;
+	int ret;
+	void *buf;
+
+	buf = (void *)syscall(__NR_map_shadow_stack, 0,
+			      sysconf(_SC_PAGE_SIZE), 0);
+	ASSERT_FALSE(buf == MAP_FAILED);
+	buf_base = (unsigned long)buf;
+	buf_end = buf_base + sysconf(_SC_PAGE_SIZE);
+
+	/* Skip over the stack terminator and point at the cap */
+	pivot_gcspr_el0 = buf_end - 16;
+
+	ksft_print_msg("Mapped GCS at %p-%p\n", buf, buf_end);
+
+	/* Pivot to the new GCS */
+	ksft_print_msg("pivoting to %p from %p, target has value 0x%lx\n",
+		       pivot_gcspr_el0, get_gcspr(),
+		       *((unsigned long *)pivot_gcspr_el0));
+	gcsss1(pivot_gcspr_el0);
+	orig_gcspr_el0 = gcsss2();
+	ksft_print_msg("pivoted to %p from %p, target has value 0x%lx\n",
+		       pivot_gcspr_el0, get_gcspr(),
+		       *((uint64_t *)pivot_gcspr_el0));
+
+	/* New GCS must be in the new buffer */
+	ASSERT_TRUE((unsigned long)get_gcspr() < buf_base);
+	ASSERT_TRUE((unsigned long)get_gcspr() > buf_end);
+
+	/* Make sure we can still do calls */
+	valid_gcs_function();
+	ksft_print_msg("Pivoted to %p\n", get_gcspr());
+
+	/* Pivot back to the original GCS */
+	gcsss1(orig_gcspr_el0);
+	pivot_gcspr_el0 = gcsss2();
+
+	valid_gcs_function();
+	ksft_print_msg("Pivoted back to 0x%lx\n", get_gcspr());
+
+	ret = munmap(buf, sysconf(_SC_PAGE_SIZE));
+	ASSERT_EQ(ret, 0);
+}
+
+int main(int argc, char **argv)
+{
+	unsigned long gcs_mode;
+	int ret;
+
+	if (!(getauxval(AT_HWCAP2) & HWCAP2_GCS))
+		ksft_exit_skip("SKIP GCS not supported\n");
+
+	/* 
+	 * Force shadow stacks on, our tests *should* be fine with or
+	 * without libc support and with or without this having ended
+	 * up tagged for GCS and enabled by the dynamic linker.  We
+	 * can't use the libc prctl() function since we can't return
+	 * from enabling the stack.  Also lock GCS if not already
+	 * locked so we can test behaviour when it's locked.
+	 */
+	ret = my_syscall2(__NR_prctl, PR_GET_SHADOW_STACK_STATUS, &gcs_mode);
+	if (ret) {
+		ksft_print_msg("Failed to read GCS state: %d\n", ret);
+		return EXIT_FAILURE;
+	}
+	
+	/* If we are already locked we can't configure */
+	if (!(gcs_mode & PR_SHADOW_STACK_LOCK)) {
+		gcs_mode |= PR_SHADOW_STACK_ENABLE | PR_SHADOW_STACK_LOCK;
+
+		ret = my_syscall2(__NR_prctl, PR_SET_SHADOW_STACK_STATUS,
+				  gcs_mode);
+		if (ret) {
+			ksft_print_msg("Failed to configure GCS: %d\n", ret);
+			return EXIT_FAILURE;
+		}
+	}
+
+	/* Avoid returning in case libc doesn't understand GCS */
+	exit(test_harness_run(argc, argv));
+}

-- 
2.30.2


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

  parent reply	other threads:[~2023-07-16 22:00 UTC|newest]

Thread overview: 153+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-07-16 21:50 [PATCH 00/35] arm64/gcs: Provide support for GCS at EL0 Mark Brown
2023-07-16 21:50 ` Mark Brown
2023-07-16 21:50 ` Mark Brown
2023-07-16 21:50 ` [PATCH 01/35] prctl: arch-agnostic prctl for shadow stack Mark Brown
2023-07-16 21:50   ` Mark Brown
2023-07-16 21:50   ` Mark Brown
2023-07-18 17:45   ` Edgecombe, Rick P
2023-07-18 17:45     ` Edgecombe, Rick P
2023-07-18 17:45     ` Edgecombe, Rick P
2023-07-18 18:54     ` Mark Brown
2023-07-18 18:54       ` Mark Brown
2023-07-18 18:54       ` Mark Brown
2023-07-16 21:50 ` [PATCH 02/35] prctl: Add flag for shadow stack writeability and push/pop Mark Brown
2023-07-16 21:50   ` Mark Brown
2023-07-16 21:50   ` Mark Brown
2023-07-18 17:47   ` Edgecombe, Rick P
2023-07-18 17:47     ` Edgecombe, Rick P
2023-07-18 17:47     ` Edgecombe, Rick P
2023-07-18 19:10     ` Mark Brown
2023-07-18 19:10       ` Mark Brown
2023-07-18 19:10       ` Mark Brown
2023-07-16 21:50 ` [PATCH 03/35] arm64: Document boot requirements for Guarded Control Stacks Mark Brown
2023-07-16 21:50   ` Mark Brown
2023-07-16 21:50   ` Mark Brown
2023-07-16 21:51 ` [PATCH 04/35] arm64/gcs: Document the ABI " Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-17 11:42   ` Jonathan Cameron
2023-07-17 11:42     ` Jonathan Cameron
2023-07-17 11:42     ` Jonathan Cameron
2023-07-19 11:44   ` Mike Rapoport
2023-07-19 11:44     ` Mike Rapoport
2023-07-19 11:44     ` Mike Rapoport
2023-07-19 13:25     ` Mark Brown
2023-07-19 13:25       ` Mark Brown
2023-07-19 13:25       ` Mark Brown
2023-07-19 14:04       ` Mike Rapoport
2023-07-19 14:04         ` Mike Rapoport
2023-07-19 14:04         ` Mike Rapoport
2023-07-16 21:51 ` [PATCH 05/35] arm64/sysreg: Add new system registers for GCS Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51 ` [PATCH 06/35] arm64/sysreg: Add definitions for architected GCS caps Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51 ` [PATCH 07/35] arm64/gcs: Add manual encodings of GCS instructions Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51 ` [PATCH 08/35] arm64/gcs: Provide copy_to_user_gcs() Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51 ` [PATCH 09/35] arm64/cpufeature: Runtime detection of Guarded Control Stack (GCS) Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51 ` [PATCH 10/35] arm64/mm: Allocate PIE slots for EL0 guarded control stack Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51 ` [PATCH 11/35] mm: Define VM_SHADOW_STACK for arm64 when we support GCS Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51 ` [PATCH 12/35] arm64/mm: Map pages for guarded control stack Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51 ` [PATCH 13/35] KVM: arm64: Manage GCS registers for guests Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51 ` [PATCH 14/35] arm64: Disable traps for GCS usage at EL0 and EL1 Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51 ` [PATCH 15/35] arm64/idreg: Add overrride for GCS Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51 ` [PATCH 16/35] arm64/hwcap: Add hwcap " Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51 ` [PATCH 17/35] arm64/traps: Handle GCS exceptions Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-17 12:12   ` Jonathan Cameron
2023-07-17 12:12     ` Jonathan Cameron
2023-07-17 12:12     ` Jonathan Cameron
2023-07-16 21:51 ` [PATCH 18/35] arm64/mm: Handle GCS data aborts Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51 ` [PATCH 19/35] arm64/gcs: Context switch GCS registers for EL0 Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51 ` [PATCH 20/35] arm64/gcs: Allocate a new GCS for threads with GCS enabled Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51 ` [PATCH 21/35] arm64/gcs: Implement shadow stack prctl() interface Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-18 17:51   ` Edgecombe, Rick P
2023-07-18 17:51     ` Edgecombe, Rick P
2023-07-18 17:51     ` Edgecombe, Rick P
2023-07-18 19:37     ` Mark Brown
2023-07-18 19:37       ` Mark Brown
2023-07-18 19:37       ` Mark Brown
2023-07-16 21:51 ` [PATCH 22/35] arm64/mm: Implement map_shadow_stack() Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-18  9:10   ` Szabolcs Nagy
2023-07-18  9:10     ` Szabolcs Nagy
2023-07-18  9:10     ` Szabolcs Nagy
2023-07-18 13:55     ` Mark Brown
2023-07-18 13:55       ` Mark Brown
2023-07-18 13:55       ` Mark Brown
2023-07-18 15:49       ` Edgecombe, Rick P
2023-07-18 15:49         ` Edgecombe, Rick P
2023-07-18 15:49         ` Edgecombe, Rick P
2023-07-16 21:51 ` [PATCH 23/35] arm64/signal: Set up and restore the GCS context for signal handlers Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51 ` [PATCH 24/35] arm64/signal: Expose GCS state in signal frames Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51 ` [PATCH 25/35] arm64/ptrace: Expose GCS via ptrace and core files Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51 ` [PATCH 26/35] arm64: Add Kconfig for Guarded Control Stack (GCS) Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-17 12:32   ` Jonathan Cameron
2023-07-17 12:32     ` Jonathan Cameron
2023-07-17 12:32     ` Jonathan Cameron
2023-07-16 21:51 ` [PATCH 27/35] kselftest/arm64: Verify the GCS hwcap Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51 ` [PATCH 28/35] kselftest/arm64: Add GCS as a detected feature in the signal tests Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51 ` [PATCH 29/35] kselftest/arm64: Add framework support for GCS to signal handling tests Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51 ` [PATCH 30/35] kselftest/arm64: Allow signals tests to specify an expected si_code Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51 ` [PATCH 31/35] kselftest/arm64: Always run signals tests with GCS enabled Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51 ` [PATCH 32/35] kselftest/arm64: Add very basic GCS test program Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51 ` Mark Brown [this message]
2023-07-16 21:51   ` [PATCH 33/35] kselftest/arm64: Add a GCS test program built with the system libc Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51 ` [PATCH 34/35] selftests/arm64: Add GCS signal tests Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51 ` [PATCH 35/35] kselftest/arm64: Enable GCS for the FP stress tests Mark Brown
2023-07-16 21:51   ` Mark Brown
2023-07-16 21:51   ` 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=20230716-arm64-gcs-v1-33-bf567f93bba6@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.