Commit 29a39809 authored by Kirill A. Shutemov's avatar Kirill A. Shutemov Committed by Wen Zhiwei
Browse files

mm: fix endless reclaim on machines with unaccepted memory 

stable inclusion
from stable-v6.6.48
commit b77471c6760a22dcfd72a3528f9a8a19d786c7cb
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAWEBV

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=b77471c6760a22dcfd72a3528f9a8a19d786c7cb

--------------------------------

[ Upstream commit 807174a93d24c456503692dc3f5af322ee0b640a ]

Unaccepted memory is considered unusable free memory, which is not counted
as free on the zone watermark check.  This causes get_page_from_freelist()
to accept more memory to hit the high watermark, but it creates problems
in the reclaim path.

The reclaim path encounters a failed zone watermark check and attempts to
reclaim memory.  This is usually successful, but if there is little or no
reclaimable memory, it can result in endless reclaim with little to no
progress.  This can occur early in the boot process, just after start of
the init process when the only reclaimable memory is the page cache of the
init executable and its libraries.

Make unaccepted memory free from watermark check point of view.  This way
unaccepted memory will never be the trigger of memory reclaim.  Accept
more memory in the get_page_from_freelist() if needed.

Link: https://lkml.kernel.org/r/20240809114854.3745464-2-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>
Reported-by: default avatarJianxiong Gao <jxgao@google.com>
Acked-by: default avatarDavid Hildenbrand <david@redhat.com>
Tested-by: default avatarJianxiong Gao <jxgao@google.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
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>
Cc: <stable@vger.kernel.org>	[6.5+]
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Conflicts:
 mm/page_alloc.c
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent 76e29fd0

mm/page_alloc.c

+20 −22
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ EXPORT_SYMBOL(nr_online_nodes); 


static bool page_contains_unaccepted(struct page *page, unsigned int order);

static void accept_page(struct page *page, unsigned int order);

static bool try_to_accept_memory(struct zone *zone, unsigned int order);

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

static inline bool has_unaccepted_memory(void);

static bool __free_unaccepted(struct page *page);
@@ -2983,9 +2983,6 @@ static inline long __zone_watermark_unusable_free(struct zone *z, 
	if (!(alloc_flags & ALLOC_CMA))

		unusable_free += zone_page_state(z, NR_FREE_CMA_PAGES);

#endif

#ifdef CONFIG_UNACCEPTED_MEMORY

	unusable_free += zone_page_state(z, NR_UNACCEPTED);

#endif



	return unusable_free;

}
@@ -3283,6 +3280,8 @@ get_page_from_freelist(gfp_t gfp_mask, unsigned int order, int alloc_flags, 
			}

		}



		cond_accept_memory(zone, order);



		/*

		 * Detect whether the number of free pages is below high

		 * watermark.  If so, we will decrease pcp->high and free
@@ -3308,10 +3307,8 @@ get_page_from_freelist(gfp_t gfp_mask, unsigned int order, int alloc_flags, 
				       gfp_mask)) {

			int ret;



			if (has_unaccepted_memory()) {

				if (try_to_accept_memory(zone, order))

			if (cond_accept_memory(zone, order))

				goto try_this_zone;

			}



#ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT

			/*
@@ -3365,10 +3362,8 @@ get_page_from_freelist(gfp_t gfp_mask, unsigned int order, int alloc_flags, 


			return page;

		} else {

			if (has_unaccepted_memory()) {

				if (try_to_accept_memory(zone, order))

			if (cond_accept_memory(zone, order))

				goto try_this_zone;

			}



#ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT

			/* Try again if zone has deferred pages */
@@ -7084,9 +7079,6 @@ static bool try_to_accept_memory_one(struct zone *zone) 
	struct page *page;

	bool last;



	if (list_empty(&zone->unaccepted_pages))

		return false;



	spin_lock_irqsave(&zone->lock, flags);

	page = list_first_entry_or_null(&zone->unaccepted_pages,

					struct page, lru);
@@ -7112,23 +7104,29 @@ static bool try_to_accept_memory_one(struct zone *zone) 
	return true;

}



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

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

{

	long to_accept;

	int ret = false;

	bool ret = false;



	if (!has_unaccepted_memory())

		return false;



	if (list_empty(&zone->unaccepted_pages))

		return false;



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

	to_accept = high_wmark_pages(zone) -

		    (zone_page_state(zone, NR_FREE_PAGES) -

		    __zone_watermark_unusable_free(zone, order, 0));

		    __zone_watermark_unusable_free(zone, order, 0) -

		    zone_page_state(zone, NR_UNACCEPTED));



	/* Accept at least one page */

	do {

	while (to_accept > 0) {

		if (!try_to_accept_memory_one(zone))

			break;

		ret = true;

		to_accept -= MAX_ORDER_NR_PAGES;

	} while (to_accept > 0);

	}



	return ret;

}
@@ -7171,7 +7169,7 @@ static void accept_page(struct page *page, unsigned int order) 
{

}



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

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

{

	return false;

}