From nobody Tue Jun 9 20:04:31 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 40D9DC433F5 for ; Fri, 8 Apr 2022 10:04:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234570AbiDHKG5 (ORCPT ); Fri, 8 Apr 2022 06:06:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58690 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234401AbiDHKGj (ORCPT ); Fri, 8 Apr 2022 06:06:39 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 18B2ADB2E7 for ; Fri, 8 Apr 2022 03:04:24 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id AEA2F139F; Fri, 8 Apr 2022 03:04:01 -0700 (PDT) Received: from e119884-lin.cambridge.arm.com (e119884-lin.cambridge.arm.com [10.1.196.72]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 4002A3F73B; Fri, 8 Apr 2022 03:04:00 -0700 (PDT) From: Vincenzo Frascino To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com Cc: vincenzo.frascino@arm.com, Andrey Ryabinin , Alexander Potapenko , Andrey Konovalov , Dmitry Vyukov , Andrew Morton , Catalin Marinas , Will Deacon Subject: [PATCH] kasan: Fix hw tags enablement when KUNIT tests are disabled Date: Fri, 8 Apr 2022 11:03:40 +0100 Message-Id: <20220408100340.43620-1-vincenzo.frascino@arm.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 featur= es 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: f05842cfb9ae2 ("kasan, arm64: allow using KUnit tests with HW_TAGS mode") ... 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(). Fixes: f05842cfb9ae2 ("kasan, arm64: allow using KUnit tests with HW_TAGS m= ode") Cc: Andrey Ryabinin Cc: Alexander Potapenko Cc: Andrey Konovalov Cc: Dmitry Vyukov Cc: Andrew Morton Cc: Catalin Marinas Cc: Will Deacon Signed-off-by: Vincenzo Frascino --- mm/kasan/hw_tags.c | 4 ++-- mm/kasan/kasan.h | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/mm/kasan/hw_tags.c b/mm/kasan/hw_tags.c index 07a76c46daa5..e2677501c36e 100644 --- a/mm/kasan/hw_tags.c +++ b/mm/kasan/hw_tags.c @@ -336,8 +336,6 @@ void __kasan_poison_vmalloc(const void *start, unsigned= long size) =20 #endif =20 -#if IS_ENABLED(CONFIG_KASAN_KUNIT_TEST) - void kasan_enable_tagging(void) { if (kasan_arg_mode =3D=3D KASAN_ARG_MODE_ASYNC) @@ -349,6 +347,8 @@ void kasan_enable_tagging(void) } EXPORT_SYMBOL_GPL(kasan_enable_tagging); =20 +#if IS_ENABLED(CONFIG_KASAN_KUNIT_TEST) + void kasan_force_async_fault(void) { hw_force_async_tag_fault(); diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h index d79b83d673b1..b01b4bbe0409 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h @@ -355,25 +355,27 @@ static inline const void *arch_kasan_set_tag(const vo= id *addr, u8 tag) #define hw_set_mem_tag_range(addr, size, tag, init) \ arch_set_mem_tag_range((addr), (size), (tag), (init)) =20 +void kasan_enable_tagging(void); + #else /* CONFIG_KASAN_HW_TAGS */ =20 #define hw_enable_tagging_sync() #define hw_enable_tagging_async() #define hw_enable_tagging_asymm() =20 +static inline void kasan_enable_tagging(void) { } + #endif /* CONFIG_KASAN_HW_TAGS */ =20 #if defined(CONFIG_KASAN_HW_TAGS) && IS_ENABLED(CONFIG_KASAN_KUNIT_TEST) =20 -void kasan_enable_tagging(void); void kasan_force_async_fault(void); =20 -#else /* CONFIG_KASAN_HW_TAGS || CONFIG_KASAN_KUNIT_TEST */ +#else /* CONFIG_KASAN_HW_TAGS && CONFIG_KASAN_KUNIT_TEST */ =20 -static inline void kasan_enable_tagging(void) { } static inline void kasan_force_async_fault(void) { } =20 -#endif /* CONFIG_KASAN_HW_TAGS || CONFIG_KASAN_KUNIT_TEST */ +#endif /* CONFIG_KASAN_HW_TAGS && CONFIG_KASAN_KUNIT_TEST */ =20 #ifdef CONFIG_KASAN_SW_TAGS u8 kasan_random_tag(void); --=20 2.35.1