From: Andrew Morton <akpm@linux-foundation.org> To: will@kernel.org, ryabinin.a.a@gmail.com, glider@google.com, dvyukov@google.com, catalin.marinas@arm.com, andreyknvl@gmail.com, vincenzo.frascino@arm.com, akpm@linux-foundation.org, patches@lists.linux.dev, linux-mm@kvack.org, mm-commits@vger.kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org Subject: [patch 05/14] kasan: fix hw tags enablement when KUNIT tests are disabled Date: Thu, 14 Apr 2022 19:13:37 -0700 [thread overview] Message-ID: <20220415021337.BC941C385A5@smtp.kernel.org> (raw) In-Reply-To: <20220414191240.9f86d15a3e3afd848a9839a6@linux-foundation.org> From: Vincenzo Frascino <vincenzo.frascino@arm.com> Subject: kasan: fix hw tags enablement when KUNIT tests are disabled Kasan enables hw tags via kasan_enable_tagging() which based on the mode passed via kernel command line selects the correct hw backend. kasan_enable_tagging() is meant to be invoked indirectly via the cpu features framework of the architectures that support these backends. Currently the invocation of this function is guarded by CONFIG_KASAN_KUNIT_TEST which allows the enablement of the correct backend only when KUNIT tests are enabled in the kernel. This inconsistency was introduced in commit: ed6d74446cbf ("kasan: test: support async (again) and asymm modes for HW_TAGS") ... and prevents to enable MTE on arm64 when KUNIT tests for kasan hw_tags are disabled. Fix the issue making sure that the CONFIG_KASAN_KUNIT_TEST guard does not prevent the correct invocation of kasan_enable_tagging(). Link: https://lkml.kernel.org/r/20220408124323.10028-1-vincenzo.frascino@arm.com Fixes: ed6d74446cbf ("kasan: test: support async (again) and asymm modes for HW_TAGS") Signed-off-by: Vincenzo Frascino <vincenzo.frascino@arm.com> Reviewed-by: Andrey Konovalov <andreyknvl@gmail.com> Cc: Andrey Ryabinin <ryabinin.a.a@gmail.com> Cc: Alexander Potapenko <glider@google.com> Cc: Dmitry Vyukov <dvyukov@google.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> --- mm/kasan/hw_tags.c | 5 +++-- mm/kasan/kasan.h | 10 ++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) --- a/mm/kasan/hw_tags.c~kasan-fix-hw-tags-enablement-when-kunit-tests-are-disabled +++ a/mm/kasan/hw_tags.c @@ -336,8 +336,6 @@ void __kasan_poison_vmalloc(const void * #endif -#if IS_ENABLED(CONFIG_KASAN_KUNIT_TEST) - void kasan_enable_tagging(void) { if (kasan_arg_mode == KASAN_ARG_MODE_ASYNC) @@ -347,6 +345,9 @@ void kasan_enable_tagging(void) else hw_enable_tagging_sync(); } + +#if IS_ENABLED(CONFIG_KASAN_KUNIT_TEST) + EXPORT_SYMBOL_GPL(kasan_enable_tagging); void kasan_force_async_fault(void) --- a/mm/kasan/kasan.h~kasan-fix-hw-tags-enablement-when-kunit-tests-are-disabled +++ a/mm/kasan/kasan.h @@ -355,25 +355,27 @@ static inline const void *arch_kasan_set #define hw_set_mem_tag_range(addr, size, tag, init) \ arch_set_mem_tag_range((addr), (size), (tag), (init)) +void kasan_enable_tagging(void); + #else /* CONFIG_KASAN_HW_TAGS */ #define hw_enable_tagging_sync() #define hw_enable_tagging_async() #define hw_enable_tagging_asymm() +static inline void kasan_enable_tagging(void) { } + #endif /* CONFIG_KASAN_HW_TAGS */ #if defined(CONFIG_KASAN_HW_TAGS) && IS_ENABLED(CONFIG_KASAN_KUNIT_TEST) -void kasan_enable_tagging(void); void kasan_force_async_fault(void); -#else /* CONFIG_KASAN_HW_TAGS || CONFIG_KASAN_KUNIT_TEST */ +#else /* CONFIG_KASAN_HW_TAGS && CONFIG_KASAN_KUNIT_TEST */ -static inline void kasan_enable_tagging(void) { } static inline void kasan_force_async_fault(void) { } -#endif /* CONFIG_KASAN_HW_TAGS || CONFIG_KASAN_KUNIT_TEST */ +#endif /* CONFIG_KASAN_HW_TAGS && CONFIG_KASAN_KUNIT_TEST */ #ifdef CONFIG_KASAN_SW_TAGS u8 kasan_random_tag(void); _
WARNING: multiple messages have this Message-ID (diff)
From: Andrew Morton <akpm@linux-foundation.org> To: will@kernel.org,ryabinin.a.a@gmail.com,glider@google.com,dvyukov@google.com,catalin.marinas@arm.com,andreyknvl@gmail.com,vincenzo.frascino@arm.com,akpm@linux-foundation.org,patches@lists.linux.dev,linux-mm@kvack.org,mm-commits@vger.kernel.org,torvalds@linux-foundation.org,akpm@linux-foundation.org Subject: [patch 05/14] kasan: fix hw tags enablement when KUNIT tests are disabled Date: Thu, 14 Apr 2022 19:13:37 -0700 [thread overview] Message-ID: <20220415021337.BC941C385A5@smtp.kernel.org> (raw) In-Reply-To: <20220414191240.9f86d15a3e3afd848a9839a6@linux-foundation.org> From: Vincenzo Frascino <vincenzo.frascino@arm.com> Subject: kasan: fix hw tags enablement when KUNIT tests are disabled Kasan enables hw tags via kasan_enable_tagging() which based on the mode passed via kernel command line selects the correct hw backend. kasan_enable_tagging() is meant to be invoked indirectly via the cpu features framework of the architectures that support these backends. Currently the invocation of this function is guarded by CONFIG_KASAN_KUNIT_TEST which allows the enablement of the correct backend only when KUNIT tests are enabled in the kernel. This inconsistency was introduced in commit: ed6d74446cbf ("kasan: test: support async (again) and asymm modes for HW_TAGS") ... and prevents to enable MTE on arm64 when KUNIT tests for kasan hw_tags are disabled. Fix the issue making sure that the CONFIG_KASAN_KUNIT_TEST guard does not prevent the correct invocation of kasan_enable_tagging(). Link: https://lkml.kernel.org/r/20220408124323.10028-1-vincenzo.frascino@arm.com Fixes: ed6d74446cbf ("kasan: test: support async (again) and asymm modes for HW_TAGS") Signed-off-by: Vincenzo Frascino <vincenzo.frascino@arm.com> Reviewed-by: Andrey Konovalov <andreyknvl@gmail.com> Cc: Andrey Ryabinin <ryabinin.a.a@gmail.com> Cc: Alexander Potapenko <glider@google.com> Cc: Dmitry Vyukov <dvyukov@google.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> --- mm/kasan/hw_tags.c | 5 +++-- mm/kasan/kasan.h | 10 ++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) --- a/mm/kasan/hw_tags.c~kasan-fix-hw-tags-enablement-when-kunit-tests-are-disabled +++ a/mm/kasan/hw_tags.c @@ -336,8 +336,6 @@ void __kasan_poison_vmalloc(const void * #endif -#if IS_ENABLED(CONFIG_KASAN_KUNIT_TEST) - void kasan_enable_tagging(void) { if (kasan_arg_mode == KASAN_ARG_MODE_ASYNC) @@ -347,6 +345,9 @@ void kasan_enable_tagging(void) else hw_enable_tagging_sync(); } + +#if IS_ENABLED(CONFIG_KASAN_KUNIT_TEST) + EXPORT_SYMBOL_GPL(kasan_enable_tagging); void kasan_force_async_fault(void) --- a/mm/kasan/kasan.h~kasan-fix-hw-tags-enablement-when-kunit-tests-are-disabled +++ a/mm/kasan/kasan.h @@ -355,25 +355,27 @@ static inline const void *arch_kasan_set #define hw_set_mem_tag_range(addr, size, tag, init) \ arch_set_mem_tag_range((addr), (size), (tag), (init)) +void kasan_enable_tagging(void); + #else /* CONFIG_KASAN_HW_TAGS */ #define hw_enable_tagging_sync() #define hw_enable_tagging_async() #define hw_enable_tagging_asymm() +static inline void kasan_enable_tagging(void) { } + #endif /* CONFIG_KASAN_HW_TAGS */ #if defined(CONFIG_KASAN_HW_TAGS) && IS_ENABLED(CONFIG_KASAN_KUNIT_TEST) -void kasan_enable_tagging(void); void kasan_force_async_fault(void); -#else /* CONFIG_KASAN_HW_TAGS || CONFIG_KASAN_KUNIT_TEST */ +#else /* CONFIG_KASAN_HW_TAGS && CONFIG_KASAN_KUNIT_TEST */ -static inline void kasan_enable_tagging(void) { } static inline void kasan_force_async_fault(void) { } -#endif /* CONFIG_KASAN_HW_TAGS || CONFIG_KASAN_KUNIT_TEST */ +#endif /* CONFIG_KASAN_HW_TAGS && CONFIG_KASAN_KUNIT_TEST */ #ifdef CONFIG_KASAN_SW_TAGS u8 kasan_random_tag(void); _
next prev parent reply other threads:[~2022-04-15 2:13 UTC|newest] Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-04-15 2:12 incoming Andrew Morton 2022-04-15 2:13 ` [patch 01/14] MAINTAINERS: Broadcom internal lists aren't maintainers Andrew Morton 2022-04-15 2:13 ` Andrew Morton 2022-04-15 2:13 ` [patch 02/14] tmpfs: fix regressions from wider use of ZERO_PAGE Andrew Morton 2022-04-15 2:13 ` Andrew Morton 2022-04-15 22:10 ` Linus Torvalds 2022-04-15 22:21 ` Matthew Wilcox 2022-04-15 22:41 ` Hugh Dickins 2022-04-16 6:36 ` Borislav Petkov 2022-04-16 14:07 ` Mark Hemment 2022-04-16 17:28 ` Borislav Petkov 2022-04-16 17:42 ` Linus Torvalds 2022-04-16 21:15 ` Borislav Petkov 2022-04-17 19:41 ` Borislav Petkov 2022-04-17 20:56 ` Linus Torvalds 2022-04-18 10:15 ` Borislav Petkov 2022-04-18 17:10 ` Linus Torvalds 2022-04-19 9:17 ` Borislav Petkov 2022-04-19 16:41 ` Linus Torvalds 2022-04-19 17:48 ` Borislav Petkov 2022-04-21 15:06 ` Borislav Petkov 2022-04-21 16:50 ` Linus Torvalds 2022-04-21 17:22 ` Linus Torvalds 2022-04-24 19:37 ` Borislav Petkov 2022-04-24 19:54 ` Linus Torvalds 2022-04-24 20:24 ` Linus Torvalds 2022-04-27 0:14 ` Borislav Petkov 2022-04-27 1:29 ` Linus Torvalds 2022-04-27 10:41 ` Borislav Petkov 2022-04-27 16:00 ` Linus Torvalds 2022-05-04 18:56 ` Borislav Petkov 2022-05-04 19:22 ` Linus Torvalds 2022-05-04 20:18 ` Borislav Petkov 2022-05-04 20:40 ` Linus Torvalds 2022-05-04 21:01 ` Borislav Petkov 2022-05-04 21:09 ` Linus Torvalds 2022-05-10 9:31 ` clear_user (was: [patch 02/14] tmpfs: fix regressions from wider use of ZERO_PAGE) Borislav Petkov 2022-05-10 17:17 ` Linus Torvalds 2022-05-10 17:28 ` Linus Torvalds 2022-05-10 18:10 ` Borislav Petkov 2022-05-10 18:57 ` Borislav Petkov 2022-05-24 12:32 ` [PATCH] x86/clear_user: Make it faster Borislav Petkov 2022-05-24 16:51 ` Linus Torvalds 2022-05-24 17:30 ` Borislav Petkov 2022-05-25 12:11 ` Mark Hemment 2022-05-27 11:28 ` Borislav Petkov 2022-05-27 11:10 ` Ingo Molnar 2022-06-22 14:21 ` Borislav Petkov 2022-06-22 15:06 ` Linus Torvalds 2022-06-22 20:14 ` Borislav Petkov 2022-06-22 21:07 ` Linus Torvalds 2022-06-23 9:41 ` Borislav Petkov 2022-07-05 17:01 ` [PATCH -final] " Borislav Petkov 2022-07-06 9:24 ` Alexey Dobriyan 2022-07-11 10:33 ` Borislav Petkov 2022-07-12 12:32 ` Alexey Dobriyan 2022-08-06 12:49 ` Borislav Petkov 2022-08-18 10:44 ` [tip: x86/cpu] " tip-bot2 for Borislav Petkov 2022-04-15 2:13 ` [patch 03/14] mm/secretmem: fix panic when growing a memfd_secret Andrew Morton 2022-04-15 2:13 ` Andrew Morton 2022-04-15 2:13 ` [patch 04/14] irq_work: use kasan_record_aux_stack_noalloc() record callstack Andrew Morton 2022-04-15 2:13 ` Andrew Morton 2022-04-15 2:13 ` Andrew Morton [this message] 2022-04-15 2:13 ` [patch 05/14] kasan: fix hw tags enablement when KUNIT tests are disabled Andrew Morton 2022-04-15 2:13 ` [patch 06/14] mm, kfence: support kmem_dump_obj() for KFENCE objects Andrew Morton 2022-04-15 2:13 ` Andrew Morton 2022-04-15 2:13 ` [patch 07/14] mm, page_alloc: fix build_zonerefs_node() Andrew Morton 2022-04-15 2:13 ` Andrew Morton 2022-04-15 2:13 ` [patch 08/14] mm: fix unexpected zeroed page mapping with zram swap Andrew Morton 2022-04-15 2:13 ` Andrew Morton 2022-04-15 2:13 ` [patch 09/14] mm: compaction: fix compiler warning when CONFIG_COMPACTION=n Andrew Morton 2022-04-15 2:13 ` Andrew Morton 2022-04-15 2:13 ` [patch 10/14] hugetlb: do not demote poisoned hugetlb pages Andrew Morton 2022-04-15 2:13 ` Andrew Morton 2022-04-15 2:13 ` [patch 11/14] revert "fs/binfmt_elf: fix PT_LOAD p_align values for loaders" Andrew Morton 2022-04-15 2:13 ` Andrew Morton 2022-04-15 2:13 ` [patch 12/14] revert "fs/binfmt_elf: use PT_LOAD p_align values for static PIE" Andrew Morton 2022-04-15 2:13 ` Andrew Morton 2022-04-15 2:14 ` [patch 13/14] mm/vmalloc: fix spinning drain_vmap_work after reading from /proc/vmcore Andrew Morton 2022-04-15 2:14 ` Andrew Morton 2022-04-15 2:14 ` [patch 14/14] mm: kmemleak: take a full lowmem check in kmemleak_*_phys() Andrew Morton 2022-04-15 2:14 ` Andrew Morton
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220415021337.BC941C385A5@smtp.kernel.org \ --to=akpm@linux-foundation.org \ --cc=andreyknvl@gmail.com \ --cc=catalin.marinas@arm.com \ --cc=dvyukov@google.com \ --cc=glider@google.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=mm-commits@vger.kernel.org \ --cc=patches@lists.linux.dev \ --cc=ryabinin.a.a@gmail.com \ --cc=torvalds@linux-foundation.org \ --cc=vincenzo.frascino@arm.com \ --cc=will@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.