From: Wei Yang <richardw.yang@linux.intel.com>
To: akpm@linux-foundation.org
Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org,
mhocko@suse.com, yang.shi@linux.alibaba.com, rientjes@google.com,
Wei Yang <richardw.yang@linux.intel.com>
Subject: [Patch v2 2/4] mm/migrate.c: wrap do_move_pages_to_node() and store_status()
Date: Wed, 22 Jan 2020 09:16:45 +0800 [thread overview]
Message-ID: <20200122011647.13636-3-richardw.yang@linux.intel.com> (raw)
In-Reply-To: <20200122011647.13636-1-richardw.yang@linux.intel.com>
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.
Signed-off-by: Wei Yang <richardw.yang@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
---
mm/migrate.c | 30 +++++++++++++++++++-----------
1 file changed, 19 insertions(+), 11 deletions(-)
diff --git a/mm/migrate.c b/mm/migrate.c
index 4c2a21856717..a4d3bd6475e1 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.
@@ -1626,10 +1639,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;
@@ -1658,10 +1669,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;
@@ -1671,9 +1680,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)
- 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
next prev parent reply other threads:[~2020-01-22 1:17 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-22 1:16 [Patch v2 0/4] cleanup on do_pages_move() Wei Yang
2020-01-22 1:16 ` [Patch v2 1/4] mm/migrate.c: not necessary to check start and i Wei Yang
2020-01-28 10:04 ` David Hildenbrand
2020-01-29 0:32 ` Wei Yang
2020-01-22 1:16 ` Wei Yang [this message]
2020-01-28 10:14 ` [Patch v2 2/4] mm/migrate.c: wrap do_move_pages_to_node() and store_status() David Hildenbrand
2020-01-29 0:38 ` Wei Yang
2020-01-29 9:28 ` David Hildenbrand
2020-01-29 22:00 ` Wei Yang
2020-01-22 1:16 ` [Patch v2 3/4] mm/migrate.c: check pagelist in move_pages_and_store_status() Wei Yang
2020-01-28 10:21 ` David Hildenbrand
2020-01-29 0:46 ` Wei Yang
2020-01-29 9:36 ` David Hildenbrand
2020-01-22 1:16 ` [Patch v2 4/4] mm/migrate.c: handle same node and add failure in the same way Wei Yang
2020-01-29 10:13 ` David Hildenbrand
2020-01-29 22:07 ` 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=20200122011647.13636-3-richardw.yang@linux.intel.com \
--to=richardw.yang@linux.intel.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mhocko@suse.com \
--cc=rientjes@google.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;
as well as URLs for NNTP newsgroup(s).