kselftest/arm64/gcs: Use nolibc's getauxval()

Nolibc now does have getauxval(), use it.

Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
Reviewed-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Will Deacon <will@kernel.org>

diff --git a/tools/testing/selftests/arm64/gcs/basic-gcs.c b/tools/testing/selftests/arm64/gcs/basic-gcs.c
index 100d2a983155f7347a19b2b8b88f9494dc6a51d5..250977abc3988685abf68666d35b7a8547f74f4e 100644 (file)
--- a/tools/testing/selftests/arm64/gcs/basic-gcs.c
+++ b/tools/testing/selftests/arm64/gcs/basic-gcs.c
@@ -10,6 +10,7 @@
 
 #include <sys/mman.h>
 #include <asm/mman.h>
+#include <asm/hwcap.h>
 #include <linux/sched.h>
 
 #include "kselftest.h"
@@ -386,14 +387,13 @@ int main(void)
 
        ksft_print_header();
 
-       /*
-        * We don't have getauxval() with nolibc so treat a failure to
-        * read GCS state as a lack of support and skip.
-        */
+       if (!(getauxval(AT_HWCAP) & HWCAP_GCS))
+               ksft_exit_skip("SKIP GCS not supported\n");
+
        ret = my_syscall5(__NR_prctl, PR_GET_SHADOW_STACK_STATUS,
                          &gcs_mode, 0, 0, 0);
        if (ret != 0)
-               ksft_exit_skip("Failed to read GCS state: %d\n", ret);
+               ksft_exit_fail_msg("Failed to read GCS state: %d\n", ret);
 
        if (!(gcs_mode & PR_SHADOW_STACK_ENABLE)) {
                gcs_mode = PR_SHADOW_STACK_ENABLE;