kselftest/arm64/mte: Register mte signal handler with SA_EXPOSE_TAGBITS

To test address tag[63:60] and memory tag[59:56] is preserved
when memory tag fault happen, Let mte_register_signal() to register
signal handler with SA_EXPOSE_TAGBITS.

Signed-off-by: Yeoreum Yun <yeoreum.yun@arm.com>
Reviewed-by: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20250618084513.1761345-6-yeoreum.yun@arm.com
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

diff --git a/tools/testing/selftests/arm64/mte/check_buffer_fill.c b/tools/testing/selftests/arm64/mte/check_buffer_fill.c
index 2ee7f114d7fa87a592ced1da108747c35af3676e..5248b5265aa4bc45951a61a2eee954be1e25741d 100644 (file)
--- a/tools/testing/selftests/arm64/mte/check_buffer_fill.c
+++ b/tools/testing/selftests/arm64/mte/check_buffer_fill.c
@@ -415,7 +415,7 @@ int main(int argc, char *argv[])
                return err;
 
        /* Register SIGSEGV handler */
-       mte_register_signal(SIGSEGV, mte_default_handler);
+       mte_register_signal(SIGSEGV, mte_default_handler, false);
 
        /* Set test plan */
        ksft_set_plan(20);

diff --git a/tools/testing/selftests/arm64/mte/check_child_memory.c b/tools/testing/selftests/arm64/mte/check_child_memory.c
index 7597fc632cadf287b72e5cbe744501a619ad61f4..b97ea3981c21e10eb99c766257b79c97e9540d9b 100644 (file)
--- a/tools/testing/selftests/arm64/mte/check_child_memory.c
+++ b/tools/testing/selftests/arm64/mte/check_child_memory.c
@@ -160,8 +160,8 @@ int main(int argc, char *argv[])
                return err;
 
        /* Register SIGSEGV handler */
-       mte_register_signal(SIGSEGV, mte_default_handler);
-       mte_register_signal(SIGBUS, mte_default_handler);
+       mte_register_signal(SIGSEGV, mte_default_handler, false);
+       mte_register_signal(SIGBUS, mte_default_handler, false);
 
        /* Set test plan */
        ksft_set_plan(12);

diff --git a/tools/testing/selftests/arm64/mte/check_hugetlb_options.c b/tools/testing/selftests/arm64/mte/check_hugetlb_options.c
index 3bfcd3848432b1ce1bb5c2bbfab14c8dfecb887b..4e644a60639456b02514724787deba157d0dcb76 100644 (file)
--- a/tools/testing/selftests/arm64/mte/check_hugetlb_options.c
+++ b/tools/testing/selftests/arm64/mte/check_hugetlb_options.c
@@ -235,8 +235,8 @@ int main(int argc, char *argv[])
                return err;
 
        /* Register signal handlers */
-       mte_register_signal(SIGBUS, mte_default_handler);
-       mte_register_signal(SIGSEGV, mte_default_handler);
+       mte_register_signal(SIGBUS, mte_default_handler, false);
+       mte_register_signal(SIGSEGV, mte_default_handler, false);
 
        allocate_hugetlb();
 

diff --git a/tools/testing/selftests/arm64/mte/check_ksm_options.c b/tools/testing/selftests/arm64/mte/check_ksm_options.c
index 88c74bc46d4fce66d6f5c1ba9cdb386bf0d8c6da..afea4e381862c9a71031cf34fc0efb6dbcd629ac 100644 (file)
--- a/tools/testing/selftests/arm64/mte/check_ksm_options.c
+++ b/tools/testing/selftests/arm64/mte/check_ksm_options.c
@@ -141,8 +141,8 @@ int main(int argc, char *argv[])
                return KSFT_FAIL;
        }
        /* Register signal handlers */
-       mte_register_signal(SIGBUS, mte_default_handler);
-       mte_register_signal(SIGSEGV, mte_default_handler);
+       mte_register_signal(SIGBUS, mte_default_handler, false);
+       mte_register_signal(SIGSEGV, mte_default_handler, false);
 
        /* Set test plan */
        ksft_set_plan(4);

diff --git a/tools/testing/selftests/arm64/mte/check_mmap_options.c b/tools/testing/selftests/arm64/mte/check_mmap_options.c
index 17694caaff532eae5e0b9cbf56c7873a361050dc..b37bf481c9f94995e318ca9cc65fc300a0f2c2b4 100644 (file)
--- a/tools/testing/selftests/arm64/mte/check_mmap_options.c
+++ b/tools/testing/selftests/arm64/mte/check_mmap_options.c
@@ -201,8 +201,8 @@ int main(int argc, char *argv[])
        sizes[item - 1] = page_size + 1;
 
        /* Register signal handlers */
-       mte_register_signal(SIGBUS, mte_default_handler);
-       mte_register_signal(SIGSEGV, mte_default_handler);
+       mte_register_signal(SIGBUS, mte_default_handler, false);
+       mte_register_signal(SIGSEGV, mte_default_handler, false);
 
        /* Set test plan */
        ksft_set_plan(22);

diff --git a/tools/testing/selftests/arm64/mte/check_tags_inclusion.c b/tools/testing/selftests/arm64/mte/check_tags_inclusion.c
index a3d1e23fe02affc1b76a0db436b845cc7e323ab6..b96296ab98700e0d942ecfbec5af712b692ab99f 100644 (file)
--- a/tools/testing/selftests/arm64/mte/check_tags_inclusion.c
+++ b/tools/testing/selftests/arm64/mte/check_tags_inclusion.c
@@ -180,7 +180,7 @@ int main(int argc, char *argv[])
                return err;
 
        /* Register SIGSEGV handler */
-       mte_register_signal(SIGSEGV, mte_default_handler);
+       mte_register_signal(SIGSEGV, mte_default_handler, false);
 
        /* Set test plan */
        ksft_set_plan(4);

diff --git a/tools/testing/selftests/arm64/mte/check_user_mem.c b/tools/testing/selftests/arm64/mte/check_user_mem.c
index f4ae5f87a3b77e6c0cb92af764d7875d4a459f3b..d1d14aaaba16ce0a8e679cf5da9c1aa8c1a39166 100644 (file)
--- a/tools/testing/selftests/arm64/mte/check_user_mem.c
+++ b/tools/testing/selftests/arm64/mte/check_user_mem.c
@@ -211,7 +211,7 @@ int main(int argc, char *argv[])
                return err;
 
        /* Register signal handlers */
-       mte_register_signal(SIGSEGV, mte_default_handler);
+       mte_register_signal(SIGSEGV, mte_default_handler, false);
 
        /* Set test plan */
        ksft_set_plan(64);

diff --git a/tools/testing/selftests/arm64/mte/mte_common_util.c b/tools/testing/selftests/arm64/mte/mte_common_util.c
index a1dc2fe5285b88f7848d815e05ad2d071b8e623c..83240b980f9c1d7417a9e652c40e315462f282d6 100644 (file)
--- a/tools/testing/selftests/arm64/mte/mte_common_util.c
+++ b/tools/testing/selftests/arm64/mte/mte_common_util.c
@@ -19,6 +19,10 @@
 #include "mte_common_util.h"
 #include "mte_def.h"
 
+#ifndef SA_EXPOSE_TAGBITS
+#define SA_EXPOSE_TAGBITS 0x00000800
+#endif
+
 #define INIT_BUFFER_SIZE       256
 
 struct mte_fault_cxt cur_mte_cxt;
@@ -79,12 +83,17 @@ void mte_default_handler(int signum, siginfo_t *si, void *uc)
        }
 }
 
-void mte_register_signal(int signal, void (*handler)(int, siginfo_t *, void *))
+void mte_register_signal(int signal, void (*handler)(int, siginfo_t *, void *),
+                        bool export_tags)
 {
        struct sigaction sa;
 
        sa.sa_sigaction = handler;
        sa.sa_flags = SA_SIGINFO;
+
+       if (export_tags && signal == SIGSEGV)
+               sa.sa_flags |= SA_EXPOSE_TAGBITS;
+
        sigemptyset(&sa.sa_mask);
        sigaction(signal, &sa, NULL);
 }

diff --git a/tools/testing/selftests/arm64/mte/mte_common_util.h b/tools/testing/selftests/arm64/mte/mte_common_util.h
index a0017a303beb28cf3e3822667295ca5cae999328..6b109e84fa394ab989946dbe3dfd90d250777338 100644 (file)
--- a/tools/testing/selftests/arm64/mte/mte_common_util.h
+++ b/tools/testing/selftests/arm64/mte/mte_common_util.h
@@ -40,7 +40,8 @@ extern struct mte_fault_cxt cur_mte_cxt;
 
 /* MTE utility functions */
 void mte_default_handler(int signum, siginfo_t *si, void *uc);
-void mte_register_signal(int signal, void (*handler)(int, siginfo_t *, void *));
+void mte_register_signal(int signal, void (*handler)(int, siginfo_t *, void *),
+                        bool export_tags);
 void mte_wait_after_trig(void);
 void *mte_allocate_memory(size_t size, int mem_type, int mapping, bool tags);
 void *mte_allocate_memory_tag_range(size_t size, int mem_type, int mapping,