mm: page_alloc: fix up block types when merging compatible blocks

The buddy allocator coalesces compatible blocks during freeing, but it
doesn't update the types of the subblocks to match.  When an allocation
later breaks the chunk down again, its pieces will be put on freelists of
the wrong type.  This encourages incompatible page mixing (ask for one
type, get another), and thus long-term fragmentation.

Update the subblocks when merging a larger chunk, such that a later
expand() will maintain freelist type hygiene.

Link: https://lkml.kernel.org/r/20240320180429.678181-4-hannes@cmpxchg.org
Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
Reviewed-by: Zi Yan <ziy@nvidia.com>
Reviewed-by: Vlastimil Babka <vbabka@suse.cz>
Acked-by: Mel Gorman <mgorman@techsingularity.net>
Tested-by: "Huang, Ying" <ying.huang@intel.com>
Tested-by: Baolin Wang <baolin.wang@linux.alibaba.com>
Cc: David Hildenbrand <david@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 5fa3d534df2f94b662d6510ea3c98651cf1e64df..2c03336def76f0b143687e96bf0180909ac55d20 100644 (file)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -786,10 +786,17 @@ static inline void __free_one_page(struct page *page,
                         */
                        int buddy_mt = get_pfnblock_migratetype(buddy, buddy_pfn);
 
-                       if (migratetype != buddy_mt
-                                       && (!migratetype_is_mergeable(migratetype) ||
-                                               !migratetype_is_mergeable(buddy_mt)))
-                               goto done_merging;
+                       if (migratetype != buddy_mt) {
+                               if (!migratetype_is_mergeable(migratetype) ||
+                                   !migratetype_is_mergeable(buddy_mt))
+                                       goto done_merging;
+                               /*
+                                * Match buddy type. This ensures that
+                                * an expand() down the line puts the
+                                * sub-blocks on the right freelists.
+                                */
+                               set_pageblock_migratetype(buddy, migratetype);
+                       }
                }
 
                /*