From: Catalin Marinas <catalin.marinas@arm.com> To: Andrey Ryabinin <ryabinin.a.a@gmail.com>, Andrey Konovalov <andreyknvl@gmail.com> Cc: Will Deacon <will@kernel.org>, Vincenzo Frascino <vincenzo.frascino@arm.com>, Peter Collingbourne <pcc@google.com>, kasan-dev@googlegroups.com, linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 3/4] mm: kasan: Skip page unpoisoning only if __GFP_SKIP_KASAN_UNPOISON Date: Fri, 10 Jun 2022 16:21:40 +0100 [thread overview] Message-ID: <20220610152141.2148929-4-catalin.marinas@arm.com> (raw) In-Reply-To: <20220610152141.2148929-1-catalin.marinas@arm.com> Currently post_alloc_hook() skips the kasan unpoisoning if the tags will be zeroed (__GFP_ZEROTAGS) or __GFP_SKIP_KASAN_UNPOISON is passed. Since __GFP_ZEROTAGS is now accompanied by __GFP_SKIP_KASAN_UNPOISON, remove the extra check. Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> Cc: Andrey Ryabinin <ryabinin.a.a@gmail.com> Cc: Andrey Konovalov <andreyknvl@gmail.com> Cc: Peter Collingbourne <pcc@google.com> Cc: Vincenzo Frascino <vincenzo.frascino@arm.com> --- mm/page_alloc.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index f6ed240870bc..bf45a6aa407a 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -2361,7 +2361,7 @@ static inline bool check_new_pcp(struct page *page, unsigned int order) } #endif /* CONFIG_DEBUG_VM */ -static inline bool should_skip_kasan_unpoison(gfp_t flags, bool init_tags) +static inline bool should_skip_kasan_unpoison(gfp_t flags) { /* Don't skip if a software KASAN mode is enabled. */ if (IS_ENABLED(CONFIG_KASAN_GENERIC) || @@ -2373,12 +2373,10 @@ static inline bool should_skip_kasan_unpoison(gfp_t flags, bool init_tags) return true; /* - * With hardware tag-based KASAN enabled, skip if either: - * - * 1. Memory tags have already been cleared via tag_clear_highpage(). - * 2. Skipping has been requested via __GFP_SKIP_KASAN_UNPOISON. + * With hardware tag-based KASAN enabled, skip if this has been + * requested via __GFP_SKIP_KASAN_UNPOISON. */ - return init_tags || (flags & __GFP_SKIP_KASAN_UNPOISON); + return flags & __GFP_SKIP_KASAN_UNPOISON; } static inline bool should_skip_init(gfp_t flags) @@ -2430,7 +2428,7 @@ inline void post_alloc_hook(struct page *page, unsigned int order, /* Note that memory is already initialized by the loop above. */ init = false; } - if (!should_skip_kasan_unpoison(gfp_flags, init_tags)) { + if (!should_skip_kasan_unpoison(gfp_flags)) { /* Unpoison shadow memory or set memory tags. */ kasan_unpoison_pages(page, order, init);
WARNING: multiple messages have this Message-ID (diff)
From: Catalin Marinas <catalin.marinas@arm.com> To: Andrey Ryabinin <ryabinin.a.a@gmail.com>, Andrey Konovalov <andreyknvl@gmail.com> Cc: Will Deacon <will@kernel.org>, Vincenzo Frascino <vincenzo.frascino@arm.com>, Peter Collingbourne <pcc@google.com>, kasan-dev@googlegroups.com, linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 3/4] mm: kasan: Skip page unpoisoning only if __GFP_SKIP_KASAN_UNPOISON Date: Fri, 10 Jun 2022 16:21:40 +0100 [thread overview] Message-ID: <20220610152141.2148929-4-catalin.marinas@arm.com> (raw) In-Reply-To: <20220610152141.2148929-1-catalin.marinas@arm.com> Currently post_alloc_hook() skips the kasan unpoisoning if the tags will be zeroed (__GFP_ZEROTAGS) or __GFP_SKIP_KASAN_UNPOISON is passed. Since __GFP_ZEROTAGS is now accompanied by __GFP_SKIP_KASAN_UNPOISON, remove the extra check. Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> Cc: Andrey Ryabinin <ryabinin.a.a@gmail.com> Cc: Andrey Konovalov <andreyknvl@gmail.com> Cc: Peter Collingbourne <pcc@google.com> Cc: Vincenzo Frascino <vincenzo.frascino@arm.com> --- mm/page_alloc.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index f6ed240870bc..bf45a6aa407a 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -2361,7 +2361,7 @@ static inline bool check_new_pcp(struct page *page, unsigned int order) } #endif /* CONFIG_DEBUG_VM */ -static inline bool should_skip_kasan_unpoison(gfp_t flags, bool init_tags) +static inline bool should_skip_kasan_unpoison(gfp_t flags) { /* Don't skip if a software KASAN mode is enabled. */ if (IS_ENABLED(CONFIG_KASAN_GENERIC) || @@ -2373,12 +2373,10 @@ static inline bool should_skip_kasan_unpoison(gfp_t flags, bool init_tags) return true; /* - * With hardware tag-based KASAN enabled, skip if either: - * - * 1. Memory tags have already been cleared via tag_clear_highpage(). - * 2. Skipping has been requested via __GFP_SKIP_KASAN_UNPOISON. + * With hardware tag-based KASAN enabled, skip if this has been + * requested via __GFP_SKIP_KASAN_UNPOISON. */ - return init_tags || (flags & __GFP_SKIP_KASAN_UNPOISON); + return flags & __GFP_SKIP_KASAN_UNPOISON; } static inline bool should_skip_init(gfp_t flags) @@ -2430,7 +2428,7 @@ inline void post_alloc_hook(struct page *page, unsigned int order, /* Note that memory is already initialized by the loop above. */ init = false; } - if (!should_skip_kasan_unpoison(gfp_flags, init_tags)) { + if (!should_skip_kasan_unpoison(gfp_flags)) { /* Unpoison shadow memory or set memory tags. */ kasan_unpoison_pages(page, order, init); _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-06-10 15:21 UTC|newest] Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-06-10 15:21 [PATCH v2 0/4] kasan: Fix ordering between MTE tag colouring and page->flags Catalin Marinas 2022-06-10 15:21 ` Catalin Marinas 2022-06-10 15:21 ` [PATCH v2 1/4] mm: kasan: Ensure the tags are visible before the tag in page->flags Catalin Marinas 2022-06-10 15:21 ` Catalin Marinas 2022-06-16 8:31 ` Vincenzo Frascino 2022-06-16 8:31 ` Vincenzo Frascino 2022-07-07 9:22 ` Will Deacon 2022-07-07 9:22 ` Will Deacon 2022-07-07 11:44 ` Catalin Marinas 2022-07-07 11:44 ` Catalin Marinas 2022-06-10 15:21 ` [PATCH v2 2/4] mm: kasan: Skip unpoisoning of user pages Catalin Marinas 2022-06-10 15:21 ` Catalin Marinas 2022-06-11 19:40 ` Andrey Konovalov 2022-06-11 19:40 ` Andrey Konovalov 2022-06-16 8:42 ` Vincenzo Frascino 2022-06-16 8:42 ` Vincenzo Frascino 2022-06-16 17:40 ` Catalin Marinas 2022-06-16 17:40 ` Catalin Marinas 2022-06-10 15:21 ` Catalin Marinas [this message] 2022-06-10 15:21 ` [PATCH v2 3/4] mm: kasan: Skip page unpoisoning only if __GFP_SKIP_KASAN_UNPOISON Catalin Marinas 2022-06-11 19:40 ` Andrey Konovalov 2022-06-11 19:40 ` Andrey Konovalov 2022-06-16 8:43 ` Vincenzo Frascino 2022-06-16 8:43 ` Vincenzo Frascino 2022-06-10 15:21 ` [PATCH v2 4/4] arm64: kasan: Revert "arm64: mte: reset the page tag in page->flags" Catalin Marinas 2022-06-10 15:21 ` Catalin Marinas 2022-06-11 19:40 ` Andrey Konovalov 2022-06-11 19:40 ` Andrey Konovalov 2022-06-16 8:44 ` Vincenzo Frascino 2022-06-16 8:44 ` Vincenzo Frascino 2022-07-07 10:33 ` [PATCH v2 0/4] kasan: Fix ordering between MTE tag colouring and page->flags Will Deacon 2022-07-07 10:33 ` Will Deacon 2022-07-08 13:31 ` Will Deacon 2022-07-08 13:31 ` Will Deacon 2023-02-02 5:25 ` Kuan-Ying Lee (李冠穎) 2023-02-02 5:25 ` Kuan-Ying Lee (李冠穎) 2023-02-02 12:59 ` Andrey Konovalov 2023-02-02 12:59 ` Andrey Konovalov 2023-02-03 3:41 ` Kuan-Ying Lee (李冠穎) 2023-02-03 3:41 ` Kuan-Ying Lee (李冠穎) 2023-02-03 17:51 ` Andrey Konovalov 2023-02-03 17:51 ` Andrey Konovalov 2023-02-08 5:41 ` Qun-wei Lin (林群崴) 2023-02-08 5:41 ` Qun-wei Lin (林群崴) 2023-02-10 6:19 ` Peter Collingbourne 2023-02-10 6:19 ` Peter Collingbourne 2023-02-10 18:28 ` Catalin Marinas 2023-02-10 18:28 ` Catalin Marinas 2023-02-10 19:03 ` Peter Collingbourne 2023-02-10 19:03 ` Peter Collingbourne 2023-02-13 18:47 ` Catalin Marinas 2023-02-13 18:47 ` Catalin Marinas 2023-02-14 1:56 ` Peter Collingbourne 2023-02-14 1:56 ` Peter Collingbourne 2023-02-13 1:56 ` Qun-wei Lin (林群崴) 2023-02-13 1:56 ` Qun-wei Lin (林群崴)
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=20220610152141.2148929-4-catalin.marinas@arm.com \ --to=catalin.marinas@arm.com \ --cc=andreyknvl@gmail.com \ --cc=kasan-dev@googlegroups.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-mm@kvack.org \ --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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.