LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Chuck Lever III <chuck.lever@oracle.com>
To: Mel Gorman <mgorman@techsingularity.net>
Cc: Andrew Morton <akpm@linux-foundation.org>,
	Desmond Cheong Zhi Xi <desmondcheongzx@gmail.com>,
	Zhang Qiang <Qiang.Zhang@windriver.com>,
	Yanfei Xu <yanfei.xu@windriver.com>,
	Jesper Dangaard Brouer <brouer@redhat.com>,
	Matteo Croce <mcroce@microsoft.com>,
	Linux-MM <linux-mm@kvack.org>,
	LKML <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 3/4] mm/page_alloc: Further fix __alloc_pages_bulk() return value
Date: Tue, 13 Jul 2021 15:34:38 +0000	[thread overview]
Message-ID: <CBDA966F-616F-4411-BCA3-F497ED79DE34@oracle.com> (raw)
In-Reply-To: <20210713152100.10381-4-mgorman@techsingularity.net>



> On Jul 13, 2021, at 11:20 AM, Mel Gorman <mgorman@techsingularity.net> wrote:
> 
> From: Chuck Lever <chuck.lever@oracle.com>
> 
> The author of commit b3b64ebd3822 ("mm/page_alloc: do bulk array
> bounds check after checking populated elements") was possibly
> confused by the mixture of return values throughout the function.
> 
> The API contract is clear that the function "Returns the number of
> pages on the list or array." It does not list zero as a unique
> return value with a special meaning. Therefore zero is a plausible
> return value only if @nr_pages is zero or less.
> 
> Clean up the return logic to make it clear that the returned value
> is always the total number of pages in the array/list, not the
> number of pages that were allocated during this call.
> 
> The only change in behavior with this patch is the value returned
> if prepare_alloc_pages() fails. To match the API contract, the
> number of pages currently in the array/list is returned in this
> case.
> 
> The call site in __page_pool_alloc_pages_slow() also seems to be
> confused on this matter. It should be attended to by someone who
> is familiar with that code.
> 
> [mel@techsingularity.net: Return nr_populated if 0 pages are requested]
> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
> Acked-by: Jesper Dangaard Brouer <brouer@redhat.com>
> Signed-off-by: Mel Gorman <mgorman@techsingularity.net>
> ---
> mm/page_alloc.c | 14 ++++++++------
> 1 file changed, 8 insertions(+), 6 deletions(-)
> 
> diff --git a/mm/page_alloc.c b/mm/page_alloc.c
> index 803414ce9264..c66f1e6204c2 100644
> --- a/mm/page_alloc.c
> +++ b/mm/page_alloc.c
> @@ -5221,9 +5221,6 @@ unsigned long __alloc_pages_bulk(gfp_t gfp, int preferred_nid,
> 	unsigned int alloc_flags = ALLOC_WMARK_LOW;
> 	int nr_populated = 0, nr_account = 0;
> 
> -	if (unlikely(nr_pages <= 0))
> -		return 0;
> -
> 	/*
> 	 * Skip populated array elements to determine if any pages need
> 	 * to be allocated before disabling IRQs.
> @@ -5231,9 +5228,13 @@ unsigned long __alloc_pages_bulk(gfp_t gfp, int preferred_nid,
> 	while (page_array && nr_populated < nr_pages && page_array[nr_populated])
> 		nr_populated++;
> 
> +	/* No pages requested? */
> +	if (unlikely(nr_pages <= 0))
> +		goto out;
> +
> 	/* Already populated array? */
> 	if (unlikely(page_array && nr_pages - nr_populated == 0))
> -		return nr_populated;
> +		goto out;
> 
> 	/* Use the single page allocator for one page. */
> 	if (nr_pages - nr_populated == 1)
> @@ -5255,7 +5256,7 @@ unsigned long __alloc_pages_bulk(gfp_t gfp, int preferred_nid,
> 	gfp &= gfp_allowed_mask;
> 	alloc_gfp = gfp;
> 	if (!prepare_alloc_pages(gfp, 0, preferred_nid, nodemask, &ac, &alloc_gfp, &alloc_flags))
> -		return nr_populated;
> +		goto out;

:thumbsup:  Thanks!


> 	gfp = alloc_gfp;
> 
> 	/* Find an allowed local zone that meets the low watermark. */
> @@ -5323,6 +5324,7 @@ unsigned long __alloc_pages_bulk(gfp_t gfp, int preferred_nid,
> 	__count_zid_vm_events(PGALLOC, zone_idx(zone), nr_account);
> 	zone_statistics(ac.preferred_zoneref->zone, zone, nr_account);
> 
> +out:
> 	return nr_populated;
> 
> failed_irq:
> @@ -5338,7 +5340,7 @@ unsigned long __alloc_pages_bulk(gfp_t gfp, int preferred_nid,
> 		nr_populated++;
> 	}
> 
> -	return nr_populated;
> +	goto out;
> }
> EXPORT_SYMBOL_GPL(__alloc_pages_bulk);
> 
> -- 
> 2.26.2
> 

--
Chuck Lever




  reply	other threads:[~2021-07-13 15:34 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-13 15:20 [PATCH 0/4 v2] 5.14-rc1 mm/page_alloc.c stray patches Mel Gorman
2021-07-13 15:20 ` [PATCH 1/4] mm/page_alloc: Avoid page allocator recursion with pagesets.lock held Mel Gorman
2021-07-13 15:20 ` [PATCH 2/4] mm/page_alloc: correct return value when failing at preparing Mel Gorman
2021-07-13 15:20 ` [PATCH 3/4] mm/page_alloc: Further fix __alloc_pages_bulk() return value Mel Gorman
2021-07-13 15:34   ` Chuck Lever III [this message]
2021-07-13 15:21 ` [PATCH 4/4] Revert "mm/page_alloc: make should_fail_alloc_page() static" Mel Gorman
2021-07-14  7:06   ` John Hubbard
2021-07-15  8:35     ` Jesper Dangaard Brouer
2021-07-16  0:04       ` John Hubbard
2021-07-16  6:04         ` John Hubbard
  -- strict thread matches above, loose matches on Subject: below --
2021-07-13 13:56 [PATCH 0/4] 5.14-rc1 mm/page_alloc.c stray patches Mel Gorman
2021-07-13 13:56 ` [PATCH 3/4] mm/page_alloc: Further fix __alloc_pages_bulk() return value Mel Gorman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CBDA966F-616F-4411-BCA3-F497ED79DE34@oracle.com \
    --to=chuck.lever@oracle.com \
    --cc=Qiang.Zhang@windriver.com \
    --cc=akpm@linux-foundation.org \
    --cc=brouer@redhat.com \
    --cc=desmondcheongzx@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=mcroce@microsoft.com \
    --cc=mgorman@techsingularity.net \
    --cc=yanfei.xu@windriver.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).