shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 04:10:18 +09:00
Code Issues Packages Projects Releases Wiki Activity

FROMGIT: arm64: mte: Conditionally compile mte_enable_kernel_*()

Browse Source 
mte_enable_kernel_*() are not needed if KASAN_HW is disabled.

Add ash defines around the functions to conditionally compile the
functions.

Signed-off-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Link: https://lore.kernel.org/r/20210315132019.33202-7-vincenzo.frascino@arm.com
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

Bug: 170327579
Bug: 172318110
(cherry picked from commit d8969752cc
 git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git/
 for-next/mte-async-kernel-mode)
Signed-off-by: Alexander Potapenko <glider@google.com>
Change-Id: If6ce3c28e970efda838b5f0112c409953265d083
This commit is contained in:
Vincenzo Frascino
2021-03-15 13:20:16 +00:00
committed by Alexander Potapenko
parent a2f1f07ff4
commit c3ca7ea141
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm64/kernel/mte.c
View File

@@ -26,9 +26,11 @@ u64 gcr_kernel_excl __ro_after_init;
static bool report_fault_once = true; static bool report_fault_once = true;
#ifdef CONFIG_KASAN_HW_TAGS
/* Whether the MTE asynchronous mode is enabled. */ /* Whether the MTE asynchronous mode is enabled. */
DEFINE_STATIC_KEY_FALSE(mte_async_mode); DEFINE_STATIC_KEY_FALSE(mte_async_mode);
EXPORT_SYMBOL_GPL(mte_async_mode); EXPORT_SYMBOL_GPL(mte_async_mode);
#endif
static void mte_sync_page_tags(struct page *page, pte_t *ptep, bool check_swap) static void mte_sync_page_tags(struct page *page, pte_t *ptep, bool check_swap)
{ {
@@ -120,6 +122,7 @@ static inline void __mte_enable_kernel(const char *mode, unsigned long tcf)
pr_info_once("MTE: enabled in %s mode at EL1\n", mode); pr_info_once("MTE: enabled in %s mode at EL1\n", mode);
} }
#ifdef CONFIG_KASAN_HW_TAGS
void mte_enable_kernel_sync(void) void mte_enable_kernel_sync(void)
{ {
/* /*
@@ -147,6 +150,7 @@ void mte_enable_kernel_async(void)
if (!system_uses_mte_async_mode()) if (!system_uses_mte_async_mode())
static_branch_enable(&mte_async_mode); static_branch_enable(&mte_async_mode);
} }
#endif
void mte_set_report_once(bool state) void mte_set_report_once(bool state)
{ {