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,
david@redhat.com, Wei Yang <richardw.yang@linux.intel.com>
Subject: [Patch v5 4/4] mm/migrate.c: unify "not queued for migration" handling in do_pages_move()
Date: Fri, 14 Feb 2020 08:30:17 +0800 [thread overview]
Message-ID: <20200214003017.25558-5-richardw.yang@linux.intel.com> (raw)
In-Reply-To: <20200214003017.25558-1-richardw.yang@linux.intel.com>
It can currently happen that we store the status of a page twice:
* Once we detect that it is already on the target node
* Once we moved a bunch of pages, and a page that's already on the
target node is contained in the current interval.
Let's simplify the code and always call do_move_pages_to_node() in
case we did not queue a page for migration. Note that pages that are
already on the target node are not added to the pagelist and are,
therefore, ignored by do_move_pages_to_node() - there is no functional
change.
The status of such a page is now only stored once.
[david@redhat.com rephrase changelog]
Signed-off-by: Wei Yang <richardw.yang@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
---
mm/migrate.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/mm/migrate.c b/mm/migrate.c
index fe62b96852a3..4a8902a443fd 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -1664,18 +1664,16 @@ static int do_pages_move(struct mm_struct *mm, nodemask_t task_nodes,
err = add_page_for_migration(mm, addr, current_node,
&pagelist, flags & MPOL_MF_MOVE_ALL);
- if (!err) {
- /* The page is already on the target node */
- err = store_status(status, i, current_node, 1);
- if (err)
- goto out_flush;
- continue;
- } else if (err > 0) {
+ if (err > 0) {
/* The page is successfully queued for migration */
continue;
}
- err = store_status(status, i, err, 1);
+ /*
+ * If the page is already on the target node (!err), store the
+ * node, otherwise, store the err.
+ */
+ err = store_status(status, i, err ? : current_node, 1);
if (err)
goto out_flush;
--
2.17.1
next prev parent reply other threads:[~2020-02-14 0:30 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-14 0:30 [Patch v5 0/4] cleanup on do_pages_move() Wei Yang
2020-02-14 0:30 ` [Patch v5 1/4] mm/migrate.c: no need to check for i > start in do_pages_move() Wei Yang
2020-02-14 0:30 ` [Patch v5 2/4] mm/migrate.c: wrap do_move_pages_to_node() and store_status() Wei Yang
2020-02-14 0:30 ` [Patch v5 3/4] mm/migrate.c: check pagelist in move_pages_and_store_status() Wei Yang
2020-02-14 0:30 ` Wei Yang [this message]
2020-04-07 12:45 ` [Patch v5 0/4] cleanup on do_pages_move() 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=20200214003017.25558-5-richardw.yang@linux.intel.com \
--to=richardw.yang@linux.intel.com \
--cc=akpm@linux-foundation.org \
--cc=david@redhat.com \
--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).