Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp3967412pxv; Tue, 13 Jul 2021 07:57:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw8+J3z/BzwNQpZ/dccmapbK+GraeG8dTagkoqm6FRngzZV1pDJRmsDr8nM5k0P64RQSvWc X-Received: by 2002:a92:d5cb:: with SMTP id d11mr3092398ilq.133.1626188241093; Tue, 13 Jul 2021 07:57:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626188241; cv=none; d=google.com; s=arc-20160816; b=Odv2Dh7QuNz4//v34Vk4HGGVC2dwzMo0cKq21H3ROQSVgIB/w2METhsgTeE+rjLbuJ gWeRI62EHSzA4NO26CwkW4i8yBSFZZVb78kB3iqR18zk4iqc4FYN6jImpBSs15LW3JeS iau2JJGEFEUYLWq+8M3wnfqGYmR98nmubJwntjODETyL7GRyxMo8YXNj51pEkYop2iQJ f1K25xeA9zASc5YUtzwlO966j+d0l7cOzUPXR78DVwj3i5CEI5envhKcmcaOXIfc5ujc c/j9m+YlchZRbQ8Cb/1bt4olt83yXR9CBfSsjMWt0CuUFl8+bes5l54FNxbRDRcHJcSz 4UHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:user-agent:in-reply-to:content-disposition :mime-version:references:message-id:subject:cc:to:from:date; bh=Xh5m24hQEhbzn4JjqqadxJHpEAd6oW/sNbEPWVwF28w=; b=iZr6hyhpWH+u02V9XPeF36AKkBs1FqmWd8xyo1PTq2HLtcWpZfe8cCtQ1vPDM/BPwU IHR8CNk6db/YbEpRbLsxE2iUCCA+2tOV7MXWuYhE3utYdevKoL2bEVn+HmUrM0ok2dGF RuoYVjqRouZ/xZUmDGh/CSabUhMJ8T7j3E/DNWcJWuABsH2kP9WpiEPmfxsXsnert6H8 ytxV2AbPWIup9B5AXwgx34F5KHf/SS8fXKC6D28hXHzr3JX7SeQA9NEe/iJF+Ns6Gv4A StNZWsy/+ZE0OyeaRsUozL59o+PNSCfGVU3ITfrfIz3LD+ANlvBr9kuTo68+kU4G1SLf Uphg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a4si24076871ilj.44.2021.07.13.07.57.05; Tue, 13 Jul 2021 07:57:21 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236837AbhGMO7Q (ORCPT + 99 others); Tue, 13 Jul 2021 10:59:16 -0400 Received: from outbound-smtp21.blacknight.com ([81.17.249.41]:37517 "EHLO outbound-smtp21.blacknight.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236763AbhGMO7Q (ORCPT ); Tue, 13 Jul 2021 10:59:16 -0400 Received: from mail.blacknight.com (pemlinmail04.blacknight.ie [81.17.254.17]) by outbound-smtp21.blacknight.com (Postfix) with ESMTPS id 0582618E02F 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) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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