kasan, arm64: rename tagging-related routines

Rename arch_enable_tagging_sync/async/asymm to
arch_enable_tag_checks_sync/async/asymm, as the new name better reflects
their function.

Also rename kasan_enable_tagging to kasan_enable_hw_tags for the same
reason.

Link: https://lkml.kernel.org/r/069ef5b77715c1ac8d69b186725576c32b149491.1678491668.git.andreyknvl@google.com
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
Cc: Alexander Potapenko <glider@google.com>
Cc: Andrey Ryabinin <ryabinin.a.a@gmail.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Evgenii Stepanov <eugenis@google.com>
Cc: Marco Elver <elver@google.com>
Cc: Peter Collingbourne <pcc@google.com>
Cc: Vincenzo Frascino <vincenzo.frascino@arm.com>
Cc: Weizhao Ouyang <ouyangweizhao@zeku.com>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h
index 78e5163..faf42bf 100644 (file)
--- a/arch/arm64/include/asm/memory.h
+++ b/arch/arm64/include/asm/memory.h
@@ -261,9 +261,9 @@ static inline const void *__tag_set(const void *addr, u8 tag)
 }
 
 #ifdef CONFIG_KASAN_HW_TAGS
-#define arch_enable_tagging_sync()             mte_enable_kernel_sync()
-#define arch_enable_tagging_async()            mte_enable_kernel_async()
-#define arch_enable_tagging_asymm()            mte_enable_kernel_asymm()
+#define arch_enable_tag_checks_sync()          mte_enable_kernel_sync()
+#define arch_enable_tag_checks_async()         mte_enable_kernel_async()
+#define arch_enable_tag_checks_asymm()         mte_enable_kernel_asymm()
 #define arch_force_async_tag_fault()           mte_check_tfsr_exit()
 #define arch_get_random_tag()                  mte_get_random_tag()
 #define arch_get_mem_tag(addr)                 mte_get_mem_tag(addr)

diff --git a/mm/kasan/hw_tags.c b/mm/kasan/hw_tags.c
index bb4f56e..f98b9f4 100644 (file)
--- a/mm/kasan/hw_tags.c
+++ b/mm/kasan/hw_tags.c
@@ -205,7 +205,7 @@ void kasan_init_hw_tags_cpu(void)
         * Enable async or asymm modes only when explicitly requested
         * through the command line.
         */
-       kasan_enable_tagging();
+       kasan_enable_hw_tags();
 }
 
 /* kasan_init_hw_tags() is called once on boot CPU. */
@@ -373,19 +373,19 @@ void __kasan_poison_vmalloc(const void *start, unsigned long size)
 
 #endif
 
-void kasan_enable_tagging(void)
+void kasan_enable_hw_tags(void)
 {
        if (kasan_arg_mode == KASAN_ARG_MODE_ASYNC)
-               hw_enable_tagging_async();
+               hw_enable_tag_checks_async();
        else if (kasan_arg_mode == KASAN_ARG_MODE_ASYMM)
-               hw_enable_tagging_asymm();
+               hw_enable_tag_checks_asymm();
        else
-               hw_enable_tagging_sync();
+               hw_enable_tag_checks_sync();
 }
 
 #if IS_ENABLED(CONFIG_KASAN_KUNIT_TEST)
 
-EXPORT_SYMBOL_GPL(kasan_enable_tagging);
+EXPORT_SYMBOL_GPL(kasan_enable_hw_tags);
 
 void kasan_force_async_fault(void)
 {

diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h
index b189552..a1613f5 100644 (file)
--- a/mm/kasan/kasan.h
+++ b/mm/kasan/kasan.h
@@ -395,20 +395,20 @@ static inline const void *arch_kasan_set_tag(const void *addr, u8 tag)
 
 #ifdef CONFIG_KASAN_HW_TAGS
 
-#define hw_enable_tagging_sync()               arch_enable_tagging_sync()
-#define hw_enable_tagging_async()              arch_enable_tagging_async()
-#define hw_enable_tagging_asymm()              arch_enable_tagging_asymm()
+#define hw_enable_tag_checks_sync()            arch_enable_tag_checks_sync()
+#define hw_enable_tag_checks_async()           arch_enable_tag_checks_async()
+#define hw_enable_tag_checks_asymm()           arch_enable_tag_checks_asymm()
 #define hw_force_async_tag_fault()             arch_force_async_tag_fault()
 #define hw_get_random_tag()                    arch_get_random_tag()
 #define hw_get_mem_tag(addr)                   arch_get_mem_tag(addr)
 #define hw_set_mem_tag_range(addr, size, tag, init) \
                        arch_set_mem_tag_range((addr), (size), (tag), (init))
 
-void kasan_enable_tagging(void);
+void kasan_enable_hw_tags(void);
 
 #else /* CONFIG_KASAN_HW_TAGS */
 
-static inline void kasan_enable_tagging(void) { }
+static inline void kasan_enable_hw_tags(void) { }
 
 #endif /* CONFIG_KASAN_HW_TAGS */
 

diff --git a/mm/kasan/kasan_test.c b/mm/kasan/kasan_test.c
index 627eaf1..a375776 100644 (file)
--- a/mm/kasan/kasan_test.c
+++ b/mm/kasan/kasan_test.c
@@ -148,7 +148,7 @@ static void kasan_test_exit(struct kunit *test)
            kasan_sync_fault_possible()) {                              \
                if (READ_ONCE(test_status.report_found) &&              \
                    !READ_ONCE(test_status.async_fault))                \
-                       kasan_enable_tagging();                         \
+                       kasan_enable_hw_tags();                         \
                migrate_enable();                                       \
        }                                                               \
        WRITE_ONCE(test_status.report_found, false);                    \