Commit 800f1059 authored by Kiryl Shutsemau's avatar Kiryl Shutsemau Committed by Andrew Morton
Browse files

mm/page_alloc: fix memory accept before watermarks gets initialized 

Watermarks are initialized during the postcore initcall.  Until then, all
watermarks are set to zero.  This causes cond_accept_memory() to
incorrectly skip memory acceptance because a watermark of 0 is always met.

This can lead to a premature OOM on boot.

To ensure progress, accept one MAX_ORDER page if the watermark is zero.

Link: https://lkml.kernel.org/r/20250310082855.2587122-1-kirill.shutemov@linux.intel.com


Fixes: dcdfdd40 ("mm: Add support for unaccepted memory")
Signed-off-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Tested-by: default avatarFarrah Chen <farrah.chen@intel.com>
Reported-by: default avatarFarrah Chen <farrah.chen@intel.com>
Acked-by: default avatarVlastimil Babka <vbabka@suse.cz>
Reviewed-by: default avatarPankaj Gupta <pankaj.gupta@amd.com>
Cc: Ashish Kalra <ashish.kalra@amd.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: "Edgecombe, Rick P" <rick.p.edgecombe@intel.com>
Cc: Mel Gorman <mgorman@techsingularity.net>
Cc: "Mike Rapoport (IBM)" <rppt@kernel.org>
Cc: Thomas Lendacky <thomas.lendacky@amd.com>
Cc: <stable@vger.kernel.org>	[6.5+]
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent b9c0e49a

mm/page_alloc.c

+12 −2
Original line number Diff line number Diff line
@@ -7004,7 +7004,7 @@ static inline bool has_unaccepted_memory(void) 


static bool cond_accept_memory(struct zone *zone, unsigned int order)

{

	long to_accept;

	long to_accept, wmark;

	bool ret = false;



	if (!has_unaccepted_memory())
@@ -7013,8 +7013,18 @@ static bool cond_accept_memory(struct zone *zone, unsigned int order) 
	if (list_empty(&zone->unaccepted_pages))

		return false;



	wmark = promo_wmark_pages(zone);



	/*

	 * Watermarks have not been initialized yet.

	 *

	 * Accepting one MAX_ORDER page to ensure progress.

	 */

	if (!wmark)

		return try_to_accept_memory_one(zone);



	/* How much to accept to get to promo watermark? */

	to_accept = promo_wmark_pages(zone) -

	to_accept = wmark -

		    (zone_page_state(zone, NR_FREE_PAGES) -

		    __zone_watermark_unusable_free(zone, order, 0) -

		    zone_page_state(zone, NR_UNACCEPTED));