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 30/35] kselftest/arm64: Always run signals tests with GCS enabled Date: Mon, 24 Jul 2023 13:46:17 +0100 [thread overview] Message-ID: <20230724-arm64-gcs-v2-30-dc2c1d44c2eb@kernel.org> (raw) In-Reply-To: <20230724-arm64-gcs-v2-0-dc2c1d44c2eb@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(). 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 222093f51b67..1cea64986baa 100644 --- a/tools/testing/selftests/arm64/signal/test_signals_utils.h +++ b/tools/testing/selftests/arm64/signal/test_signals_utils.h @@ -16,6 +16,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.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 v2 30/35] kselftest/arm64: Always run signals tests with GCS enabled Date: Mon, 24 Jul 2023 13:46:17 +0100 [thread overview] Message-ID: <20230724-arm64-gcs-v2-30-dc2c1d44c2eb@kernel.org> (raw) In-Reply-To: <20230724-arm64-gcs-v2-0-dc2c1d44c2eb@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(). 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 222093f51b67..1cea64986baa 100644 --- a/tools/testing/selftests/arm64/signal/test_signals_utils.h +++ b/tools/testing/selftests/arm64/signal/test_signals_utils.h @@ -16,6 +16,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.30.2 _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv
next prev parent reply other threads:[~2023-07-24 12:55 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 ` [PATCH v2 13/35] arm64/el2_setup: Allow GCS usage at EL0 and EL1 Mark Brown 2023-07-24 12:46 ` 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 ` Mark Brown [this message] 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 ` [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-30-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: linkBe 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.