The patch titled
Subject: mm, kasan: fix for "integrate page_alloc init with HW_TAGS"
has been removed from the -mm tree. Its filename was
kasan-mm-integrate-page_alloc-init-with-hw_tags-fix.patch
This patch was dropped because it was folded into kasan-mm-integrate-page_alloc-init-with-hw_tags.patch
------------------------------------------------------
From: Andrey Konovalov <andreyknvl@xxxxxxxxxx>
Subject: mm, kasan: fix for "integrate page_alloc init with HW_TAGS"
My commit "integrate page_alloc init with HW_TAGS" changed the order of
kernel_unpoison_pages() and kernel_init_free_pages() calls. This leads to
complaints from the page unpoisoning code, as the poison pattern gets
overwritten for __GFP_ZERO allocations.
Fix by restoring the initial order. Also add a warning comment.
Link: https://lkml.kernel.org/r/65b6028dea2e9a6e8e2cb779b5115c09457363fc.1617122211.git.andreyknvl@xxxxxxxxxx
Signed-off-by: Andrey Konovalov <andreyknvl@xxxxxxxxxx>
Reported-by: Vlastimil Babka <vbabka@xxxxxxx>
Reported-by: Sergei Trofimovich <slyfox@xxxxxxxxxx>
Tested-by: Vlastimil Babka <vbabka@xxxxxxx>
Reviewed-by: Sergei Trofimovich <slyfox@xxxxxxxxxx>
Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/page_alloc.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
--- a/mm/page_alloc.c~kasan-mm-integrate-page_alloc-init-with-hw_tags-fix
+++ a/mm/page_alloc.c
@@ -2331,6 +2331,13 @@ inline void post_alloc_hook(struct page
debug_pagealloc_map_pages(page, 1 << order);
/*
+ * Page unpoisoning must happen before memory initialization.
+ * Otherwise, the poison pattern will be overwritten for __GFP_ZERO
+ * allocations and the page unpoisoning code will complain.
+ */
+ kernel_unpoison_pages(page, 1 << order);
+
+ /*
* As memory initialization might be integrated into KASAN,
* kasan_alloc_pages and kernel_init_free_pages must be
* kept together to avoid discrepancies in behavior.
@@ -2340,7 +2347,6 @@ inline void post_alloc_hook(struct page
if (init && !kasan_has_integrated_init())
kernel_init_free_pages(page, 1 << order);
- kernel_unpoison_pages(page, 1 << order);
set_page_owner(page, order, gfp_flags);
}
_
Patches currently in -mm which might be from andreyknvl@xxxxxxxxxx are
kasan-initialize-shadow-to-tag_invalid-for-sw_tags.patch
mm-kasan-dont-poison-boot-memory-with-tag-based-modes.patch
arm64-kasan-allow-to-init-memory-when-setting-tags.patch
kasan-init-memory-in-kasan_unpoison-for-hw_tags.patch
kasan-mm-integrate-page_alloc-init-with-hw_tags.patch
kasan-mm-integrate-slab-init_on_alloc-with-hw_tags.patch
kasan-mm-integrate-slab-init_on_free-with-hw_tags.patch
kasan-docs-clean-up-sections.patch
kasan-docs-update-overview-section.patch
kasan-docs-update-usage-section.patch
kasan-docs-update-error-reports-section.patch
kasan-docs-update-boot-parameters-section.patch
kasan-docs-update-generic-implementation-details-section.patch
kasan-docs-update-sw_tags-implementation-details-section.patch
kasan-docs-update-hw_tags-implementation-details-section.patch
kasan-docs-update-shadow-memory-section.patch
kasan-docs-update-ignoring-accesses-section.patch
kasan-docs-update-tests-section.patch
kasan-detect-false-positives-in-tests.patch
