[PATCH] mm/page_alloc: Correct return value of populated elements if bulk array is populated

* [PATCH] mm/page_alloc: Correct return value of populated elements if bulk array is populated
@ 2021-06-28 15:02 Mel Gorman
  2021-06-29 16:59   ` Geert Uytterhoeven
  0 siblings, 1 reply; 3+ messages in thread
From: Mel Gorman @ 2021-06-28 15:02 UTC (permalink / raw)
  To: Andrew Morton
  Cc: Dave Jones, Dan Carpenter, Jesper Dangaard Brouer,
	Vlastimil Babka, Linux-MM, LKML, Linus Torvalds

Dave Jones reported the following

	This made it into 5.13 final, and completely breaks NFSD for me
	(Serving tcp v3 mounts).  Existing mounts on clients hang, as do
	new mounts from new clients.  Rebooting the server back to rc7
	everything recovers.

The commit b3b64ebd3822 ("mm/page_alloc: do bulk array bounds check after
checking populated elements") returns the wrong value if the array is
already populated which is interpreted as an allocation failure. Dave
reported this fixes his problem and it also passed a test running dbench
over NFS.

Fixes: b3b64ebd3822 ("mm/page_alloc: do bulk array bounds check after checking populated elements")
Reported-and-tested-by: Dave Jones <davej@codemonkey.org.uk>
Signed-off-by: Mel Gorman <mgorman@techsingularity.net>
Cc: <stable@vger.kernel.org> [5.13+]
---
 mm/page_alloc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index ef2265f86b91..04220581579c 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -5058,7 +5058,7 @@ unsigned long __alloc_pages_bulk(gfp_t gfp, int preferred_nid,
 
 	/* Already populated array? */
 	if (unlikely(page_array && nr_pages - nr_populated == 0))
-		return 0;
+		return nr_populated;
 
 	/* Use the single page allocator for one page. */
 	if (nr_pages - nr_populated == 1)

^ permalink raw reply related	[flat|nested] 3+ messages in thread