To run the MTE_FAR test when cpu supports MTE_FAR feature, check the MTE_FAR_ feature is supported in mte test. Signed-off-by: Yeoreum Yun <yeoreum.yun@xxxxxxx> --- tools/testing/selftests/arm64/mte/mte_common_util.c | 7 +++++++ tools/testing/selftests/arm64/mte/mte_common_util.h | 1 + 2 files changed, 8 insertions(+) diff --git a/tools/testing/selftests/arm64/mte/mte_common_util.c b/tools/testing/selftests/arm64/mte/mte_common_util.c index 83240b980f9c..048b8a507b70 100644 --- a/tools/testing/selftests/arm64/mte/mte_common_util.c +++ b/tools/testing/selftests/arm64/mte/mte_common_util.c @@ -6,6 +6,7 @@ #include <signal.h> #include <stdio.h> #include <stdlib.h> +#include <time.h> #include <unistd.h> #include <linux/auxvec.h> @@ -26,6 +27,7 @@ #define INIT_BUFFER_SIZE 256 struct mte_fault_cxt cur_mte_cxt; +bool mtefar_support; static unsigned int mte_cur_mode; static unsigned int mte_cur_pstate_tco; @@ -273,6 +275,7 @@ void mte_initialize_current_context(int mode, uintptr_t ptr, ssize_t range) cur_mte_cxt.fault_valid = false; cur_mte_cxt.trig_addr = ptr; cur_mte_cxt.trig_range = range; + if (mode == MTE_SYNC_ERR) cur_mte_cxt.trig_si_code = SEGV_MTESERR; else if (mode == MTE_ASYNC_ERR) @@ -325,12 +328,16 @@ int mte_switch_mode(int mte_option, unsigned long incl_mask) int mte_default_setup(void) { unsigned long hwcaps2 = getauxval(AT_HWCAP2); + unsigned long hwcaps3 = getauxval(AT_HWCAP3); unsigned long en = 0; int ret; if (!(hwcaps2 & HWCAP2_MTE)) ksft_exit_skip("MTE features unavailable\n"); + if (hwcaps3 & HWCAP3_MTE_FAR) + mtefar_support = true; + /* Get current mte mode */ ret = prctl(PR_GET_TAGGED_ADDR_CTRL, en, 0, 0, 0); if (ret < 0) { diff --git a/tools/testing/selftests/arm64/mte/mte_common_util.h b/tools/testing/selftests/arm64/mte/mte_common_util.h index 6b109e84fa39..4e1dd959df9b 100644 --- a/tools/testing/selftests/arm64/mte/mte_common_util.h +++ b/tools/testing/selftests/arm64/mte/mte_common_util.h @@ -37,6 +37,7 @@ struct mte_fault_cxt { }; extern struct mte_fault_cxt cur_mte_cxt; +extern bool mtefar_support; /* MTE utility functions */ void mte_default_handler(int signum, siginfo_t *si, void *uc); -- LEVI:{C3F47F37-75D8-414A-A8BA-3980EC8A46D7}