linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: andrey.konovalov@linux.dev
To: Marco Elver <elver@google.com>,
	Alexander Potapenko <glider@google.com>,
	Andrew Morton <akpm@linux-foundation.org>
Cc: Andrey Konovalov <andreyknvl@gmail.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 v4 29/39] kasan, page_alloc: allow skipping memory init for HW_TAGS
Date: Mon, 20 Dec 2021 23:02:01 +0100	[thread overview]
Message-ID: <dea9eb126793544650ff433612016016070ceb52.1640036051.git.andreyknvl@google.com> (raw)
In-Reply-To: <cover.1640036051.git.andreyknvl@google.com>

From: Andrey Konovalov <andreyknvl@google.com>

Add a new GFP flag __GFP_SKIP_ZERO that allows to skip memory
initialization. The flag is only effective with HW_TAGS KASAN.

This flag will be used by vmalloc code for page_alloc allocations
backing vmalloc() mappings in a following patch. The reason to skip
memory initialization for these pages in page_alloc is because vmalloc
code will be initializing them instead.

With the current implementation, when __GFP_SKIP_ZERO is provided,
__GFP_ZEROTAGS is ignored. This doesn't matter, as these two flags are
never provided at the same time. However, if this is changed in the
future, this particular implementation detail can be changed as well.

Signed-off-by: Andrey Konovalov <andreyknvl@google.com>

---

Changes v3->v4:
- Only define __GFP_SKIP_ZERO when CONFIG_KASAN_HW_TAGS is enabled.
- Add __GFP_SKIP_ZERO to include/trace/events/mmflags.h.
- Use proper kasan_hw_tags_enabled() check instead of
  IS_ENABLED(CONFIG_KASAN_HW_TAGS). Also add explicit checks for
  software modes.

Changes v2->v3:
- Update patch description.

Changes v1->v2:
- Add this patch.
---
 include/linux/gfp.h            | 16 ++++++++++++----
 include/trace/events/mmflags.h |  1 +
 mm/page_alloc.c                | 18 +++++++++++++++++-
 3 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/include/linux/gfp.h b/include/linux/gfp.h
index 600f0749c3f2..c7ebc93296ed 100644
--- a/include/linux/gfp.h
+++ b/include/linux/gfp.h
@@ -55,14 +55,16 @@ struct vm_area_struct;
 #define ___GFP_ACCOUNT		0x400000u
 #define ___GFP_ZEROTAGS		0x800000u
 #ifdef CONFIG_KASAN_HW_TAGS
-#define ___GFP_SKIP_KASAN_UNPOISON	0x1000000u
-#define ___GFP_SKIP_KASAN_POISON	0x2000000u
+#define ___GFP_SKIP_ZERO		0x1000000u
+#define ___GFP_SKIP_KASAN_UNPOISON	0x2000000u
+#define ___GFP_SKIP_KASAN_POISON	0x4000000u
 #else
+#define ___GFP_SKIP_ZERO		0
 #define ___GFP_SKIP_KASAN_UNPOISON	0
 #define ___GFP_SKIP_KASAN_POISON	0
 #endif
 #ifdef CONFIG_LOCKDEP
-#define ___GFP_NOLOCKDEP	0x4000000u
+#define ___GFP_NOLOCKDEP	0x8000000u
 #else
 #define ___GFP_NOLOCKDEP	0
 #endif
@@ -235,7 +237,11 @@ struct vm_area_struct;
  * %__GFP_ZERO returns a zeroed page on success.
  *
  * %__GFP_ZEROTAGS zeroes memory tags at allocation time if the memory itself
- * is being zeroed (either via __GFP_ZERO or via init_on_alloc).
+ * is being zeroed (either via __GFP_ZERO or via init_on_alloc, provided that
+ * __GFP_SKIP_ZERO is not set).
+ *
+ * %__GFP_SKIP_ZERO makes page_alloc skip zeroing memory.
+ * Only effective when HW_TAGS KASAN is enabled.
  *
  * %__GFP_SKIP_KASAN_UNPOISON makes KASAN skip unpoisoning on page allocation.
  * Only effective in HW_TAGS mode.
@@ -247,6 +253,7 @@ struct vm_area_struct;
 #define __GFP_COMP	((__force gfp_t)___GFP_COMP)
 #define __GFP_ZERO	((__force gfp_t)___GFP_ZERO)
 #define __GFP_ZEROTAGS	((__force gfp_t)___GFP_ZEROTAGS)
+#define __GFP_SKIP_ZERO ((__force gfp_t)___GFP_SKIP_ZERO)
 #define __GFP_SKIP_KASAN_UNPOISON ((__force gfp_t)___GFP_SKIP_KASAN_UNPOISON)
 #define __GFP_SKIP_KASAN_POISON   ((__force gfp_t)___GFP_SKIP_KASAN_POISON)
 
@@ -255,6 +262,7 @@ struct vm_area_struct;
 
 /* Room for N __GFP_FOO bits */
 #define __GFP_BITS_SHIFT (24 +					\
+			  IS_ENABLED(CONFIG_KASAN_HW_TAGS) +	\
 			  IS_ENABLED(CONFIG_KASAN_HW_TAGS) +	\
 			  IS_ENABLED(CONFIG_KASAN_HW_TAGS) +	\
 			  IS_ENABLED(CONFIG_LOCKDEP))
diff --git a/include/trace/events/mmflags.h b/include/trace/events/mmflags.h
index 1329d9c4df56..f18eeb5fdde2 100644
--- a/include/trace/events/mmflags.h
+++ b/include/trace/events/mmflags.h
@@ -52,6 +52,7 @@
 
 #ifdef CONFIG_KASAN_HW_TAGS
 #define __def_gfpflag_names_kasan					      \
+	, {(unsigned long)__GFP_SKIP_ZERO, "__GFP_SKIP_ZERO"}		      \
 	, {(unsigned long)__GFP_SKIP_KASAN_POISON, "__GFP_SKIP_KASAN_POISON"} \
 	, {(unsigned long)__GFP_SKIP_KASAN_UNPOISON,			      \
 						"__GFP_SKIP_KASAN_UNPOISON"}
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 2076b5cc7e2c..5e22068d4acb 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -2414,10 +2414,26 @@ static inline bool should_skip_kasan_unpoison(gfp_t flags, bool init_tags)
 	return init_tags || (flags & __GFP_SKIP_KASAN_UNPOISON);
 }
 
+static inline bool should_skip_init(gfp_t flags)
+{
+	/* Don't skip if a software KASAN mode is enabled. */
+	if (IS_ENABLED(CONFIG_KASAN_GENERIC) ||
+	    IS_ENABLED(CONFIG_KASAN_SW_TAGS))
+		return false;
+
+	/* Don't skip, if hardware tag-based KASAN is not enabled. */
+	if (!kasan_hw_tags_enabled())
+		return false;
+
+	/* For hardware tag-based KASAN, skip if requested. */
+	return (flags & __GFP_SKIP_ZERO);
+}
+
 inline void post_alloc_hook(struct page *page, unsigned int order,
 				gfp_t gfp_flags)
 {
-	bool init = !want_init_on_free() && want_init_on_alloc(gfp_flags);
+	bool init = !want_init_on_free() && want_init_on_alloc(gfp_flags) &&
+			!should_skip_init(gfp_flags);
 	bool init_tags = init && (gfp_flags & __GFP_ZEROTAGS);
 
 	set_page_private(page, 0);
-- 
2.25.1


  parent reply	other threads:[~2021-12-20 22:02 UTC|newest]

Thread overview: 60+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-20 21:58 [PATCH mm v4 00/39] kasan, vmalloc, arm64: add vmalloc tagging support for SW/HW_TAGS andrey.konovalov
2021-12-20 21:58 ` [PATCH mm v4 01/39] kasan, page_alloc: deduplicate should_skip_kasan_poison andrey.konovalov
2021-12-20 21:58 ` [PATCH mm v4 02/39] kasan, page_alloc: move tag_clear_highpage out of kernel_init_free_pages andrey.konovalov
2021-12-20 21:58 ` [PATCH mm v4 03/39] kasan, page_alloc: merge kasan_free_pages into free_pages_prepare andrey.konovalov
2021-12-20 21:58 ` [PATCH mm v4 04/39] kasan, page_alloc: simplify kasan_poison_pages call site andrey.konovalov
2021-12-20 21:58 ` [PATCH mm v4 05/39] kasan, page_alloc: init memory of skipped pages on free andrey.konovalov
2021-12-20 21:58 ` [PATCH mm v4 06/39] kasan: drop skip_kasan_poison variable in free_pages_prepare andrey.konovalov
2021-12-20 21:58 ` [PATCH mm v4 07/39] mm: clarify __GFP_ZEROTAGS comment andrey.konovalov
2021-12-21  9:16   ` Alexander Potapenko
2021-12-30 19:11     ` Andrey Konovalov
2021-12-20 21:58 ` [PATCH mm v4 08/39] kasan: only apply __GFP_ZEROTAGS when memory is zeroed andrey.konovalov
2021-12-20 21:58 ` [PATCH mm v4 09/39] kasan, page_alloc: refactor init checks in post_alloc_hook andrey.konovalov
2021-12-20 21:58 ` [PATCH mm v4 10/39] kasan, page_alloc: merge kasan_alloc_pages into post_alloc_hook andrey.konovalov
2021-12-20 21:59 ` [PATCH mm v4 11/39] kasan, page_alloc: combine tag_clear_highpage calls in post_alloc_hook andrey.konovalov
2021-12-20 21:59 ` [PATCH mm v4 12/39] kasan, page_alloc: move SetPageSkipKASanPoison " andrey.konovalov
2021-12-20 21:59 ` [PATCH mm v4 13/39] kasan, page_alloc: move kernel_init_free_pages " andrey.konovalov
2021-12-20 21:59 ` [PATCH mm v4 14/39] kasan, page_alloc: rework kasan_unpoison_pages call site andrey.konovalov
2021-12-20 21:59 ` [PATCH mm v4 15/39] kasan: clean up metadata byte definitions andrey.konovalov
2021-12-20 21:59 ` [PATCH mm v4 16/39] kasan: define KASAN_VMALLOC_INVALID for SW_TAGS andrey.konovalov
2021-12-21  9:23   ` Alexander Potapenko
2021-12-20 21:59 ` [PATCH mm v4 17/39] kasan, x86, arm64, s390: rename functions for modules shadow andrey.konovalov
2021-12-20 21:59 ` [PATCH mm v4 18/39] kasan, vmalloc: drop outdated VM_KASAN comment andrey.konovalov
2021-12-20 21:59 ` [PATCH mm v4 19/39] kasan: reorder vmalloc hooks andrey.konovalov
2021-12-20 21:59 ` [PATCH mm v4 20/39] kasan: add wrappers for " andrey.konovalov
2021-12-21 14:21   ` Alexander Potapenko
2021-12-20 21:59 ` [PATCH mm v4 21/39] kasan, vmalloc: reset tags in vmalloc functions andrey.konovalov
2021-12-20 22:01 ` [PATCH mm v4 22/39] kasan, fork: reset pointer tags of vmapped stacks andrey.konovalov
2021-12-21 15:11   ` Alexander Potapenko
2021-12-20 22:01 ` [PATCH mm v4 23/39] kasan, arm64: " andrey.konovalov
2021-12-20 22:01 ` [PATCH mm v4 24/39] kasan, vmalloc: add vmalloc tagging for SW_TAGS andrey.konovalov
2021-12-20 22:01 ` [PATCH mm v4 25/39] kasan, vmalloc, arm64: mark vmalloc mappings as pgprot_tagged andrey.konovalov
2021-12-20 22:01 ` [PATCH mm v4 26/39] kasan, vmalloc: unpoison VM_ALLOC pages after mapping andrey.konovalov
2021-12-21 11:50   ` Alexander Potapenko
2021-12-20 22:01 ` [PATCH mm v4 27/39] kasan, mm: only define ___GFP_SKIP_KASAN_POISON with HW_TAGS andrey.konovalov
2021-12-20 22:02 ` [PATCH mm v4 28/39] kasan, page_alloc: allow skipping unpoisoning for HW_TAGS andrey.konovalov
2021-12-21 12:04   ` Marco Elver
2021-12-30 19:11     ` Andrey Konovalov
2021-12-21 12:14   ` Marco Elver
2021-12-21 12:19     ` Marco Elver
2021-12-20 22:02 ` andrey.konovalov [this message]
2021-12-21 12:11   ` [PATCH mm v4 29/39] kasan, page_alloc: allow skipping memory init " Marco Elver
2021-12-30 19:11     ` Andrey Konovalov
2021-12-21 12:30   ` Marco Elver
2021-12-30 19:11     ` Andrey Konovalov
2021-12-20 22:02 ` [PATCH mm v4 30/39] kasan, vmalloc: add vmalloc tagging " andrey.konovalov
2021-12-20 22:02 ` [PATCH mm v4 31/39] kasan, vmalloc: only tag normal vmalloc allocations andrey.konovalov
2021-12-20 22:02 ` [PATCH mm v4 32/39] kasan, arm64: don't tag executable " andrey.konovalov
2021-12-20 22:05   ` Andrey Konovalov
2021-12-22 11:11   ` Catalin Marinas
2021-12-20 22:02 ` [PATCH mm v4 33/39] kasan: mark kasan_arg_stacktrace as __initdata andrey.konovalov
2021-12-20 22:02 ` [PATCH mm v4 34/39] kasan: simplify kasan_init_hw_tags andrey.konovalov
2021-12-20 22:02 ` [PATCH mm v4 35/39] kasan: add kasan.vmalloc command line flag andrey.konovalov
2021-12-21 14:43   ` Alexander Potapenko
2021-12-30 19:11     ` Andrey Konovalov
2021-12-20 22:03 ` [PATCH mm v4 36/39] kasan: allow enabling KASAN_VMALLOC and SW/HW_TAGS andrey.konovalov
2021-12-20 22:03 ` [PATCH mm v4 37/39] arm64: select KASAN_VMALLOC for SW/HW_TAGS modes andrey.konovalov
2021-12-20 22:03 ` [PATCH mm v4 38/39] kasan: documentation updates andrey.konovalov
2021-12-20 22:03 ` [PATCH mm v4 39/39] kasan: improve vmalloc tests andrey.konovalov
2021-12-22  7:00 ` [PATCH mm v4 00/39] kasan, vmalloc, arm64: add vmalloc tagging support for SW/HW_TAGS Marco Elver
2021-12-30 19:11   ` 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=dea9eb126793544650ff433612016016070ceb52.1640036051.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;
as well as URLs for NNTP newsgroup(s).