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=-7.0 required=3.0 tests=INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 30384C32771 for ; Mon, 27 Jan 2020 09:36:46 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id E751B214DB for ; Mon, 27 Jan 2020 09:36:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E751B214DB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 90CC76B0008; Mon, 27 Jan 2020 04:36:45 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 896996B000A; Mon, 27 Jan 2020 04:36:45 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7605B6B000C; Mon, 27 Jan 2020 04:36:45 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0232.hostedemail.com [216.40.44.232]) by kanga.kvack.org (Postfix) with ESMTP id 5CDE16B0008 for ; Mon, 27 Jan 2020 04:36:45 -0500 (EST) Received: from smtpin18.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with SMTP id 2419D8248D7C for ; Mon, 27 Jan 2020 09:36:45 +0000 (UTC) X-FDA: 76422909570.18.crown83_75167ab350e0a X-HE-Tag: crown83_75167ab350e0a X-Filterd-Recvd-Size: 6285 Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by imf21.hostedemail.com (Postfix) with ESMTP for ; Mon, 27 Jan 2020 09:36:44 +0000 (UTC) Received: by mail-wm1-f68.google.com with SMTP id s10so2491582wmh.3 for ; Mon, 27 Jan 2020 01:36:44 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=roaLqSgfifGJecXUxqExqg9D+N1Onbxp/Fi3I5fIEaA=; b=rkJ1Cb/SzlQIPqpagKGPdEFLVx+CRxu8HmUfrudoplEERO5+s179DFAcFcSdRHoXHh UlooS+5RWKJ0SN4BoD3BEpaSyKWknnVtt2El/F0SwQyI+kstC4XArjBn1GhTGp2o3eCV cRqZqydpTXG0fCF1KXzg+Ad1bDrTSci54jpE2r97YmOc6w1DUL/VfyIQoL8ONOEpKV7F lFX3f6b7GGb2/ftnT/64O1DQcR3NlCDOvh/EXUxSKCFyBP6lcxUAiJg+Bau6WdmWWEL+ f5NyWdlP4OUNsUOw5gjIwSlYH9aK+q9CdXFvVUgL/xckZpAFAJ8Wkz8ldpooqsXHZXL6 Cupg== X-Gm-Message-State: APjAAAXTdnKfkN4HjcukgT1QY6FqfONaY7hLAN10BdpEbSKtL/y6UJzV 509i39Ou2qwF1mFrhpQCCIQ= X-Google-Smtp-Source: APXvYqyCSkoSqviTOB9m5+1RyOePsliXdw7B+S2zPPzWCj4fnNv5Q7mZh8Ou0Fkk4d7TXGszmcMZNA== X-Received: by 2002:a1c:9dcb:: with SMTP id g194mr12429547wme.53.1580117803298; Mon, 27 Jan 2020 01:36:43 -0800 (PST) Received: from localhost (prg-ext-pat.suse.com. [213.151.95.130]) by smtp.gmail.com with ESMTPSA id t10sm8734812wmi.40.2020.01.27.01.36.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jan 2020 01:36:42 -0800 (PST) Date: Mon, 27 Jan 2020 10:36:42 +0100 From: Michal Hocko To: Wei Yang Cc: akpm@linux-foundation.org, yang.shi@linux.alibaba.com, rientjes@google.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [Patch v3 2/4] mm/migrate.c: wrap do_move_pages_to_node() and store_status() Message-ID: <20200127093642.GC1183@dhcp22.suse.cz> References: <20200126102623.9616-1-richardw.yang@linux.intel.com> <20200126102623.9616-3-richardw.yang@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200126102623.9616-3-richardw.yang@linux.intel.com> 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 Sun 26-01-20 18:26:21, Wei Yang wrote: > Usually do_move_pages_to_node() and store_status() is a pair. There are > three places call this pair of functions with almost the same form. > > This patch just wrap it to make it friendly to audience and also > consolidate the move and store action into one place. > > Signed-off-by: Wei Yang I believe I have already acked this one. Anyway Acked-by: Michal Hocko > --- > mm/migrate.c | 61 ++++++++++++++++++++++++++-------------------------- > 1 file changed, 30 insertions(+), 31 deletions(-) > > diff --git a/mm/migrate.c b/mm/migrate.c > index ae3db45c6a42..e816c8990296 100644 > --- a/mm/migrate.c > +++ b/mm/migrate.c > @@ -1583,6 +1583,29 @@ static int add_page_for_migration(struct mm_struct *mm, unsigned long addr, > return err; > } > > +static int move_pages_and_store_status(struct mm_struct *mm, int node, > + struct list_head *pagelist, int __user *status, > + unsigned long nr_pages, int start, int i) > +{ > + int err; > + > + err = do_move_pages_to_node(mm, pagelist, node); > + if (err) { > + /* > + * Positive err means the number of failed > + * pages to migrate. Since we are going to > + * abort and return the number of non-migrated > + * pages, so need incude the rest of the > + * nr_pages that have not attempted as well. > + */ > + if (err > 0) > + err += nr_pages - i - 1; > + return err; > + } > + err = store_status(status, start, node, i - start); > + return err; > +} > + > /* > * Migrate an array of page address onto an array of nodes and fill > * the corresponding array of status. > @@ -1626,20 +1649,9 @@ static int do_pages_move(struct mm_struct *mm, nodemask_t task_nodes, > current_node = node; > start = i; > } else if (node != current_node) { > - err = do_move_pages_to_node(mm, &pagelist, current_node); > - if (err) { > - /* > - * Positive err means the number of failed > - * pages to migrate. Since we are going to > - * abort and return the number of non-migrated > - * pages, so need incude the rest of the > - * nr_pages that have not attempted as well. > - */ > - if (err > 0) > - err += nr_pages - i - 1; > - goto out; > - } > - err = store_status(status, start, current_node, i - start); > + err = move_pages_and_store_status(mm, current_node, > + &pagelist, status, nr_pages, > + start, i); > if (err) > goto out; > start = i; > @@ -1668,13 +1680,8 @@ static int do_pages_move(struct mm_struct *mm, nodemask_t task_nodes, > if (err) > goto out_flush; > > - err = do_move_pages_to_node(mm, &pagelist, current_node); > - if (err) { > - if (err > 0) > - err += nr_pages - i - 1; > - goto out; > - } > - err = store_status(status, start, current_node, i - start); > + err = move_pages_and_store_status(mm, current_node, &pagelist, > + status, nr_pages, start, i); > if (err) > goto out; > current_node = NUMA_NO_NODE; > @@ -1684,16 +1691,8 @@ static int do_pages_move(struct mm_struct *mm, nodemask_t task_nodes, > return err; > > /* Make sure we do not overwrite the existing error */ > - err1 = do_move_pages_to_node(mm, &pagelist, current_node); > - /* > - * Don't have to report non-attempted pages here since: > - * - If the above loop is done gracefully there is not non-attempted > - * page. > - * - If the above loop is aborted to it means more fatal error > - * happened, should return err. > - */ > - if (!err1) > - err1 = store_status(status, start, current_node, i - start); > + err1 = move_pages_and_store_status(mm, current_node, &pagelist, > + status, nr_pages, start, i); > if (err >= 0) > err = err1; > out: > -- > 2.17.1 -- Michal Hocko SUSE Labs