The patch titled Subject: arm64: mte: rename TCO routines has been added to the -mm mm-unstable branch. Its filename is arm64-mte-rename-tco-routines-v2.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/arm64-mte-rename-tco-routines-v2.patch This patch will later appear in the mm-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days ------------------------------------------------------ From: Andrey Konovalov <andreyknvl@xxxxxxxxxx> Subject: arm64: mte: rename TCO routines Date: Wed, 29 Mar 2023 20:37:46 +0200 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@xxxxxxxxxx Signed-off-by: Vincenzo Frascino <vincenzo.frascino@xxxxxxx> Signed-off-by: Catalin Marinas <catalin.marinas@xxxxxxx> Signed-off-by: Andrey Konovalov <andreyknvl@xxxxxxxxxx> Cc: Will Deacon <will@xxxxxxxxxx> Cc: Alexander Potapenko <glider@xxxxxxxxxx> Cc: Andrey Ryabinin <ryabinin.a.a@xxxxxxxxx> Cc: Dmitry Vyukov <dvyukov@xxxxxxxxxx> Cc: Evgenii Stepanov <eugenis@xxxxxxxxxx> Cc: Marco Elver <elver@xxxxxxxxxx> Cc: Peter Collingbourne <pcc@xxxxxxxxxx> Cc: Weizhao Ouyang <ouyangweizhao@xxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/arm64/include/asm/mte-kasan.h | 12 ++++++------ arch/arm64/include/asm/uaccess.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) --- a/arch/arm64/include/asm/mte-kasan.h~arm64-mte-rename-tco-routines-v2 +++ a/arch/arm64/include/asm/mte-kasan.h @@ -51,13 +51,13 @@ static inline bool system_uses_mte_async * 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) { } --- a/arch/arm64/include/asm/uaccess.h~arm64-mte-rename-tco-routines-v2 +++ a/arch/arm64/include/asm/uaccess.h @@ -138,7 +138,7 @@ static inline void __uaccess_enable_hw_p 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_privi static inline void uaccess_enable_privileged(void) { - __mte_enable_tco(); + mte_enable_tco(); if (uaccess_ttbr0_enable()) return; _ Patches currently in -mm which might be from andreyknvl@xxxxxxxxxx are kasan-drop-empty-tagging-related-defines.patch kasan-arm64-rename-tagging-related-routines.patch arm64-mte-rename-tco-routines-v2.patch kasan-arm64-add-arch_suppress_tag_checks_start-stop.patch kasan-arm64-add-arch_suppress_tag_checks_start-stop-v2.patch kasan-suppress-recursive-reports-for-hw_tags.patch kasan-suppress-recursive-reports-for-hw_tags-v2.patch kcov-improve-documentation.patch kcov-improve-documentation-v2.patch kcov-improve-documentation-v3.patch