linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: Andrey Konovalov <andreyknvl@google.com>
To: Catalin Marinas <catalin.marinas@arm.com>,
	Will Deacon <will.deacon@arm.com>
Cc: linux-arm-kernel@lists.infradead.org,
	Marco Elver <elver@google.com>,
	Elena Petrova <lenaptr@google.com>,
	Andrey Konovalov <andreyknvl@google.com>,
	Kevin Brodsky <kevin.brodsky@arm.com>,
	Branislav Rankov <Branislav.Rankov@arm.com>,
	kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org,
	linux-mm@kvack.org, Alexander Potapenko <glider@google.com>,
	Evgenii Stepanov <eugenis@google.com>,
	Andrey Ryabinin <aryabinin@virtuozzo.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	Vincenzo Frascino <vincenzo.frascino@arm.com>,
	Dmitry Vyukov <dvyukov@google.com>
Subject: [PATCH v7 34/41] kasan, x86, s390: update undef CONFIG_KASAN
Date: Mon,  2 Nov 2020 17:04:14 +0100	[thread overview]
Message-ID: <bd64e051e8e36ac25751debc071887af3d7f663f.1604333009.git.andreyknvl@google.com> (raw)
In-Reply-To: <cover.1604333009.git.andreyknvl@google.com>

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>
---
Change-Id: I2a622db0cb86a8feb60c30d8cb09190075be2a90
---
 arch/s390/boot/string.c         | 1 +
 arch/x86/boot/compressed/misc.h | 1 +
 2 files changed, 2 insertions(+)

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 6d31f1b4c4d1..652decd6c4fc 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
-- 
2.29.1.341.ge80a0c044ae-goog


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2020-11-02 16:18 UTC|newest]

Thread overview: 51+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-02 16:03 [PATCH v7 00/41] kasan: add hardware tag-based mode for arm64 Andrey Konovalov
2020-11-02 16:03 ` [PATCH v7 01/41] arm64: Enable armv8.5-a asm-arch option Andrey Konovalov
2020-11-02 16:03 ` [PATCH v7 02/41] arm64: mte: Add in-kernel MTE helpers Andrey Konovalov
2020-11-02 16:03 ` [PATCH v7 03/41] arm64: mte: Reset the page tag in page->flags Andrey Konovalov
2020-11-02 16:03 ` [PATCH v7 04/41] arm64: kasan: Add arch layer for memory tagging helpers Andrey Konovalov
2020-11-02 16:03 ` [PATCH v7 05/41] arm64: mte: Add in-kernel tag fault handler Andrey Konovalov
2020-11-02 16:03 ` [PATCH v7 06/41] arm64: kasan: Enable in-kernel MTE Andrey Konovalov
2020-11-02 16:03 ` [PATCH v7 07/41] arm64: mte: Convert gcr_user into an exclude mask Andrey Konovalov
2020-11-02 16:03 ` [PATCH v7 08/41] arm64: mte: Switch GCR_EL1 in kernel entry and exit Andrey Konovalov
2020-11-02 16:03 ` [PATCH v7 09/41] arm64: kasan: Align allocations for HW_TAGS Andrey Konovalov
2020-11-02 16:03 ` [PATCH v7 10/41] kasan: drop unnecessary GPL text from comment headers Andrey Konovalov
2020-11-02 16:03 ` [PATCH v7 11/41] kasan: KASAN_VMALLOC depends on KASAN_GENERIC Andrey Konovalov
2020-11-02 16:03 ` [PATCH v7 12/41] kasan: group vmalloc code Andrey Konovalov
2020-11-02 16:03 ` [PATCH v7 13/41] s390/kasan: include asm/page.h from asm/kasan.h Andrey Konovalov
2020-11-04 17:19   ` Andrey Konovalov
2020-11-04 19:25   ` Vasily Gorbik
2020-11-04 19:26     ` Andrey Konovalov
2020-11-02 16:03 ` [PATCH v7 14/41] kasan: shadow declarations only for software modes Andrey Konovalov
2020-11-02 16:03 ` [PATCH v7 15/41] kasan: rename (un)poison_shadow to (un)poison_memory Andrey Konovalov
2020-11-02 16:03 ` [PATCH v7 16/41] kasan: rename KASAN_SHADOW_* to KASAN_GRANULE_* Andrey Konovalov
2020-11-04 19:11   ` Vasily Gorbik
2020-11-04 19:22     ` Andrey Konovalov
2020-11-04 19:30       ` Vasily Gorbik
2020-11-04 19:32         ` Andrey Konovalov
2020-11-02 16:03 ` [PATCH v7 17/41] kasan: only build init.c for software modes Andrey Konovalov
2020-11-02 16:03 ` [PATCH v7 18/41] kasan: split out shadow.c from common.c Andrey Konovalov
2020-11-02 16:03 ` [PATCH v7 19/41] kasan: define KASAN_GRANULE_PAGE Andrey Konovalov
2020-11-02 16:04 ` [PATCH v7 20/41] kasan: rename report and tags files Andrey Konovalov
2020-11-02 16:04 ` [PATCH v7 21/41] kasan: don't duplicate config dependencies Andrey Konovalov
2020-11-02 16:04 ` [PATCH v7 22/41] kasan: hide invalid free check implementation Andrey Konovalov
2020-11-02 16:04 ` [PATCH v7 23/41] kasan: decode stack frame only with KASAN_STACK_ENABLE Andrey Konovalov
2020-11-02 16:04 ` [PATCH v7 24/41] kasan, arm64: only init shadow for software modes Andrey Konovalov
2020-11-02 16:04 ` [PATCH v7 25/41] kasan, arm64: only use kasan_depth " Andrey Konovalov
2020-11-02 16:04 ` [PATCH v7 26/41] kasan: rename addr_has_shadow to addr_has_metadata Andrey Konovalov
2020-11-02 16:04 ` [PATCH v7 27/41] kasan: rename print_shadow_for_address to print_memory_metadata Andrey Konovalov
2020-11-02 16:04 ` [PATCH v7 28/41] kasan: kasan_non_canonical_hook only for software modes Andrey Konovalov
2020-11-02 16:04 ` [PATCH v7 29/41] kasan: rename SHADOW layout macros to META Andrey Konovalov
2020-11-02 16:04 ` [PATCH v7 30/41] kasan: separate metadata_fetch_row for each mode Andrey Konovalov
2020-11-02 16:04 ` [PATCH v7 31/41] kasan, arm64: don't allow SW_TAGS with ARM64_MTE Andrey Konovalov
2020-11-02 16:04 ` [PATCH v7 32/41] kasan: introduce CONFIG_KASAN_HW_TAGS Andrey Konovalov
2020-11-02 16:04 ` [PATCH v7 33/41] kasan: define KASAN_GRANULE_SIZE for HW_TAGS Andrey Konovalov
2020-11-02 16:04 ` Andrey Konovalov [this message]
2020-11-04 17:28   ` [PATCH v7 34/41] kasan, x86, s390: update undef CONFIG_KASAN Andrey Konovalov
2020-11-04 19:17   ` Vasily Gorbik
2020-11-02 16:04 ` [PATCH v7 35/41] kasan, arm64: expand CONFIG_KASAN checks Andrey Konovalov
2020-11-02 16:04 ` [PATCH v7 36/41] kasan, arm64: implement HW_TAGS runtime Andrey Konovalov
2020-11-02 16:04 ` [PATCH v7 37/41] kasan, arm64: print report from tag fault handler Andrey Konovalov
2020-11-02 16:04 ` [PATCH v7 38/41] kasan, mm: reset tags when accessing metadata Andrey Konovalov
2020-11-02 16:04 ` [PATCH v7 39/41] kasan, arm64: enable CONFIG_KASAN_HW_TAGS Andrey Konovalov
2020-11-02 16:04 ` [PATCH v7 40/41] kasan: add documentation for hardware tag-based mode Andrey Konovalov
2020-11-02 16:04 ` [PATCH v7 41/41] 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=bd64e051e8e36ac25751debc071887af3d7f663f.1604333009.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).