From: andrey.konovalov@linux.dev
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Andrey Konovalov <andreyknvl@gmail.com>,
Marco Elver <elver@google.com>,
Alexander Potapenko <glider@google.com>,
Dmitry Vyukov <dvyukov@google.com>,
Andrey Ryabinin <ryabinin.a.a@gmail.com>,
kasan-dev@googlegroups.com, linux-mm@kvack.org,
Vincenzo Frascino <vincenzo.frascino@arm.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
linux-arm-kernel@lists.infradead.org,
Peter Collingbourne <pcc@google.com>,
Evgenii Stepanov <eugenis@google.com>,
linux-kernel@vger.kernel.org,
Andrey Konovalov <andreyknvl@google.com>
Subject: [PATCH mm v5 35/39] kasan: add kasan.vmalloc command line flag
Date: Thu, 30 Dec 2021 20:15:00 +0100 [thread overview]
Message-ID: <bdfb31e3f87560afb2a3f968efbffa995a28ca12.1640891329.git.andreyknvl@google.com> (raw)
In-Reply-To: <cover.1640891329.git.andreyknvl@google.com>
From: Andrey Konovalov <andreyknvl@google.com>
Allow disabling vmalloc() tagging for HW_TAGS KASAN via a kasan.vmalloc
command line switch.
This is a fail-safe switch intended for production systems that enable
HW_TAGS KASAN. In case vmalloc() tagging ends up having an issue not
detected during testing but that manifests in production, kasan.vmalloc
allows to turn vmalloc() tagging off while leaving page_alloc/slab
tagging on.
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
---
Changes v4->v5:
- Use true as kasan_flag_vmalloc static key default.
Changes v1->v2:
- Mark kasan_arg_stacktrace as __initdata instead of __ro_after_init.
- Combine KASAN_ARG_VMALLOC_DEFAULT and KASAN_ARG_VMALLOC_ON switch
cases.
---
mm/kasan/hw_tags.c | 45 ++++++++++++++++++++++++++++++++++++++++++++-
mm/kasan/kasan.h | 6 ++++++
2 files changed, 50 insertions(+), 1 deletion(-)
diff --git a/mm/kasan/hw_tags.c b/mm/kasan/hw_tags.c
index 6a3146d1ccc5..fad1887e54c0 100644
--- a/mm/kasan/hw_tags.c
+++ b/mm/kasan/hw_tags.c
@@ -32,6 +32,12 @@ enum kasan_arg_mode {
KASAN_ARG_MODE_ASYMM,
};
+enum kasan_arg_vmalloc {
+ KASAN_ARG_VMALLOC_DEFAULT,
+ KASAN_ARG_VMALLOC_OFF,
+ KASAN_ARG_VMALLOC_ON,
+};
+
enum kasan_arg_stacktrace {
KASAN_ARG_STACKTRACE_DEFAULT,
KASAN_ARG_STACKTRACE_OFF,
@@ -40,6 +46,7 @@ enum kasan_arg_stacktrace {
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;
static enum kasan_arg_stacktrace kasan_arg_stacktrace __initdata;
/*
@@ -56,6 +63,9 @@ EXPORT_SYMBOL(kasan_flag_enabled);
enum kasan_mode kasan_mode __ro_after_init;
EXPORT_SYMBOL_GPL(kasan_mode);
+/* Whether to enable vmalloc tagging. */
+DEFINE_STATIC_KEY_TRUE(kasan_flag_vmalloc);
+
/* Whether to collect alloc/free stack traces. */
DEFINE_STATIC_KEY_TRUE(kasan_flag_stacktrace);
@@ -95,6 +105,23 @@ static int __init early_kasan_mode(char *arg)
}
early_param("kasan.mode", early_kasan_mode);
+/* kasan.vmalloc=off/on */
+static int __init early_kasan_flag_vmalloc(char *arg)
+{
+ if (!arg)
+ return -EINVAL;
+
+ if (!strcmp(arg, "off"))
+ kasan_arg_vmalloc = KASAN_ARG_VMALLOC_OFF;
+ else if (!strcmp(arg, "on"))
+ kasan_arg_vmalloc = KASAN_ARG_VMALLOC_ON;
+ else
+ return -EINVAL;
+
+ return 0;
+}
+early_param("kasan.vmalloc", early_kasan_flag_vmalloc);
+
/* kasan.stacktrace=off/on */
static int __init early_kasan_flag_stacktrace(char *arg)
{
@@ -179,6 +206,18 @@ void __init kasan_init_hw_tags(void)
break;
}
+ switch (kasan_arg_vmalloc) {
+ case KASAN_ARG_VMALLOC_DEFAULT:
+ /* Default is specified by kasan_flag_vmalloc definition. */
+ break;
+ case KASAN_ARG_VMALLOC_OFF:
+ static_branch_disable(&kasan_flag_vmalloc);
+ break;
+ case KASAN_ARG_VMALLOC_ON:
+ static_branch_enable(&kasan_flag_vmalloc);
+ break;
+ }
+
switch (kasan_arg_stacktrace) {
case KASAN_ARG_STACKTRACE_DEFAULT:
/* Default is specified by kasan_flag_stacktrace definition. */
@@ -194,8 +233,9 @@ void __init kasan_init_hw_tags(void)
/* KASAN is now initialized, enable it. */
static_branch_enable(&kasan_flag_enabled);
- pr_info("KernelAddressSanitizer initialized (hw-tags, mode=%s, stacktrace=%s)\n",
+ pr_info("KernelAddressSanitizer initialized (hw-tags, mode=%s, vmalloc=%s, stacktrace=%s)\n",
kasan_mode_info(),
+ kasan_vmalloc_enabled() ? "on" : "off",
kasan_stack_collection_enabled() ? "on" : "off");
}
@@ -228,6 +268,9 @@ void *__kasan_unpoison_vmalloc(const void *start, unsigned long size,
u8 tag;
unsigned long redzone_start, redzone_size;
+ if (!kasan_vmalloc_enabled())
+ return (void *)start;
+
if (!is_vmalloc_or_module_addr(start))
return (void *)start;
diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h
index efda13a9ce6a..4d67408e8407 100644
--- a/mm/kasan/kasan.h
+++ b/mm/kasan/kasan.h
@@ -12,6 +12,7 @@
#include <linux/static_key.h>
#include "../slab.h"
+DECLARE_STATIC_KEY_TRUE(kasan_flag_vmalloc);
DECLARE_STATIC_KEY_TRUE(kasan_flag_stacktrace);
enum kasan_mode {
@@ -22,6 +23,11 @@ enum kasan_mode {
extern enum kasan_mode kasan_mode __ro_after_init;
+static inline bool kasan_vmalloc_enabled(void)
+{
+ return static_branch_likely(&kasan_flag_vmalloc);
+}
+
static inline bool kasan_stack_collection_enabled(void)
{
return static_branch_unlikely(&kasan_flag_stacktrace);
--
2.25.1
next prev parent reply other threads:[~2021-12-30 19:16 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-30 19:12 [PATCH mm v5 00/39] kasan, vmalloc, arm64: add vmalloc tagging support for SW/HW_TAGS andrey.konovalov
2021-12-30 19:12 ` [PATCH mm v5 01/39] kasan, page_alloc: deduplicate should_skip_kasan_poison andrey.konovalov
2021-12-30 19:12 ` [PATCH mm v5 02/39] kasan, page_alloc: move tag_clear_highpage out of kernel_init_free_pages andrey.konovalov
2021-12-30 19:12 ` [PATCH mm v5 03/39] kasan, page_alloc: merge kasan_free_pages into free_pages_prepare andrey.konovalov
2021-12-30 19:12 ` [PATCH mm v5 04/39] kasan, page_alloc: simplify kasan_poison_pages call site andrey.konovalov
2021-12-30 19:12 ` [PATCH mm v5 05/39] kasan, page_alloc: init memory of skipped pages on free andrey.konovalov
2021-12-30 19:12 ` [PATCH mm v5 06/39] kasan: drop skip_kasan_poison variable in free_pages_prepare andrey.konovalov
2021-12-30 19:12 ` [PATCH mm v5 07/39] mm: clarify __GFP_ZEROTAGS comment andrey.konovalov
2021-12-30 19:12 ` [PATCH mm v5 08/39] kasan: only apply __GFP_ZEROTAGS when memory is zeroed andrey.konovalov
2021-12-30 19:12 ` [PATCH mm v5 09/39] kasan, page_alloc: refactor init checks in post_alloc_hook andrey.konovalov
2021-12-30 19:12 ` [PATCH mm v5 10/39] kasan, page_alloc: merge kasan_alloc_pages into post_alloc_hook andrey.konovalov
2021-12-30 19:12 ` [PATCH mm v5 11/39] kasan, page_alloc: combine tag_clear_highpage calls in post_alloc_hook andrey.konovalov
2021-12-30 19:12 ` [PATCH mm v5 12/39] kasan, page_alloc: move SetPageSkipKASanPoison " andrey.konovalov
2021-12-30 19:12 ` [PATCH mm v5 13/39] kasan, page_alloc: move kernel_init_free_pages " andrey.konovalov
2021-12-30 19:12 ` [PATCH mm v5 14/39] kasan, page_alloc: rework kasan_unpoison_pages call site andrey.konovalov
2021-12-30 19:12 ` [PATCH mm v5 15/39] kasan: clean up metadata byte definitions andrey.konovalov
2021-12-30 19:12 ` [PATCH mm v5 16/39] kasan: define KASAN_VMALLOC_INVALID for SW_TAGS andrey.konovalov
2021-12-30 19:12 ` [PATCH mm v5 17/39] kasan, x86, arm64, s390: rename functions for modules shadow andrey.konovalov
2021-12-30 19:12 ` [PATCH mm v5 18/39] kasan, vmalloc: drop outdated VM_KASAN comment andrey.konovalov
2021-12-30 19:14 ` [PATCH mm v5 19/39] kasan: reorder vmalloc hooks andrey.konovalov
2021-12-30 19:14 ` [PATCH mm v5 20/39] kasan: add wrappers for " andrey.konovalov
2021-12-30 19:14 ` [PATCH mm v5 21/39] kasan, vmalloc: reset tags in vmalloc functions andrey.konovalov
2021-12-30 19:14 ` [PATCH mm v5 22/39] kasan, fork: reset pointer tags of vmapped stacks andrey.konovalov
2021-12-30 19:14 ` [PATCH mm v5 23/39] kasan, arm64: " andrey.konovalov
2021-12-30 19:14 ` [PATCH mm v5 24/39] kasan, vmalloc: add vmalloc tagging for SW_TAGS andrey.konovalov
2021-12-30 19:14 ` [PATCH mm v5 25/39] kasan, vmalloc, arm64: mark vmalloc mappings as pgprot_tagged andrey.konovalov
2021-12-30 19:14 ` [PATCH mm v5 26/39] kasan, vmalloc: unpoison VM_ALLOC pages after mapping andrey.konovalov
2021-12-30 19:14 ` [PATCH mm v5 27/39] kasan, mm: only define ___GFP_SKIP_KASAN_POISON with HW_TAGS andrey.konovalov
2021-12-30 19:14 ` [PATCH mm v5 28/39] kasan, page_alloc: allow skipping unpoisoning for HW_TAGS andrey.konovalov
2021-12-30 19:14 ` [PATCH mm v5 29/39] kasan, page_alloc: allow skipping memory init " andrey.konovalov
2022-01-03 2:32 ` Kuan-Ying Lee
2022-01-04 11:28 ` Andrey Konovalov
2021-12-30 19:14 ` [PATCH mm v5 30/39] kasan, vmalloc: add vmalloc tagging " andrey.konovalov
2021-12-30 19:14 ` [PATCH mm v5 31/39] kasan, vmalloc: only tag normal vmalloc allocations andrey.konovalov
2021-12-30 19:14 ` [PATCH mm v5 32/39] kasan, arm64: don't tag executable " andrey.konovalov
2021-12-30 19:14 ` [PATCH mm v5 33/39] kasan: mark kasan_arg_stacktrace as __initdata andrey.konovalov
2021-12-30 19:14 ` [PATCH mm v5 34/39] kasan: clean up feature flags for HW_TAGS mode andrey.konovalov
2021-12-30 19:15 ` andrey.konovalov [this message]
2021-12-30 19:17 ` [PATCH mm v5 36/39] kasan: allow enabling KASAN_VMALLOC and SW/HW_TAGS andrey.konovalov
2021-12-30 19:17 ` [PATCH mm v5 37/39] arm64: select KASAN_VMALLOC for SW/HW_TAGS modes andrey.konovalov
2021-12-30 19:17 ` [PATCH mm v5 38/39] kasan: documentation updates andrey.konovalov
2021-12-30 19:17 ` [PATCH mm v5 39/39] kasan: improve vmalloc tests andrey.konovalov
2021-12-30 19:19 ` [PATCH mm v5 00/39] kasan, vmalloc, arm64: add vmalloc tagging support for SW/HW_TAGS Andrey Konovalov
2021-12-31 2:30 ` Andrew Morton
2022-01-02 2:26 ` Andrey Konovalov
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=bdfb31e3f87560afb2a3f968efbffa995a28ca12.1640891329.git.andreyknvl@google.com \
--to=andrey.konovalov@linux.dev \
--cc=akpm@linux-foundation.org \
--cc=andreyknvl@gmail.com \
--cc=andreyknvl@google.com \
--cc=catalin.marinas@arm.com \
--cc=dvyukov@google.com \
--cc=elver@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-mm@kvack.org \
--cc=mark.rutland@arm.com \
--cc=pcc@google.com \
--cc=ryabinin.a.a@gmail.com \
--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: 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