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.5 required=3.0 tests=INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable 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 1609CC33CA1 for ; Mon, 20 Jan 2020 09:49:54 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id D266E207FD for ; Mon, 20 Jan 2020 09:49:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D266E207FD 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 547156B061A; Mon, 20 Jan 2020 04:49:53 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4F7C66B061B; Mon, 20 Jan 2020 04:49:53 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 40D1A6B061C; Mon, 20 Jan 2020 04:49:53 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0097.hostedemail.com [216.40.44.97]) by kanga.kvack.org (Postfix) with ESMTP id 2A22F6B061A for ; Mon, 20 Jan 2020 04:49:53 -0500 (EST) Received: from smtpin04.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with SMTP id C6EAC98B0 for ; Mon, 20 Jan 2020 09:49:52 +0000 (UTC) X-FDA: 76397541024.04.cup92_7348a83d8d201 X-HE-Tag: cup92_7348a83d8d201 X-Filterd-Recvd-Size: 5446 Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by imf06.hostedemail.com (Postfix) with ESMTP for ; Mon, 20 Jan 2020 09:49:52 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id q6so28689659wro.9 for ; Mon, 20 Jan 2020 01:49:51 -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:user-agent; bh=96Yk+QoVaIwO+HNATcLRzJaQ7QQbxKQlungEeYBl4+M=; b=ns4ky5rh160BC1IX7x+chkH1bPK/870pqZFSMt0EJcxNuQYI64icIouWJRtB4wW+46 9eLovuYHxD1nR8JtiBYojkFYbgMiKKHUtJRlnTZiYvp30myySn6qBbARB3YlvO3xEW4l xJX6pSNooMv7d3/6jscHLYEboRBrx0UjCL42LgkRYo5uv2bE7+wQCe59JUHBzoxvQzDj cLp0GlORSM9dx/t0VhijwMsuW/Gu3/Q7bnrYgY7V3+eCHOeqWI7ZpgrYtDyJc/D1QE3O R4MMly2JcZDFh8R+FUFyCEQrZqgzqgdCoadxxXzi1RvPpjrn0+n8/mUKf0/z+5AtwK0+ nnJQ== X-Gm-Message-State: APjAAAWWevDnp3z+S8t2drrzntf8JuGoZ7peoo20S0/nYDcFAApYj5DX ODNRGqt40LjmJPmMJl3xyhA= X-Google-Smtp-Source: APXvYqzbw5Za9L5kGrGJOgeUCwtft8uNLTozwyqXlPcbUsvotfIBnuXbs5z4lnwBX8OydnoENyHQig== X-Received: by 2002:a5d:6708:: with SMTP id o8mr17698671wru.296.1579513791059; Mon, 20 Jan 2020 01:49:51 -0800 (PST) Received: from localhost (prg-ext-pat.suse.com. [213.151.95.130]) by smtp.gmail.com with ESMTPSA id s8sm45542497wrt.57.2020.01.20.01.49.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jan 2020 01:49:50 -0800 (PST) Date: Mon, 20 Jan 2020 10:49:49 +0100 From: Michal Hocko To: Wei Yang Cc: akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, yang.shi@linux.alibaba.com Subject: Re: [PATCH 4/8] mm/migrate.c: wrap do_move_pages_to_node() and store_status() Message-ID: <20200120094949.GO18451@dhcp22.suse.cz> References: <20200119030636.11899-1-richardw.yang@linux.intel.com> <20200119030636.11899-5-richardw.yang@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200119030636.11899-5-richardw.yang@linux.intel.com> User-Agent: Mutt/1.12.2 (2019-09-21) 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 19-01-20 11:06:32, 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. Also mentioned by > Yang Shi, the handling of do_move_pages_to_node()'s return value is not > proper. Now we can fix it in one place. The helper helps here indeed. Thanks this makes the code easier to read. > > Signed-off-by: Wei Yang Acked-by: Michal Hocko > --- > mm/migrate.c | 34 +++++++++++++++++++--------------- > 1 file changed, 19 insertions(+), 15 deletions(-) > > diff --git a/mm/migrate.c b/mm/migrate.c > index 4a63fb8fbb6d..dec147d3a4dd 100644 > --- a/mm/migrate.c > +++ b/mm/migrate.c > @@ -1583,6 +1583,19 @@ 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, > + int start, int nr) > +{ > + int err; > + > + err = do_move_pages_to_node(mm, pagelist, node); > + if (err) > + return err; > + err = store_status(status, start, node, nr); > + return err; > +} > + > /* > * Migrate an array of page address onto an array of nodes and fill > * the corresponding array of status. > @@ -1629,10 +1642,8 @@ 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) > - goto out; > - err = store_status(status, start, current_node, i - start); > + err = move_pages_and_store_status(mm, current_node, > + &pagelist, status, start, i - start); > if (err) > goto out; > start = i; > @@ -1661,10 +1672,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) > - goto out; > - err = store_status(status, start, current_node, i - start); > + err = move_pages_and_store_status(mm, current_node, &pagelist, > + status, start, i - start); > if (err) > goto out; > current_node = NUMA_NO_NODE; > @@ -1674,13 +1683,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); > - if (err1) { > - if (err >= 0) > - err = err1; > - goto out; > - } > - err1 = store_status(status, start, current_node, i - start); > + err1 = move_pages_and_store_status(mm, current_node, &pagelist, > + status, start, i - start); > if (err >= 0) > err = err1; > out: > -- > 2.17.1 > -- Michal Hocko SUSE Labs