mm: accept memory in __alloc_pages_bulk()

Currently, the kernel only accepts memory in get_page_from_freelist(), but
there is another path that directly takes pages from free lists -
__alloc_page_bulk().  This function can consume all accepted memory and
will resort to __alloc_pages_noprof() if necessary.

Conditionally accepted in __alloc_pages_bulk().

The same issue may arise due to deferred page initialization.  Kick the
deferred initialization machinery before abandoning the zone, as the
kernel does in get_page_from_freelist().

Link: https://lkml.kernel.org/r/20240809114854.3745464-4-kirill.shutemov@linux.intel.com
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: David Hildenbrand <david@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Mike Rapoport (Microsoft) <rppt@kernel.org>
Cc: Tom Lendacky <thomas.lendacky@amd.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 6fdef9a3e516c1b72127d54cc0c12505a394e095..32209083d8a70d0c95fcc38082ff0b4374a4ab56 100644 (file)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -4577,12 +4577,23 @@ unsigned long alloc_pages_bulk_noprof(gfp_t gfp, int preferred_nid,
                        goto failed;
                }
 
+               cond_accept_memory(zone, 0);
+retry_this_zone:
                mark = wmark_pages(zone, alloc_flags & ALLOC_WMARK_MASK) + nr_pages;
                if (zone_watermark_fast(zone, 0,  mark,
                                zonelist_zone_idx(ac.preferred_zoneref),
                                alloc_flags, gfp)) {
                        break;
                }
+
+               if (cond_accept_memory(zone, 0))
+                       goto retry_this_zone;
+
+               /* Try again if zone has deferred pages */
+               if (deferred_pages_enabled()) {
+                       if (_deferred_grow_zone(zone, 0))
+                               goto retry_this_zone;
+               }
        }
 
        /*