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=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,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 B9819C32771 for ; Tue, 28 Jan 2020 00:31:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 917D020661 for ; Tue, 28 Jan 2020 00:31:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726338AbgA1AbL (ORCPT ); Mon, 27 Jan 2020 19:31:11 -0500 Received: from mga11.intel.com ([192.55.52.93]:59049 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725955AbgA1AbL (ORCPT ); Mon, 27 Jan 2020 19:31:11 -0500 X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 27 Jan 2020 16:31:10 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,371,1574150400"; d="scan'208";a="221924501" Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by orsmga008.jf.intel.com with ESMTP; 27 Jan 2020 16:31:08 -0800 Date: Tue, 28 Jan 2020 08:31:21 +0800 From: Wei Yang To: Michal Hocko Cc: Wei Yang , 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: <20200128003121.GA20624@richard> Reply-To: Wei Yang References: <20200126102623.9616-1-richardw.yang@linux.intel.com> <20200126102623.9616-3-richardw.yang@linux.intel.com> <20200127093642.GC1183@dhcp22.suse.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200127093642.GC1183@dhcp22.suse.cz> User-Agent: Mutt/1.9.4 (2018-02-28) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Jan 27, 2020 at 10:36:42AM +0100, Michal Hocko wrote: >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 > Yep, since some change from original code, I dropped your ack. Thanks >> --- >> 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 -- Wei Yang Help you, Help me