Commit 6d05141a authored by Catalin Marinas's avatar Catalin Marinas Committed by Will Deacon

mm: kasan: Skip page unpoisoning only if __GFP_SKIP_KASAN_UNPOISON

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: default avatarCatalin 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>
Reviewed-by: default avatarVincenzo Frascino <vincenzo.frascino@arm.com>
Reviewed-by: default avatarAndrey Konovalov <andreyknvl@gmail.com>
Link: https://lore.kernel.org/r/20220610152141.2148929-4-catalin.marinas@arm.comSigned-off-by: default avatarWill Deacon <will@kernel.org>
parent 70c248ac
...@@ -2361,7 +2361,7 @@ static inline bool check_new_pcp(struct page *page, unsigned int order) ...@@ -2361,7 +2361,7 @@ static inline bool check_new_pcp(struct page *page, unsigned int order)
} }
#endif /* CONFIG_DEBUG_VM */ #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. */ /* Don't skip if a software KASAN mode is enabled. */
if (IS_ENABLED(CONFIG_KASAN_GENERIC) || if (IS_ENABLED(CONFIG_KASAN_GENERIC) ||
...@@ -2373,12 +2373,10 @@ static inline bool should_skip_kasan_unpoison(gfp_t flags, bool init_tags) ...@@ -2373,12 +2373,10 @@ static inline bool should_skip_kasan_unpoison(gfp_t flags, bool init_tags)
return true; return true;
/* /*
* With hardware tag-based KASAN enabled, skip if either: * With hardware tag-based KASAN enabled, skip if this has been
* * requested via __GFP_SKIP_KASAN_UNPOISON.
* 1. Memory tags have already been cleared via tag_clear_highpage().
* 2. Skipping 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) static inline bool should_skip_init(gfp_t flags)
...@@ -2430,7 +2428,7 @@ inline void post_alloc_hook(struct page *page, unsigned int order, ...@@ -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. */ /* Note that memory is already initialized by the loop above. */
init = false; 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. */ /* Unpoison shadow memory or set memory tags. */
kasan_unpoison_pages(page, order, init); kasan_unpoison_pages(page, order, init);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment