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 27/39] kasan, mm: only define ___GFP_SKIP_KASAN_POISON with HW_TAGS
Date: Thu, 30 Dec 2021 20:14:52 +0100 [thread overview]
Message-ID: <715abda1793c68cc49c833876b6ca993fd2535f9.1640891329.git.andreyknvl@google.com> (raw)
In-Reply-To: <cover.1640891329.git.andreyknvl@google.com>
From: Andrey Konovalov <andreyknvl@google.com>
Only define the ___GFP_SKIP_KASAN_POISON flag when CONFIG_KASAN_HW_TAGS
is enabled.
This patch it not useful by itself, but it prepares the code for
additions of new KASAN-specific GFP patches.
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
---
Changes v3->v4:
- This is a new patch.
---
include/linux/gfp.h | 8 +++++++-
include/trace/events/mmflags.h | 12 +++++++++---
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/include/linux/gfp.h b/include/linux/gfp.h
index 19e55f3fdd04..9dce456d147a 100644
--- a/include/linux/gfp.h
+++ b/include/linux/gfp.h
@@ -54,7 +54,11 @@ struct vm_area_struct;
#define ___GFP_THISNODE 0x200000u
#define ___GFP_ACCOUNT 0x400000u
#define ___GFP_ZEROTAGS 0x800000u
+#ifdef CONFIG_KASAN_HW_TAGS
#define ___GFP_SKIP_KASAN_POISON 0x1000000u
+#else
+#define ___GFP_SKIP_KASAN_POISON 0
+#endif
#ifdef CONFIG_LOCKDEP
#define ___GFP_NOLOCKDEP 0x2000000u
#else
@@ -247,7 +251,9 @@ struct vm_area_struct;
#define __GFP_NOLOCKDEP ((__force gfp_t)___GFP_NOLOCKDEP)
/* Room for N __GFP_FOO bits */
-#define __GFP_BITS_SHIFT (25 + IS_ENABLED(CONFIG_LOCKDEP))
+#define __GFP_BITS_SHIFT (24 + \
+ IS_ENABLED(CONFIG_KASAN_HW_TAGS) + \
+ IS_ENABLED(CONFIG_LOCKDEP))
#define __GFP_BITS_MASK ((__force gfp_t)((1 << __GFP_BITS_SHIFT) - 1))
/**
diff --git a/include/trace/events/mmflags.h b/include/trace/events/mmflags.h
index 30f492256b8c..414bf4367283 100644
--- a/include/trace/events/mmflags.h
+++ b/include/trace/events/mmflags.h
@@ -48,12 +48,18 @@
{(unsigned long)__GFP_RECLAIM, "__GFP_RECLAIM"}, \
{(unsigned long)__GFP_DIRECT_RECLAIM, "__GFP_DIRECT_RECLAIM"},\
{(unsigned long)__GFP_KSWAPD_RECLAIM, "__GFP_KSWAPD_RECLAIM"},\
- {(unsigned long)__GFP_ZEROTAGS, "__GFP_ZEROTAGS"}, \
- {(unsigned long)__GFP_SKIP_KASAN_POISON,"__GFP_SKIP_KASAN_POISON"}\
+ {(unsigned long)__GFP_ZEROTAGS, "__GFP_ZEROTAGS"} \
+
+#ifdef CONFIG_KASAN_HW_TAGS
+#define __def_gfpflag_names_kasan \
+ , {(unsigned long)__GFP_SKIP_KASAN_POISON, "__GFP_SKIP_KASAN_POISON"}
+#else
+#define __def_gfpflag_names_kasan
+#endif
#define show_gfp_flags(flags) \
(flags) ? __print_flags(flags, "|", \
- __def_gfpflag_names \
+ __def_gfpflag_names __def_gfpflag_names_kasan \
) : "none"
#ifdef CONFIG_MMU
--
2.25.1
next prev parent reply other threads:[~2021-12-30 19:15 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 ` andrey.konovalov [this message]
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 ` [PATCH mm v5 35/39] kasan: add kasan.vmalloc command line flag andrey.konovalov
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=715abda1793c68cc49c833876b6ca993fd2535f9.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