arm64: mte: rename TCO routines

drop __ from mte_disable/enable_tco names, as those functions are to be
exported to KASAN code

Link: https://lkml.kernel.org/r/74d26337b2360733956114069e96ff11c296a944.1680114854.git.andreyknvl@google.com
Signed-off-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
Cc: Will Deacon <will@kernel.org>
Cc: Alexander Potapenko <glider@google.com>
Cc: Andrey Ryabinin <ryabinin.a.a@gmail.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: Weizhao Ouyang <ouyangweizhao@zeku.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/arch/arm64/include/asm/mte-kasan.h b/arch/arm64/include/asm/mte-kasan.h
index cc9e74876e9a61f97adb61ffbf956ce154893b07..2e98028c19658a6e0394b5658bbd9a2e0bb19fbf 100644 (file)
--- a/arch/arm64/include/asm/mte-kasan.h
+++ b/arch/arm64/include/asm/mte-kasan.h
@@ -51,13 +51,13 @@ static inline bool system_uses_mte_async_or_asymm_mode(void)
  * The Tag check override (TCO) bit disables temporarily the tag checking
  * preventing the issue.
  */
-static inline void __mte_disable_tco(void)
+static inline void mte_disable_tco(void)
 {
        asm volatile(ALTERNATIVE("nop", SET_PSTATE_TCO(0),
                                 ARM64_MTE, CONFIG_KASAN_HW_TAGS));
 }
 
-static inline void __mte_enable_tco(void)
+static inline void mte_enable_tco(void)
 {
        asm volatile(ALTERNATIVE("nop", SET_PSTATE_TCO(1),
                                 ARM64_MTE, CONFIG_KASAN_HW_TAGS));
@@ -71,13 +71,13 @@ static inline void __mte_enable_tco(void)
 static inline void __mte_disable_tco_async(void)
 {
        if (system_uses_mte_async_or_asymm_mode())
-               __mte_disable_tco();
+               mte_disable_tco();
 }
 
 static inline void __mte_enable_tco_async(void)
 {
        if (system_uses_mte_async_or_asymm_mode())
-               __mte_enable_tco();
+               mte_enable_tco();
 }
 
 /*
@@ -203,11 +203,11 @@ void mte_enable_kernel_asymm(void);
 
 #else /* CONFIG_ARM64_MTE */
 
-static inline void __mte_disable_tco(void)
+static inline void mte_disable_tco(void)
 {
 }
 
-static inline void __mte_enable_tco(void)
+static inline void mte_enable_tco(void)
 {
 }
 

diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uaccess.h
index 057ec188232647f794df172f3bbd57b082b0e5fe..30ea7b5c3ccb03dbcfd5ed1f51c9c3ecc5fa1057 100644 (file)
--- a/arch/arm64/include/asm/uaccess.h
+++ b/arch/arm64/include/asm/uaccess.h
@@ -138,7 +138,7 @@ static inline void __uaccess_enable_hw_pan(void)
 
 static inline void uaccess_disable_privileged(void)
 {
-       __mte_disable_tco();
+       mte_disable_tco();
 
        if (uaccess_ttbr0_disable())
                return;
@@ -148,7 +148,7 @@ static inline void uaccess_disable_privileged(void)
 
 static inline void uaccess_enable_privileged(void)
 {
-       __mte_enable_tco();
+       mte_enable_tco();
 
        if (uaccess_ttbr0_enable())
                return;