From: Mel Gorman <mgorman@techsingularity.net>
To: Chuck Lever III <chuck.lever@oracle.com>
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 2/4] mm/page_alloc: correct return value when failing at preparing
Date: Tue, 13 Jul 2021 16:21:31 +0100 [thread overview]
Message-ID: <20210713152131.GH3809@techsingularity.net> (raw)
In-Reply-To: <38D7DF36-4425-4D8B-9091-CE49CE046D6A@oracle.com>
On Tue, Jul 13, 2021 at 03:01:24PM +0000, Chuck Lever III wrote:
>
>
> > On Jul 13, 2021, at 10:56 AM, Mel Gorman <mgorman@techsingularity.net> wrote:
> >
> > On Tue, Jul 13, 2021 at 02:21:58PM +0000, Chuck Lever III wrote:
> >>
> >>
> >>> On Jul 13, 2021, at 9:56 AM, Mel Gorman <mgorman@techsingularity.net> wrote:
> >>>
> >>> From: Yanfei Xu <yanfei.xu@windriver.com>
> >>>
> >>> If the array passed in is already partially populated, we should
> >>> return "nr_populated" even failing at preparing arguments stage.
> >>>
> >>> Signed-off-by: Yanfei Xu <yanfei.xu@windriver.com>
> >>> Signed-off-by: Mel Gorman <mgorman@techsingularity.net>
> >>> Link: https://lore.kernel.org/r/20210709102855.55058-1-yanfei.xu@windriver.com
> >>> ---
> >>> 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 6ef86f338151..803414ce9264 100644
> >>> --- a/mm/page_alloc.c
> >>> +++ b/mm/page_alloc.c
> >>> @@ -5255,7 +5255,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 0;
> >>> + return nr_populated;
> >>
> >> Can you restore the hunk in patch 3/4 that changes this "return nr_populated;"
> >> to "goto out;" ?
> >>
> >
> > I fixed that up in the series I sent out. I applied this patch first
> > then reconciled the collision with your patch.
>
> 3/4 still needs to change this "return nr_populated;" to "goto out;"
> as part of the clean up.
>
Sorry, I had that in my git tree but didn't refresh the broken-out
series properly before sending. I've sent a v2.
--
Mel Gorman
SUSE Labs
next prev parent reply other threads:[~2021-07-13 15:21 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
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 1/4] mm/page_alloc: Avoid page allocator recursion with pagesets.lock held Mel Gorman
2021-07-13 13:56 ` [PATCH 2/4] mm/page_alloc: correct return value when failing at preparing Mel Gorman
2021-07-13 14:21 ` Chuck Lever III
2021-07-13 14:56 ` Mel Gorman
2021-07-13 15:01 ` Chuck Lever III
2021-07-13 15:21 ` Mel Gorman [this message]
2021-07-13 13:56 ` [PATCH 3/4] mm/page_alloc: Further fix __alloc_pages_bulk() return value Mel Gorman
2021-07-13 13:56 ` [PATCH 4/4] Revert "mm/page_alloc: make should_fail_alloc_page() static" Mel Gorman
2021-07-15 6:34 ` Christoph Hellwig
2021-07-15 7:36 ` Mel Gorman
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 2/4] mm/page_alloc: correct return value when failing at preparing 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=20210713152131.GH3809@techsingularity.net \
--to=mgorman@techsingularity.net \
--cc=Qiang.Zhang@windriver.com \
--cc=akpm@linux-foundation.org \
--cc=brouer@redhat.com \
--cc=chuck.lever@oracle.com \
--cc=desmondcheongzx@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mcroce@microsoft.com \
--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).