diff mbox series

[mm,v11,35/42] kasan, x86, s390: update undef CONFIG_KASAN

Message ID	9d84bfaaf8fabe0fc89f913c9e420a30bd31a260.1606161801.git.andreyknvl@google.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=gjjd=E5=kvack.org=owner-linux-mm@kernel.org> DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0C19520717 Date: Mon, 23 Nov 2020 21:07:59 +0100 In-Reply-To: <cover.1606161801.git.andreyknvl@google.com> Message-Id: <9d84bfaaf8fabe0fc89f913c9e420a30bd31a260.1606161801.git.andreyknvl@google.com> Mime-Version: 1.0 References: <cover.1606161801.git.andreyknvl@google.com> Subject: [PATCH mm v11 35/42] kasan, x86, s390: update undef CONFIG_KASAN From: Andrey Konovalov <andreyknvl@google.com> To: Andrew Morton <akpm@linux-foundation.org> Cc: Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will.deacon@arm.com>, Vincenzo Frascino <vincenzo.frascino@arm.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>, Branislav Rankov <Branislav.Rankov@arm.com>, Kevin Brodsky <kevin.brodsky@arm.com>, kasan-dev@googlegroups.com, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov <andreyknvl@google.com>, Vasily Gorbik <gor@linux.ibm.com> Content-Type: text/plain; charset="UTF-8" Sender: owner-linux-mm@kvack.org Precedence: bulk
Series	kasan: add hardware tag-based mode for arm64 \| expand [mm,v11,00/42] kasan: add hardware tag-based mode for arm64 [mm,v11,01/42] kasan: drop unnecessary GPL text from comment headers [mm,v11,02/42] kasan: KASAN_VMALLOC depends on KASAN_GENERIC [mm,v11,03/42] kasan: group vmalloc code [mm,v11,04/42] kasan: shadow declarations only for software modes [mm,v11,05/42] kasan: rename (un)poison_shadow to (un)poison_range [mm,v11,06/42] kasan: rename KASAN_SHADOW_* to KASAN_GRANULE_* [mm,v11,07/42] kasan: only build init.c for software modes [mm,v11,08/42] kasan: split out shadow.c from common.c [mm,v11,09/42] kasan: define KASAN_MEMORY_PER_SHADOW_PAGE [mm,v11,10/42] kasan: rename report and tags files [mm,v11,11/42] kasan: don't duplicate config dependencies [mm,v11,12/42] kasan: hide invalid free check implementation [mm,v11,13/42] kasan: decode stack frame only with KASAN_STACK_ENABLE [mm,v11,14/42] kasan, arm64: only init shadow for software modes [mm,v11,15/42] kasan, arm64: only use kasan_depth for software modes [mm,v11,16/42] kasan, arm64: move initialization message [mm,v11,17/42] kasan, arm64: rename kasan_init_tags and mark as __init [mm,v11,18/42] kasan: rename addr_has_shadow to addr_has_metadata [mm,v11,19/42] kasan: rename print_shadow_for_address to print_memory_metadata [mm,v11,20/42] kasan: rename SHADOW layout macros to META [mm,v11,21/42] kasan: separate metadata_fetch_row for each mode [mm,v11,22/42] kasan, arm64: don't allow SW_TAGS with ARM64_MTE [mm,v11,23/42] kasan: introduce CONFIG_KASAN_HW_TAGS [mm,v11,24/42] arm64: Enable armv8.5-a asm-arch option [mm,v11,25/42] arm64: mte: Add in-kernel MTE helpers [mm,v11,26/42] arm64: mte: Reset the page tag in page->flags [mm,v11,27/42] arm64: mte: Add in-kernel tag fault handler [mm,v11,28/42] arm64: kasan: Allow enabling in-kernel MTE [mm,v11,29/42] arm64: mte: Convert gcr_user into an exclude mask [mm,v11,30/42] arm64: mte: Switch GCR_EL1 in kernel entry and exit [mm,v11,31/42] kasan, mm: untag page address in free_reserved_area [mm,v11,32/42] arm64: kasan: Align allocations for HW_TAGS [mm,v11,33/42] arm64: kasan: Add arch layer for memory tagging helpers [mm,v11,34/42] kasan: define KASAN_GRANULE_SIZE for HW_TAGS [mm,v11,35/42] kasan, x86, s390: update undef CONFIG_KASAN [mm,v11,36/42] kasan, arm64: expand CONFIG_KASAN checks [mm,v11,37/42] kasan, arm64: implement HW_TAGS runtime [mm,v11,38/42] kasan, arm64: print report from tag fault handler [mm,v11,39/42] kasan, mm: reset tags when accessing metadata [mm,v11,40/42] kasan, arm64: enable CONFIG_KASAN_HW_TAGS [mm,v11,41/42] kasan: add documentation for hardware tag-based mode [mm,v11,42/42] kselftest/arm64: Check GCR_EL1 after context switch

Commit Message

Andrey Konovalov Nov. 23, 2020, 8:07 p.m. UTC

With the intoduction of hardware tag-based KASAN some kernel checks of
this kind:

  ifdef CONFIG_KASAN

will be updated to:

  if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS)

x86 and s390 use a trick to #undef CONFIG_KASAN for some of the code
that isn't linked with KASAN runtime and shouldn't have any KASAN
annotations.

Also #undef CONFIG_KASAN_GENERIC with CONFIG_KASAN.

Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
Signed-off-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
Reviewed-by: Marco Elver <elver@google.com>
Acked-by: Vasily Gorbik <gor@linux.ibm.com>
Reviewed-by: Alexander Potapenko <glider@google.com>
---
Change-Id: I2a622db0cb86a8feb60c30d8cb09190075be2a90
---
 arch/s390/boot/string.c         | 1 +
 arch/x86/boot/compressed/misc.h | 1 +
 2 files changed, 2 insertions(+)

diff mbox series

Patch

diff --git a/arch/s390/boot/string.c b/arch/s390/boot/string.c
index b11e8108773a..faccb33b462c 100644
--- a/arch/s390/boot/string.c
+++ b/arch/s390/boot/string.c
@@ -3,6 +3,7 @@ 
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #undef CONFIG_KASAN
+#undef CONFIG_KASAN_GENERIC
 #include "../lib/string.c"
 
 int strncmp(const char *cs, const char *ct, size_t count)
diff --git a/arch/x86/boot/compressed/misc.h b/arch/x86/boot/compressed/misc.h
index d9a631c5973c..901ea5ebec22 100644
--- a/arch/x86/boot/compressed/misc.h
+++ b/arch/x86/boot/compressed/misc.h
@@ -12,6 +12,7 @@ 
 #undef CONFIG_PARAVIRT_XXL
 #undef CONFIG_PARAVIRT_SPINLOCKS
 #undef CONFIG_KASAN
+#undef CONFIG_KASAN_GENERIC
 
 /* cpu_feature_enabled() cannot be used this early */
 #define USE_EARLY_PGTABLE_L5