From: Yury Khrustalev Date: Tue, 29 Apr 2025 12:44:11 +0000 (+0100) Subject: aarch64: update tests for SME X-Git-Tag: glibc-2.42~247 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=251f93262483b9c1184f5b72993d77a5d1c95f68;p=thirdparty%2Fglibc.git aarch64: update tests for SME Add test that checks that ZA state is disabled after setjmp and sigsetjmp Update existing SME test that uses setjmp Reviewed-by: Wilco Dijkstra --- diff --git a/sysdeps/aarch64/Makefile b/sysdeps/aarch64/Makefile index 4b7f8a5c07..2cb8f6cebc 100644 --- a/sysdeps/aarch64/Makefile +++ b/sysdeps/aarch64/Makefile @@ -75,7 +75,9 @@ sysdep_routines += \ __alloc_gcs tests += \ - tst-sme-jmp + tst-sme-jmp \ + tst-sme-za-state \ + # tests endif ifeq ($(subdir),malloc) diff --git a/sysdeps/aarch64/tst-sme-helper.h b/sysdeps/aarch64/tst-sme-helper.h new file mode 100644 index 0000000000..f049416c2b --- /dev/null +++ b/sysdeps/aarch64/tst-sme-helper.h @@ -0,0 +1,97 @@ +/* Utility functions for SME tests. + Copyright (C) 2025 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +/* Streaming SVE vector register size. */ +static unsigned long svl; + +struct blk { + void *za_save_buffer; + uint16_t num_za_save_slices; + char __reserved[6]; +}; + +/* Read SVCR to get SM (bit0) and ZA (bit1) state. */ +static unsigned long +get_svcr (void) +{ + register unsigned long x0 asm ("x0"); + asm volatile ( + ".inst 0xd53b4240 /* mrs x0, svcr */\n" + : "=r" (x0)); + return x0; +} + +/* Returns tpidr2. */ +static void * +get_tpidr2 (void) +{ + register unsigned long x0 asm ("x0"); + asm volatile ( + ".inst 0xd53bd0a0 /* mrs x0, tpidr2_el0 */\n" + : "=r"(x0) :: "memory"); + return (void *) x0; +} + +/* Obtains current streaming SVE vector register size. */ +static unsigned long +get_svl (void) +{ + register unsigned long x0 asm ("x0"); + asm volatile ( + ".inst 0x04bf5820 /* rdsvl x0, 1 */\n" + : "=r" (x0)); + return x0; +} + +/* PSTATE.ZA = 1, set ZA state to active. */ +static void +start_za (void) +{ + asm volatile ( + ".inst 0xd503457f /* smstart za */"); +} + +/* Load data into ZA byte by byte from p. */ +static void __attribute__ ((noinline)) +load_za (const void *p) +{ + register unsigned long x15 asm ("x15") = 0; + register unsigned long x16 asm ("x16") = (unsigned long)p; + register unsigned long x17 asm ("x17") = svl; + + asm volatile ( + ".inst 0xd503437f /* smstart sm */\n" + ".L_ldr_loop:\n" + ".inst 0xe1006200 /* ldr za[w15, 0], [x16] */\n" + "add w15, w15, 1\n" + ".inst 0x04305030 /* addvl x16, x16, 1 */\n" + "cmp w15, w17\n" + "bne .L_ldr_loop\n" + ".inst 0xd503427f /* smstop sm */\n" + : "+r"(x15), "+r"(x16), "+r"(x17)); +} + +/* Set tpidr2 to BLK. */ +static void +set_tpidr2 (struct blk *blk) +{ + register unsigned long x0 asm ("x0") = (unsigned long)blk; + asm volatile ( + ".inst 0xd51bd0a0 /* msr tpidr2_el0, x0 */\n" + :: "r"(x0) : "memory"); +} diff --git a/sysdeps/aarch64/tst-sme-jmp.c b/sysdeps/aarch64/tst-sme-jmp.c index 62c419f6c1..103897ad36 100644 --- a/sysdeps/aarch64/tst-sme-jmp.c +++ b/sysdeps/aarch64/tst-sme-jmp.c @@ -27,87 +27,12 @@ #include #include -struct blk { - void *za_save_buffer; - uint16_t num_za_save_slices; - char __reserved[6]; -}; +#include "tst-sme-helper.h" -static unsigned long svl; static uint8_t *za_orig; static uint8_t *za_dump; static uint8_t *za_save; -static unsigned long -get_svl (void) -{ - register unsigned long x0 asm ("x0"); - asm volatile ( - ".inst 0x04bf5820 /* rdsvl x0, 1 */\n" - : "=r" (x0)); - return x0; -} - -/* PSTATE.ZA = 1, set ZA state to active. */ -static void -start_za (void) -{ - asm volatile ( - ".inst 0xd503457f /* smstart za */"); -} - -/* Read SVCR to get SM (bit0) and ZA (bit1) state. */ -static unsigned long -get_svcr (void) -{ - register unsigned long x0 asm ("x0"); - asm volatile ( - ".inst 0xd53b4240 /* mrs x0, svcr */\n" - : "=r" (x0)); - return x0; -} - -/* Load data into ZA byte by byte from p. */ -static void __attribute__ ((noinline)) -load_za (const void *p) -{ - register unsigned long x15 asm ("x15") = 0; - register unsigned long x16 asm ("x16") = (unsigned long)p; - register unsigned long x17 asm ("x17") = svl; - - asm volatile ( - ".inst 0xd503437f /* smstart sm */\n" - ".L_ldr_loop:\n" - ".inst 0xe1006200 /* ldr za[w15, 0], [x16] */\n" - "add w15, w15, 1\n" - ".inst 0x04305030 /* addvl x16, x16, 1 */\n" - "cmp w15, w17\n" - "bne .L_ldr_loop\n" - ".inst 0xd503427f /* smstop sm */\n" - : "+r"(x15), "+r"(x16), "+r"(x17)); -} - -/* Set tpidr2 to BLK. */ -static void -set_tpidr2 (struct blk *blk) -{ - register unsigned long x0 asm ("x0") = (unsigned long)blk; - asm volatile ( - ".inst 0xd51bd0a0 /* msr tpidr2_el0, x0 */\n" - :: "r"(x0) : "memory"); -} - -/* Returns tpidr2. */ -static void * -get_tpidr2 (void) -{ - register unsigned long x0 asm ("x0"); - asm volatile ( - ".inst 0xd53bd0a0 /* mrs x0, tpidr2_el0 */\n" - : "=r"(x0) :: "memory"); - return (void *) x0; -} - static void print_data(const char *msg, void *p) { @@ -168,8 +93,8 @@ longjmp_test (void) { p = get_tpidr2 (); printf ("before longjmp: tp2 = %p\n", p); - if (p != &blk) - FAIL_EXIT1 ("tpidr2 is clobbered"); + if (p != NULL) + FAIL_EXIT1 ("tpidr2 has not been reset to null"); do_longjmp (env); FAIL_EXIT1 ("longjmp returned"); } diff --git a/sysdeps/aarch64/tst-sme-za-state.c b/sysdeps/aarch64/tst-sme-za-state.c new file mode 100644 index 0000000000..63f6eebeb4 --- /dev/null +++ b/sysdeps/aarch64/tst-sme-za-state.c @@ -0,0 +1,119 @@ +/* Test for SME ZA state being cleared on setjmp and longjmp. + Copyright (C) 2025 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include +#include +#include +#include +#include + +#include +#include +#include + +#include "tst-sme-helper.h" + +static uint8_t *state; + +static void +enable_sme_za_state (struct blk *ptr) +{ + set_tpidr2 (ptr); + start_za (); + load_za (state); +} + +static void +check_sme_za_state (const char msg[], bool clear) +{ + unsigned long svcr = get_svcr (); + void *tpidr2 = get_tpidr2 (); + printf ("[%s]\n", msg); + printf ("svcr = %016lx\n", svcr); + printf ("tpidr2 = %016lx\n", (unsigned long)tpidr2); + if (clear) + { + TEST_VERIFY (svcr == 0); + TEST_VERIFY (tpidr2 == NULL); + } + else + { + TEST_VERIFY (svcr != 0); + TEST_VERIFY (tpidr2 != NULL); + } +} + +static void +run (struct blk *ptr) +{ + jmp_buf buf; + int ret; + + check_sme_za_state ("initial state", /* Clear. */ true); + + /* Enabled ZA state so that effect of disabling be observable. */ + enable_sme_za_state (ptr); + check_sme_za_state ("before setjmp", /* Clear. */ false); + + if ((ret = setjmp (buf)) == 0) + { + check_sme_za_state ("after setjmp", /* Clear. */ true); + + /* Enabled ZA state so that effect of disabling be observable. */ + enable_sme_za_state (ptr); + check_sme_za_state ("before longjmp", /* Clear. */ false); + + longjmp (buf, 42); + + /* Unreachable. */ + TEST_VERIFY (false); + __builtin_unreachable (); + } + + TEST_COMPARE (ret, 42); + check_sme_za_state ("after longjmp", /* Clear. */ true); +} + +static int +do_test (void) +{ + unsigned long hwcap2 = getauxval (AT_HWCAP2); + if ((hwcap2 & HWCAP2_SME) == 0) + return EXIT_UNSUPPORTED; + + /* Get current streaming SVE vector register size. */ + svl = get_svl (); + printf ("svl: %lu\n", svl); + TEST_VERIFY_EXIT (!(svl < 16 || svl % 16 != 0 || svl >= (1 << 16))); + + /* Initialise buffer for ZA state of SME. */ + state = xmalloc (svl * svl); + memset (state, 1, svl * svl); + struct blk blk = { + .za_save_buffer = state, + .num_za_save_slices = svl, + .__reserved = {0}, + }; + + run (&blk); + + free (state); + return 0; +} + +#include