shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 19:08:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

BACKPORT: mm: kasan: Skip page unpoisoning only if __GFP_SKIP_KASAN_UNPOISON

Browse Source 
(Backport: no conflicts, neighboring lines changed.)

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>
Reviewed-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
Reviewed-by: Andrey Konovalov <andreyknvl@gmail.com>
Link: https://lore.kernel.org/r/20220610152141.2148929-4-catalin.marinas@arm.com
Signed-off-by: Will Deacon <will@kernel.org>
Bug: 254721825
(cherry picked from commit 6d05141a39)
Change-Id: I0ee8a256f0e39e24c5572fca057ee355a7a273d3
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
This commit is contained in:
Catalin Marinas
2022-06-10 16:21:40 +01:00
committed by Todd Kjos
parent 59ee45bb11
commit 9f3841f265
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mm/page_alloc.c
View File

@@ -2403,7 +2403,7 @@ static bool check_new_pages(struct page *page, unsigned int order)
return false;
}
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) ||
@@ -2415,12 +2415,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)
@@ -2472,7 +2470,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);