From: Samuel Holland <samuel.holland@sifive.com>
To: Palmer Dabbelt <palmer@dabbelt.com>,
linux-riscv@lists.infradead.org,
Andrey Ryabinin <ryabinin.a.a@gmail.com>,
Alexander Potapenko <glider@google.com>,
Andrey Konovalov <andreyknvl@gmail.com>,
Dmitry Vyukov <dvyukov@google.com>,
Vincenzo Frascino <vincenzo.frascino@arm.com>,
kasan-dev@googlegroups.com
Cc: llvm@lists.linux.dev, linux-kernel@vger.kernel.org,
Alexandre Ghiti <alexghiti@rivosinc.com>,
Evgenii Stepanov <eugenis@google.com>,
Andrew Morton <akpm@linux-foundation.org>,
linux-arm-kernel@lists.infradead.org,
Samuel Holland <samuel.holland@sifive.com>
Subject: [RFC PATCH 2/7] kasan: sw_tags: Check kasan_flag_enabled at runtime
Date: Wed, 14 Aug 2024 01:55:30 -0700 [thread overview]
Message-ID: <20240814085618.968833-3-samuel.holland@sifive.com> (raw)
In-Reply-To: <20240814085618.968833-1-samuel.holland@sifive.com>
On RISC-V, the ISA extension required to dereference tagged pointers is
optional, and the interface to enable pointer masking requires firmware
support. Therefore, we must detect at runtime if sw_tags is usable on a
given machine. Reuse the logic from hw_tags to dynamically enable KASAN.
This commit makes no functional change to the KASAN_HW_TAGS code path.
Signed-off-by: Samuel Holland <samuel.holland@sifive.com>
---
include/linux/kasan-enabled.h | 15 +++++----------
mm/kasan/hw_tags.c | 10 ----------
mm/kasan/tags.c | 10 ++++++++++
3 files changed, 15 insertions(+), 20 deletions(-)
diff --git a/include/linux/kasan-enabled.h b/include/linux/kasan-enabled.h
index 6f612d69ea0c..648bda9495b7 100644
--- a/include/linux/kasan-enabled.h
+++ b/include/linux/kasan-enabled.h
@@ -4,7 +4,7 @@
#include <linux/static_key.h>
-#ifdef CONFIG_KASAN_HW_TAGS
+#if defined(CONFIG_KASAN_SW_TAGS) || defined(CONFIG_KASAN_HW_TAGS)
DECLARE_STATIC_KEY_FALSE(kasan_flag_enabled);
@@ -13,23 +13,18 @@ static __always_inline bool kasan_enabled(void)
return static_branch_likely(&kasan_flag_enabled);
}
-static inline bool kasan_hw_tags_enabled(void)
-{
- return kasan_enabled();
-}
-
-#else /* CONFIG_KASAN_HW_TAGS */
+#else /* CONFIG_KASAN_SW_TAGS || CONFIG_KASAN_HW_TAGS */
static inline bool kasan_enabled(void)
{
return IS_ENABLED(CONFIG_KASAN);
}
+#endif /* CONFIG_KASAN_SW_TAGS || CONFIG_KASAN_HW_TAGS */
+
static inline bool kasan_hw_tags_enabled(void)
{
- return false;
+ return IS_ENABLED(CONFIG_KASAN_HW_TAGS) && kasan_enabled();
}
-#endif /* CONFIG_KASAN_HW_TAGS */
-
#endif /* LINUX_KASAN_ENABLED_H */
diff --git a/mm/kasan/hw_tags.c b/mm/kasan/hw_tags.c
index 9958ebc15d38..c3beeb94efa5 100644
--- a/mm/kasan/hw_tags.c
+++ b/mm/kasan/hw_tags.c
@@ -43,13 +43,6 @@ static enum kasan_arg kasan_arg __ro_after_init;
static enum kasan_arg_mode kasan_arg_mode __ro_after_init;
static enum kasan_arg_vmalloc kasan_arg_vmalloc __initdata;
-/*
- * Whether KASAN is enabled at all.
- * The value remains false until KASAN is initialized by kasan_init_hw_tags().
- */
-DEFINE_STATIC_KEY_FALSE(kasan_flag_enabled);
-EXPORT_SYMBOL(kasan_flag_enabled);
-
/*
* Whether the selected mode is synchronous, asynchronous, or asymmetric.
* Defaults to KASAN_MODE_SYNC.
@@ -257,9 +250,6 @@ void __init kasan_init_hw_tags(void)
kasan_init_tags();
- /* KASAN is now initialized, enable it. */
- static_branch_enable(&kasan_flag_enabled);
-
pr_info("KernelAddressSanitizer initialized (hw-tags, mode=%s, vmalloc=%s, stacktrace=%s)\n",
kasan_mode_info(),
kasan_vmalloc_enabled() ? "on" : "off",
diff --git a/mm/kasan/tags.c b/mm/kasan/tags.c
index d65d48b85f90..c111d98961ed 100644
--- a/mm/kasan/tags.c
+++ b/mm/kasan/tags.c
@@ -32,6 +32,13 @@ enum kasan_arg_stacktrace {
static enum kasan_arg_stacktrace kasan_arg_stacktrace __initdata;
+/*
+ * Whether KASAN is enabled at all.
+ * The value remains false until KASAN is initialized by kasan_init_tags().
+ */
+DEFINE_STATIC_KEY_FALSE(kasan_flag_enabled);
+EXPORT_SYMBOL(kasan_flag_enabled);
+
/* Whether to collect alloc/free stack traces. */
DEFINE_STATIC_KEY_TRUE(kasan_flag_stacktrace);
@@ -92,6 +99,9 @@ void __init kasan_init_tags(void)
if (WARN_ON(!stack_ring.entries))
static_branch_disable(&kasan_flag_stacktrace);
}
+
+ /* KASAN is now initialized, enable it. */
+ static_branch_enable(&kasan_flag_enabled);
}
static void save_stack_info(struct kmem_cache *cache, void *object,
--
2.45.1
next prev parent reply other threads:[~2024-08-14 8:56 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-14 8:55 [RFC PATCH 0/7] kasan: RISC-V support for KASAN_SW_TAGS using pointer masking Samuel Holland
2024-08-14 8:55 ` [RFC PATCH 1/7] kasan: sw_tags: Use arithmetic shift for shadow computation Samuel Holland
2024-08-14 16:03 ` Andrey Konovalov
2024-10-21 20:26 ` Samuel Holland
2024-08-14 8:55 ` Samuel Holland [this message]
2024-08-14 16:03 ` [RFC PATCH 2/7] kasan: sw_tags: Check kasan_flag_enabled at runtime Andrey Konovalov
2024-08-14 8:55 ` [RFC PATCH 3/7] kasan: sw_tags: Support tag widths less than 8 bits Samuel Holland
2024-08-14 16:03 ` Andrey Konovalov
2024-08-14 8:55 ` [RFC PATCH 4/7] riscv: Do not rely on KASAN to define the memory layout Samuel Holland
2024-08-14 8:55 ` [RFC PATCH 5/7] riscv: Align the sv39 linear map to 16 GiB Samuel Holland
2024-08-14 8:55 ` [RFC PATCH 6/7] riscv: Implement KASAN_SW_TAGS Samuel Holland
2024-08-14 8:55 ` [RFC PATCH 7/7] kasan: sw_tags: Support runtime stack tagging control for RISC-V Samuel Holland
2024-08-14 16:04 ` Andrey Konovalov
2024-08-14 16:03 ` [RFC PATCH 0/7] kasan: RISC-V support for KASAN_SW_TAGS using pointer masking Andrey Konovalov
2024-10-22 1:13 ` Samuel Holland
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=20240814085618.968833-3-samuel.holland@sifive.com \
--to=samuel.holland@sifive.com \
--cc=akpm@linux-foundation.org \
--cc=alexghiti@rivosinc.com \
--cc=andreyknvl@gmail.com \
--cc=dvyukov@google.com \
--cc=eugenis@google.com \
--cc=glider@google.com \
--cc=kasan-dev@googlegroups.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=llvm@lists.linux.dev \
--cc=palmer@dabbelt.com \
--cc=ryabinin.a.a@gmail.com \
--cc=vincenzo.frascino@arm.com \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®