kasan, page_alloc: merge kasan_free_pages into free_pages_prepare

Currently, the code responsible for initializing and poisoning memory in
free_pages_prepare() is scattered across two locations: kasan_free_pages()
for HW_TAGS KASAN and free_pages_prepare() itself.  This is confusing.

This and a few following patches combine the code from these two
locations.  Along the way, these patches also simplify the performed
checks to make them easier to follow.

Replaces the only caller of kasan_free_pages() with its implementation.

As kasan_has_integrated_init() is only true when CONFIG_KASAN_HW_TAGS is
enabled, moving the code does no functional changes.

This patch is not useful by itself but makes the simplifications in the
following patches easier to follow.

Link: https://lkml.kernel.org/r/303498d15840bb71905852955c6e2390ecc87139.1643047180.git.andreyknvl@google.com
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
Reviewed-by: Alexander Potapenko <glider@google.com>
Acked-by: Marco Elver <elver@google.com>
Cc: Andrey Ryabinin <ryabinin.a.a@gmail.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Evgenii Stepanov <eugenis@google.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Peter Collingbourne <pcc@google.com>
Cc: Vincenzo Frascino <vincenzo.frascino@arm.com>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/include/linux/kasan.h b/include/linux/kasan.h
index b6a9326..dd2161a 100644 (file)
--- a/include/linux/kasan.h
+++ b/include/linux/kasan.h
@@ -85,7 +85,6 @@ static inline void kasan_disable_current(void) {}
 #ifdef CONFIG_KASAN_HW_TAGS
 
 void kasan_alloc_pages(struct page *page, unsigned int order, gfp_t flags);
-void kasan_free_pages(struct page *page, unsigned int order);
 
 #else /* CONFIG_KASAN_HW_TAGS */
 
@@ -96,13 +95,6 @@ static __always_inline void kasan_alloc_pages(struct page *page,
        BUILD_BUG();
 }
 
-static __always_inline void kasan_free_pages(struct page *page,
-                                            unsigned int order)
-{
-       /* Only available for integrated init. */
-       BUILD_BUG();
-}
-
 #endif /* CONFIG_KASAN_HW_TAGS */
 
 static inline bool kasan_has_integrated_init(void)

diff --git a/mm/kasan/common.c b/mm/kasan/common.c
index 9219656..a0082fa 100644 (file)
--- a/mm/kasan/common.c
+++ b/mm/kasan/common.c
@@ -387,7 +387,7 @@ static inline bool ____kasan_kfree_large(void *ptr, unsigned long ip)
        }
 
        /*
-        * The object will be poisoned by kasan_free_pages() or
+        * The object will be poisoned by kasan_poison_pages() or
         * kasan_slab_free_mempool().
         */
 

diff --git a/mm/kasan/hw_tags.c b/mm/kasan/hw_tags.c
index 7355cb5..0b8225a 100644 (file)
--- a/mm/kasan/hw_tags.c
+++ b/mm/kasan/hw_tags.c
@@ -213,17 +213,6 @@ void kasan_alloc_pages(struct page *page, unsigned int order, gfp_t flags)
        }
 }
 
-void kasan_free_pages(struct page *page, unsigned int order)
-{
-       /*
-        * This condition should match the one in free_pages_prepare() in
-        * page_alloc.c.
-        */
-       bool init = want_init_on_free();
-
-       kasan_poison_pages(page, order, init);
-}
-
 #if IS_ENABLED(CONFIG_KASAN_KUNIT_TEST)
 
 void kasan_enable_tagging_sync(void)

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 0721ff0..d16df44 100644 (file)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -1364,15 +1364,17 @@ static __always_inline bool free_pages_prepare(struct page *page,
 
        /*
         * As memory initialization might be integrated into KASAN,
-        * kasan_free_pages and kernel_init_free_pages must be
+        * KASAN poisoning and memory initialization code must be
         * kept together to avoid discrepancies in behavior.
         *
         * 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_free_pages(page, order);
+                       kasan_poison_pages(page, order, init);
        } else {
                bool init = want_init_on_free();