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 v3 04/38] kasan, page_alloc: simplify kasan_poison_pages call site
Date: Mon, 13 Dec 2021 22:51:23 +0100 [thread overview]
Message-ID: <4b39d778ac71937325641c3d7a36889b37fb3242.1639432170.git.andreyknvl@google.com> (raw)
In-Reply-To: <cover.1639432170.git.andreyknvl@google.com>
From: Andrey Konovalov <andreyknvl@google.com>
Simplify the code around calling kasan_poison_pages() in
free_pages_prepare().
This patch does no functional changes.
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
---
Changes v1->v2:
- Don't reorder kasan_poison_pages() and free_pages_prepare().
---
mm/page_alloc.c | 18 +++++-------------
1 file changed, 5 insertions(+), 13 deletions(-)
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 740fb01a27ed..db8cecdd0aaa 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -1301,6 +1301,7 @@ static __always_inline bool free_pages_prepare(struct page *page,
{
int bad = 0;
bool skip_kasan_poison = should_skip_kasan_poison(page, fpi_flags);
+ bool init = want_init_on_free();
VM_BUG_ON_PAGE(PageTail(page), page);
@@ -1373,19 +1374,10 @@ static __always_inline bool free_pages_prepare(struct page *page,
* With hardware tag-based KASAN, memory tags must be set before the
* page becomes unavailable via debug_pagealloc or arch_free_page.
*/
- if (kasan_has_integrated_init()) {
- bool init = want_init_on_free();
-
- if (!skip_kasan_poison)
- kasan_poison_pages(page, order, init);
- } else {
- bool init = want_init_on_free();
-
- if (init)
- kernel_init_free_pages(page, 1 << order);
- if (!skip_kasan_poison)
- kasan_poison_pages(page, order, init);
- }
+ if (init && !kasan_has_integrated_init())
+ kernel_init_free_pages(page, 1 << order);
+ if (!skip_kasan_poison)
+ kasan_poison_pages(page, order, init);
/*
* arch_free_page() can make the page's contents inaccessible. s390
--
2.25.1
next prev parent reply other threads:[~2021-12-13 21:52 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-13 21:51 [PATCH mm v3 00/38] kasan, vmalloc, arm64: add vmalloc tagging support for SW/HW_TAGS andrey.konovalov
2021-12-13 21:51 ` [PATCH mm v3 01/38] kasan, page_alloc: deduplicate should_skip_kasan_poison andrey.konovalov
2021-12-13 21:51 ` [PATCH mm v3 02/38] kasan, page_alloc: move tag_clear_highpage out of kernel_init_free_pages andrey.konovalov
2021-12-13 21:51 ` [PATCH mm v3 03/38] kasan, page_alloc: merge kasan_free_pages into free_pages_prepare andrey.konovalov
2021-12-13 21:51 ` andrey.konovalov [this message]
2021-12-16 12:54 ` [PATCH mm v3 04/38] kasan, page_alloc: simplify kasan_poison_pages call site Alexander Potapenko
2021-12-13 21:51 ` [PATCH mm v3 05/38] kasan, page_alloc: init memory of skipped pages on free andrey.konovalov
2021-12-13 21:51 ` [PATCH mm v3 06/38] kasan: drop skip_kasan_poison variable in free_pages_prepare andrey.konovalov
2021-12-13 21:51 ` [PATCH mm v3 07/38] mm: clarify __GFP_ZEROTAGS comment andrey.konovalov
2021-12-13 21:51 ` [PATCH mm v3 08/38] kasan: only apply __GFP_ZEROTAGS when memory is zeroed andrey.konovalov
2021-12-13 21:51 ` [PATCH mm v3 09/38] kasan, page_alloc: refactor init checks in post_alloc_hook andrey.konovalov
2021-12-16 13:32 ` Alexander Potapenko
2021-12-13 21:51 ` [PATCH mm v3 10/38] kasan, page_alloc: merge kasan_alloc_pages into post_alloc_hook andrey.konovalov
2021-12-13 21:53 ` [PATCH mm v3 11/38] kasan, page_alloc: combine tag_clear_highpage calls in post_alloc_hook andrey.konovalov
2021-12-16 13:04 ` Alexander Potapenko
2021-12-13 21:53 ` [PATCH mm v3 12/38] kasan, page_alloc: move SetPageSkipKASanPoison " andrey.konovalov
2021-12-13 21:53 ` [PATCH mm v3 13/38] kasan, page_alloc: move kernel_init_free_pages " andrey.konovalov
2021-12-16 11:00 ` Alexander Potapenko
2021-12-13 21:53 ` [PATCH mm v3 14/38] kasan, page_alloc: simplify kasan_unpoison_pages call site andrey.konovalov
2021-12-13 21:53 ` [PATCH mm v3 15/38] kasan: clean up metadata byte definitions andrey.konovalov
2021-12-16 10:52 ` Alexander Potapenko
2021-12-13 21:53 ` [PATCH mm v3 16/38] kasan: define KASAN_VMALLOC_INVALID for SW_TAGS andrey.konovalov
2021-12-13 21:53 ` [PATCH mm v3 17/38] kasan, x86, arm64, s390: rename functions for modules shadow andrey.konovalov
2021-12-13 21:53 ` [PATCH mm v3 18/38] kasan, vmalloc: drop outdated VM_KASAN comment andrey.konovalov
2021-12-16 10:53 ` Alexander Potapenko
2021-12-13 21:53 ` [PATCH mm v3 19/38] kasan: reorder vmalloc hooks andrey.konovalov
2021-12-16 10:55 ` Alexander Potapenko
2021-12-13 21:53 ` [PATCH mm v3 20/38] kasan: add wrappers for " andrey.konovalov
2021-12-13 21:53 ` [PATCH mm v3 21/38] kasan, vmalloc: reset tags in vmalloc functions andrey.konovalov
2021-12-13 21:54 ` [PATCH mm v3 22/38] kasan, fork: reset pointer tags of vmapped stacks andrey.konovalov
2021-12-13 21:54 ` [PATCH mm v3 23/38] kasan, arm64: " andrey.konovalov
2021-12-13 21:59 ` Andrey Konovalov
2021-12-14 13:25 ` Catalin Marinas
2021-12-13 21:54 ` [PATCH mm v3 24/38] kasan, vmalloc: add vmalloc tagging for SW_TAGS andrey.konovalov
2021-12-13 21:54 ` [PATCH mm v3 25/38] kasan, vmalloc, arm64: mark vmalloc mappings as pgprot_tagged andrey.konovalov
2021-12-14 17:11 ` Catalin Marinas
2021-12-14 18:27 ` Andrey Konovalov
2021-12-14 19:27 ` Catalin Marinas
2021-12-20 21:38 ` Andrey Konovalov
2021-12-13 21:54 ` [PATCH mm v3 26/38] kasan, vmalloc: don't unpoison VM_ALLOC pages before mapping andrey.konovalov
2021-12-16 19:07 ` Alexander Potapenko
2021-12-20 21:35 ` Andrey Konovalov
2021-12-13 21:54 ` [PATCH mm v3 27/38] kasan, page_alloc: allow skipping unpoisoning for HW_TAGS andrey.konovalov
2021-12-13 21:54 ` [PATCH mm v3 28/38] kasan, page_alloc: allow skipping memory init " andrey.konovalov
2021-12-14 18:00 ` Marco Elver
2021-12-14 18:28 ` Andrey Konovalov
2021-12-17 1:50 ` Kuan-Ying Lee
2021-12-20 21:35 ` Andrey Konovalov
2021-12-13 21:54 ` [PATCH mm v3 29/38] kasan, vmalloc: add vmalloc tagging " andrey.konovalov
2021-12-14 19:55 ` Marco Elver
2021-12-14 22:08 ` Andrey Konovalov
2021-12-14 21:03 ` Marco Elver
2021-12-13 21:54 ` [PATCH mm v3 30/38] kasan, vmalloc: don't tag executable vmalloc allocations andrey.konovalov
2021-12-14 19:42 ` Andrey Konovalov
2021-12-13 21:54 ` [PATCH mm v3 31/38] kasan, arm64: " andrey.konovalov
2021-12-13 21:59 ` Andrey Konovalov
2021-12-17 13:45 ` Catalin Marinas
2021-12-13 21:54 ` [PATCH mm v3 32/38] kasan: mark kasan_arg_stacktrace as __initdata andrey.konovalov
2021-12-13 21:55 ` [PATCH mm v3 33/38] kasan: simplify kasan_init_hw_tags andrey.konovalov
2021-12-13 21:55 ` [PATCH mm v3 34/38] kasan: add kasan.vmalloc command line flag andrey.konovalov
2021-12-13 21:55 ` [PATCH mm v3 35/38] kasan: allow enabling KASAN_VMALLOC and SW/HW_TAGS andrey.konovalov
2021-12-13 21:55 ` [PATCH mm v3 36/38] arm64: select KASAN_VMALLOC for SW/HW_TAGS modes andrey.konovalov
2021-12-13 21:55 ` [PATCH mm v3 37/38] kasan: documentation updates andrey.konovalov
2021-12-13 21:55 ` [PATCH mm v3 38/38] kasan: improve vmalloc tests 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=4b39d778ac71937325641c3d7a36889b37fb3242.1639432170.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).