From: Andrey Konovalov <andreyknvl@google.com>
To: Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will.deacon@arm.com>
Cc: Vincenzo Frascino <vincenzo.frascino@arm.com>,
kasan-dev@googlegroups.com, Dmitry Vyukov <dvyukov@google.com>,
Andrey Ryabinin <aryabinin@virtuozzo.com>,
Alexander Potapenko <glider@google.com>,
Marco Elver <elver@google.com>,
Evgenii Stepanov <eugenis@google.com>,
Elena Petrova <lenaptr@google.com>,
Branislav Rankov <Branislav.Rankov@arm.com>,
Kevin Brodsky <kevin.brodsky@arm.com>,
Andrew Morton <akpm@linux-foundation.org>,
linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org,
linux-kernel@vger.kernel.org,
Andrey Konovalov <andreyknvl@google.com>
Subject: [PATCH v5 24/40] kasan, arm64: only use kasan_depth for software modes
Date: Mon, 12 Oct 2020 22:44:30 +0200 [thread overview]
Message-ID: <2964fa49118c6f67467afb0fd2391a3f4d7d7389.1602535397.git.andreyknvl@google.com> (raw)
In-Reply-To: <cover.1602535397.git.andreyknvl@google.com>
This is a preparatory commit for the upcoming addition of a new hardware
tag-based (MTE-based) KASAN mode.
Hardware tag-based KASAN won't use kasan_depth. Only define and use it
when one of the software KASAN modes are enabled.
No functional changes for software modes.
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
Signed-off-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
---
Change-Id: I6109ea96c8df41ef6d75ad71bf22c1c8fa234a9a
---
arch/arm64/mm/kasan_init.c | 11 ++++++++---
include/linux/kasan.h | 18 +++++++++---------
include/linux/sched.h | 2 +-
init/init_task.c | 2 +-
mm/kasan/common.c | 2 ++
mm/kasan/report.c | 2 ++
6 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/arch/arm64/mm/kasan_init.c b/arch/arm64/mm/kasan_init.c
index 4d35eaf3ec97..b6b9d55bb72e 100644
--- a/arch/arm64/mm/kasan_init.c
+++ b/arch/arm64/mm/kasan_init.c
@@ -273,17 +273,22 @@ static void __init kasan_init_shadow(void)
cpu_replace_ttbr1(lm_alias(swapper_pg_dir));
}
+void __init kasan_init_depth(void)
+{
+ init_task.kasan_depth = 0;
+}
+
#else /* CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS) */
static inline void __init kasan_init_shadow(void) { }
+static inline void __init kasan_init_depth(void) { }
+
#endif /* CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS */
void __init kasan_init(void)
{
kasan_init_shadow();
-
- /* At this point kasan is fully initialized. Enable error messages */
- init_task.kasan_depth = 0;
+ kasan_init_depth();
pr_info("KernelAddressSanitizer initialized\n");
}
diff --git a/include/linux/kasan.h b/include/linux/kasan.h
index c07175e6ad76..2dadaf2be6d2 100644
--- a/include/linux/kasan.h
+++ b/include/linux/kasan.h
@@ -43,6 +43,12 @@ static inline void *kasan_mem_to_shadow(const void *addr)
int kasan_add_zero_shadow(void *start, unsigned long size);
void kasan_remove_zero_shadow(void *start, unsigned long size);
+/* Enable reporting bugs after kasan_disable_current() */
+extern void kasan_enable_current(void);
+
+/* Disable reporting bugs for current task */
+extern void kasan_disable_current(void);
+
#else /* CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS */
static inline int kasan_add_zero_shadow(void *start, unsigned long size)
@@ -53,16 +59,13 @@ static inline void kasan_remove_zero_shadow(void *start,
unsigned long size)
{}
+static inline void kasan_enable_current(void) {}
+static inline void kasan_disable_current(void) {}
+
#endif /* CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS */
#ifdef CONFIG_KASAN
-/* Enable reporting bugs after kasan_disable_current() */
-extern void kasan_enable_current(void);
-
-/* Disable reporting bugs for current task */
-extern void kasan_disable_current(void);
-
void kasan_unpoison_memory(const void *address, size_t size);
void kasan_unpoison_task_stack(struct task_struct *task);
@@ -113,9 +116,6 @@ static inline void kasan_unpoison_memory(const void *address, size_t size) {}
static inline void kasan_unpoison_task_stack(struct task_struct *task) {}
-static inline void kasan_enable_current(void) {}
-static inline void kasan_disable_current(void) {}
-
static inline void kasan_alloc_pages(struct page *page, unsigned int order) {}
static inline void kasan_free_pages(struct page *page, unsigned int order) {}
diff --git a/include/linux/sched.h b/include/linux/sched.h
index afe01e232935..db38b7ecf46d 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1192,7 +1192,7 @@ struct task_struct {
u64 timer_slack_ns;
u64 default_timer_slack_ns;
-#ifdef CONFIG_KASAN
+#if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS)
unsigned int kasan_depth;
#endif
diff --git a/init/init_task.c b/init/init_task.c
index f6889fce64af..b93078f1708b 100644
--- a/init/init_task.c
+++ b/init/init_task.c
@@ -173,7 +173,7 @@ struct task_struct init_task
.numa_group = NULL,
.numa_faults = NULL,
#endif
-#ifdef CONFIG_KASAN
+#if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS)
.kasan_depth = 1,
#endif
#ifdef CONFIG_KCSAN
diff --git a/mm/kasan/common.c b/mm/kasan/common.c
index 543e6bf2168f..d0b3ff410b0c 100644
--- a/mm/kasan/common.c
+++ b/mm/kasan/common.c
@@ -46,6 +46,7 @@ void kasan_set_track(struct kasan_track *track, gfp_t flags)
track->stack = kasan_save_stack(flags);
}
+#if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS)
void kasan_enable_current(void)
{
current->kasan_depth++;
@@ -55,6 +56,7 @@ void kasan_disable_current(void)
{
current->kasan_depth--;
}
+#endif /* CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS */
static void __kasan_unpoison_stack(struct task_struct *task, const void *sp)
{
diff --git a/mm/kasan/report.c b/mm/kasan/report.c
index f28eec5acdf6..91b869673148 100644
--- a/mm/kasan/report.c
+++ b/mm/kasan/report.c
@@ -290,8 +290,10 @@ static void print_shadow_for_address(const void *addr)
static bool report_enabled(void)
{
+#if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS)
if (current->kasan_depth)
return false;
+#endif
if (test_bit(KASAN_BIT_MULTI_SHOT, &kasan_flags))
return true;
return !test_and_set_bit(KASAN_BIT_REPORTED, &kasan_flags);
--
2.28.0.1011.ga647a8990f-goog
next prev parent reply other threads:[~2020-10-12 20:46 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-12 20:44 [PATCH v5 00/40] kasan: add hardware tag-based mode for arm64 Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 01/40] arm64: Enable armv8.5-a asm-arch option Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 02/40] arm64: mte: Add in-kernel MTE helpers Andrey Konovalov
2020-10-28 11:28 ` Dmitry Vyukov
2020-10-29 16:50 ` Andrey Konovalov
2020-11-04 17:49 ` Vincenzo Frascino
2020-10-12 20:44 ` [PATCH v5 03/40] arm64: mte: Reset the page tag in page->flags Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 04/40] arm64: kasan: Add arch layer for memory tagging helpers Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 05/40] arm64: mte: Add in-kernel tag fault handler Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 06/40] arm64: kasan: Enable in-kernel MTE Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 07/40] arm64: mte: Convert gcr_user into an exclude mask Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 08/40] arm64: mte: Switch GCR_EL1 in kernel entry and exit Andrey Konovalov
2020-10-28 10:06 ` Dmitry Vyukov
2020-10-29 16:52 ` Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 09/40] arm64: kasan: Align allocations for HW_TAGS Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 10/40] kasan: drop unnecessary GPL text from comment headers Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 11/40] kasan: KASAN_VMALLOC depends on KASAN_GENERIC Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 12/40] kasan: group vmalloc code Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 13/40] kasan: shadow declarations only for software modes Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 14/40] kasan: rename (un)poison_shadow to (un)poison_memory Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 15/40] kasan: rename KASAN_SHADOW_* to KASAN_GRANULE_* Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 16/40] kasan: only build init.c for software modes Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 17/40] kasan: split out shadow.c from common.c Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 18/40] kasan: define KASAN_GRANULE_PAGE Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 19/40] kasan: rename report and tags files Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 20/40] kasan: don't duplicate config dependencies Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 21/40] kasan: hide invalid free check implementation Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 22/40] kasan: decode stack frame only with KASAN_STACK_ENABLE Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 23/40] kasan, arm64: only init shadow for software modes Andrey Konovalov
2020-10-12 20:44 ` Andrey Konovalov [this message]
2020-10-12 20:44 ` [PATCH v5 25/40] kasan: rename addr_has_shadow to addr_has_metadata Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 26/40] kasan: rename print_shadow_for_address to print_memory_metadata Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 27/40] kasan: kasan_non_canonical_hook only for software modes Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 28/40] kasan: rename SHADOW layout macros to META Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 29/40] kasan: separate metadata_fetch_row for each mode Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 30/40] kasan, arm64: don't allow SW_TAGS with ARM64_MTE Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 31/40] kasan: introduce CONFIG_KASAN_HW_TAGS Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 32/40] kasan: define KASAN_GRANULE_SIZE for HW_TAGS Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 33/40] kasan, x86, s390: update undef CONFIG_KASAN Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 34/40] kasan, arm64: expand CONFIG_KASAN checks Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 35/40] kasan, arm64: implement HW_TAGS runtime Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 36/40] kasan, arm64: print report from tag fault handler Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 37/40] kasan, mm: reset tags when accessing metadata Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 38/40] kasan, arm64: enable CONFIG_KASAN_HW_TAGS Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 39/40] kasan: add documentation for hardware tag-based mode Andrey Konovalov
2020-10-12 20:44 ` [PATCH v5 40/40] kselftest/arm64: Check GCR_EL1 after context switch 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=2964fa49118c6f67467afb0fd2391a3f4d7d7389.1602535397.git.andreyknvl@google.com \
--to=andreyknvl@google.com \
--cc=Branislav.Rankov@arm.com \
--cc=akpm@linux-foundation.org \
--cc=aryabinin@virtuozzo.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=kevin.brodsky@arm.com \
--cc=lenaptr@google.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=vincenzo.frascino@arm.com \
--cc=will.deacon@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;
as well as URLs for NNTP newsgroup(s).