From: Michal Hocko <mhocko@kernel.org>
To: Wei Yang <richardw.yang@linux.intel.com>
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()
Date: Mon, 20 Jan 2020 10:49:49 +0100 [thread overview]
Message-ID: <20200120094949.GO18451@dhcp22.suse.cz> (raw)
In-Reply-To: <20200119030636.11899-5-richardw.yang@linux.intel.com>
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 <richardw.yang@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
> ---
> 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
next prev parent reply other threads:[~2020-01-20 9:49 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-19 3:06 [PATCH 0/8] mm/migrate.c: cleanup on do_pages_move() Wei Yang
2020-01-19 3:06 ` [PATCH 1/8] mm/migrate.c: skip node check if done in last round Wei Yang
2020-01-20 9:36 ` Michal Hocko
2020-01-20 22:25 ` Wei Yang
2020-01-21 8:42 ` Michal Hocko
2020-01-22 0:36 ` Wei Yang
2020-01-22 8:16 ` Michal Hocko
2020-01-19 3:06 ` [PATCH 2/8] mm/migrate.c: not necessary to check start and i Wei Yang
2020-01-19 22:14 ` David Rientjes
2020-01-20 0:31 ` Wei Yang
2020-01-20 9:45 ` Michal Hocko
2020-01-19 3:06 ` [PATCH 3/8] mm/migrate.c: reform the last call on do_move_pages_to_node() Wei Yang
2020-01-20 9:46 ` Michal Hocko
2020-01-20 22:27 ` Wei Yang
2020-01-19 3:06 ` [PATCH 4/8] mm/migrate.c: wrap do_move_pages_to_node() and store_status() Wei Yang
2020-01-20 9:49 ` Michal Hocko [this message]
2020-01-19 3:06 ` [PATCH 5/8] mm/migrate.c: check pagelist in move_pages_and_store_status() Wei Yang
2020-01-20 9:52 ` Michal Hocko
2020-01-19 3:06 ` [PATCH 6/8] mm/migrate.c: handle same node and add failure in the same way Wei Yang
2020-01-20 10:01 ` Michal Hocko
2020-01-19 3:06 ` [PATCH 7/8] mm/migrate.c: move page on next iteration Wei Yang
2020-01-20 10:02 ` Michal Hocko
2020-01-21 1:22 ` Wei Yang
2020-01-21 8:43 ` Michal Hocko
2020-01-22 0:40 ` Wei Yang
2020-01-22 8:17 ` Michal Hocko
2020-01-19 3:06 ` [PATCH 8/8] mm/migrate.c: use break instead of goto out_flush Wei Yang
2020-01-20 10:03 ` Michal Hocko
2020-01-21 1:22 ` Wei Yang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200120094949.GO18451@dhcp22.suse.cz \
--to=mhocko@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=richardw.yang@linux.intel.com \
--cc=yang.shi@linux.alibaba.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox