From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9EDFDC11F66 for ; Tue, 13 Jul 2021 14:56:28 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 3782861289 for ; Tue, 13 Jul 2021 14:56:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3782861289 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=techsingularity.net Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 55E7C6B008C; Tue, 13 Jul 2021 10:56:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 50E4E6B0095; Tue, 13 Jul 2021 10:56:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3D6E86B0096; Tue, 13 Jul 2021 10:56:28 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0155.hostedemail.com [216.40.44.155]) by kanga.kvack.org (Postfix) with ESMTP id 1B1656B008C for ; Tue, 13 Jul 2021 10:56:28 -0400 (EDT) Received: from smtpin27.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 06F561854C29D for ; Tue, 13 Jul 2021 14:56:27 +0000 (UTC) X-FDA: 78357865614.27.D658E64 Received: from outbound-smtp56.blacknight.com (outbound-smtp56.blacknight.com [46.22.136.240]) by imf26.hostedemail.com (Postfix) with ESMTP id 7ABB220019E7 for ; Tue, 13 Jul 2021 14:56:26 +0000 (UTC) Received: from mail.blacknight.com (pemlinmail04.blacknight.ie [81.17.254.17]) by outbound-smtp56.blacknight.com (Postfix) with ESMTPS id 02D09FAE4F for ; Tue, 13 Jul 2021 15:56:25 +0100 (IST) Received: (qmail 18292 invoked from network); 13 Jul 2021 14:56:24 -0000 Received: from unknown (HELO techsingularity.net) (mgorman@techsingularity.net@[84.203.17.255]) by 81.17.254.9 with ESMTPSA (AES256-SHA encrypted, authenticated); 13 Jul 2021 14:56:24 -0000 Date: Tue, 13 Jul 2021 15:56:23 +0100 From: Mel Gorman To: Chuck Lever III Cc: Andrew Morton , Desmond Cheong Zhi Xi , Zhang Qiang , Yanfei Xu , Jesper Dangaard Brouer , Matteo Croce , Linux-MM , LKML Subject: Re: [PATCH 2/4] mm/page_alloc: correct return value when failing at preparing Message-ID: <20210713145623.GE3809@techsingularity.net> References: <20210713135625.7615-1-mgorman@techsingularity.net> <20210713135625.7615-3-mgorman@techsingularity.net> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) Authentication-Results: imf26.hostedemail.com; dkim=none; spf=pass (imf26.hostedemail.com: domain of mgorman@techsingularity.net designates 46.22.136.240 as permitted sender) smtp.mailfrom=mgorman@techsingularity.net; dmarc=none X-Rspamd-Server: rspam05 X-Stat-Signature: ihufjkjm897rhab4kib3oacrgff7qddz X-Rspamd-Queue-Id: 7ABB220019E7 X-HE-Tag: 1626188186-819981 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Tue, Jul 13, 2021 at 02:21:58PM +0000, Chuck Lever III wrote: > > > > On Jul 13, 2021, at 9:56 AM, Mel Gorman wrote: > > > > From: Yanfei Xu > > > > 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 > > Signed-off-by: Mel Gorman > > 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. -- Mel Gorman SUSE Labs