| Message ID | 20210315132019.33202-7-vincenzo.frascino@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | arm64: ARMv8.5-A: MTE: Add async mode support | expand |
On Mon, Mar 15, 2021 at 01:20:16PM +0000, Vincenzo Frascino wrote: > 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> (BTW, Andrey now has a different email address; use the one in the MAINTAINERS file)
On 3/15/21 6:41 PM, Catalin Marinas wrote: > On Mon, Mar 15, 2021 at 01:20:16PM +0000, Vincenzo Frascino wrote: >> 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> > > (BTW, Andrey now has a different email address; use the one in the > MAINTAINERS file) > I did not notice the change, sorry. Than you for updating the address.
diff --git a/arch/arm64/kernel/mte.c b/arch/arm64/kernel/mte.c index 9362928ba0d5..50f0724c8d8f 100644 --- a/arch/arm64/kernel/mte.c +++ b/arch/arm64/kernel/mte.c @@ -26,9 +26,11 @@ u64 gcr_kernel_excl __ro_after_init; static bool report_fault_once = true; +#ifdef CONFIG_KASAN_HW_TAGS /* Whether the MTE asynchronous mode is enabled. */ DEFINE_STATIC_KEY_FALSE(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) { @@ -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); } +#ifdef CONFIG_KASAN_HW_TAGS void mte_enable_kernel_sync(void) { /* @@ -147,6 +150,7 @@ void mte_enable_kernel_async(void) if (!system_uses_mte_async_mode()) static_branch_enable(&mte_async_mode); } +#endif void mte_set_report_once(bool state) {
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> --- arch/arm64/kernel/mte.c | 4 ++++ 1 file changed, 4 insertions(+)