From: js1304@gmail.com
To: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org,
kernel-team@lge.com, Vlastimil Babka <vbabka@suse.cz>,
Christoph Hellwig <hch@infradead.org>,
Roman Gushchin <guro@fb.com>,
Mike Kravetz <mike.kravetz@oracle.com>,
Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>,
Michal Hocko <mhocko@suse.com>,
Joonsoo Kim <iamjoonsoo.kim@lge.com>
Subject: [PATCH v3 7/8] mm/mempolicy: use a standard migration target allocation callback
Date: Tue, 23 Jun 2020 15:13:47 +0900 [thread overview]
Message-ID: <1592892828-1934-8-git-send-email-iamjoonsoo.kim@lge.com> (raw)
In-Reply-To: <1592892828-1934-1-git-send-email-iamjoonsoo.kim@lge.com>
From: Joonsoo Kim <iamjoonsoo.kim@lge.com>
There is a well-defined migration target allocation callback.
Use it.
Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@lge.com>
---
mm/internal.h | 1 -
mm/mempolicy.c | 30 ++++++------------------------
mm/migrate.c | 8 ++++++--
3 files changed, 12 insertions(+), 27 deletions(-)
diff --git a/mm/internal.h b/mm/internal.h
index fb7f7fe..4f9f6b6 100644
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -613,7 +613,6 @@ static inline bool is_migrate_highatomic_page(struct page *page)
}
void setup_zone_pageset(struct zone *zone);
-extern struct page *alloc_new_node_page(struct page *page, unsigned long node);
struct migration_target_control {
int nid; /* preferred node id */
diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index a3abf64..85a3f21 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -1065,28 +1065,6 @@ static int migrate_page_add(struct page *page, struct list_head *pagelist,
return 0;
}
-/* page allocation callback for NUMA node migration */
-struct page *alloc_new_node_page(struct page *page, unsigned long node)
-{
- if (PageHuge(page)) {
- return alloc_huge_page_nodemask(
- page_hstate(compound_head(page)), node,
- NULL, __GFP_THISNODE, false);
- } else if (PageTransHuge(page)) {
- struct page *thp;
-
- thp = alloc_pages_node(node,
- (GFP_TRANSHUGE | __GFP_THISNODE),
- HPAGE_PMD_ORDER);
- if (!thp)
- return NULL;
- prep_transhuge_page(thp);
- return thp;
- } else
- return __alloc_pages_node(node, GFP_HIGHUSER_MOVABLE |
- __GFP_THISNODE, 0);
-}
-
/*
* Migrate pages from one node to a target node.
* Returns error or the number of pages not migrated.
@@ -1097,6 +1075,10 @@ static int migrate_to_node(struct mm_struct *mm, int source, int dest,
nodemask_t nmask;
LIST_HEAD(pagelist);
int err = 0;
+ struct migration_target_control mtc = {
+ .nid = dest,
+ .gfp_mask = GFP_HIGHUSER_MOVABLE | __GFP_THISNODE,
+ };
nodes_clear(nmask);
node_set(source, nmask);
@@ -1111,8 +1093,8 @@ static int migrate_to_node(struct mm_struct *mm, int source, int dest,
flags | MPOL_MF_DISCONTIG_OK, &pagelist);
if (!list_empty(&pagelist)) {
- err = migrate_pages(&pagelist, alloc_new_node_page, NULL, dest,
- MIGRATE_SYNC, MR_SYSCALL);
+ err = migrate_pages(&pagelist, alloc_migration_target, NULL,
+ (unsigned long)&mtc, MIGRATE_SYNC, MR_SYSCALL);
if (err)
putback_movable_pages(&pagelist);
}
diff --git a/mm/migrate.c b/mm/migrate.c
index 7c4cd74..1c943b0 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -1590,9 +1590,13 @@ static int do_move_pages_to_node(struct mm_struct *mm,
struct list_head *pagelist, int node)
{
int err;
+ struct migration_target_control mtc = {
+ .nid = node,
+ .gfp_mask = GFP_HIGHUSER_MOVABLE | __GFP_THISNODE,
+ };
- err = migrate_pages(pagelist, alloc_new_node_page, NULL, node,
- MIGRATE_SYNC, MR_SYSCALL);
+ err = migrate_pages(pagelist, alloc_migration_target, NULL,
+ (unsigned long)&mtc, MIGRATE_SYNC, MR_SYSCALL);
if (err)
putback_movable_pages(pagelist);
return err;
--
2.7.4
next prev parent reply other threads:[~2020-06-23 6:14 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-23 6:13 [PATCH v3 0/8] clean-up the migration target allocation functions js1304
2020-06-23 6:13 ` [PATCH v3 1/8] mm/page_isolation: prefer the node of the source page js1304
2020-06-23 6:13 ` [PATCH v3 2/8] mm/migrate: move migration helper from .h to .c js1304
2020-06-23 6:13 ` [PATCH v3 3/8] mm/hugetlb: unify migration callbacks js1304
2020-06-24 21:18 ` Mike Kravetz
2020-06-25 11:26 ` Michal Hocko
2020-06-26 4:02 ` Joonsoo Kim
2020-07-02 16:13 ` Vlastimil Babka
2020-07-03 0:55 ` Joonsoo Kim
2020-06-23 6:13 ` [PATCH v3 4/8] mm/hugetlb: make hugetlb migration callback CMA aware js1304
2020-06-25 11:54 ` Michal Hocko
2020-06-26 4:49 ` Joonsoo Kim
2020-06-26 7:23 ` Michal Hocko
2020-06-29 6:27 ` Joonsoo Kim
2020-06-29 7:55 ` Michal Hocko
2020-06-30 6:30 ` Joonsoo Kim
2020-06-30 6:42 ` Michal Hocko
2020-06-30 7:22 ` Joonsoo Kim
2020-06-30 16:37 ` Mike Kravetz
2020-06-23 6:13 ` [PATCH v3 5/8] mm/migrate: make a standard migration target allocation function js1304
2020-06-25 12:05 ` Michal Hocko
2020-06-26 5:02 ` Joonsoo Kim
2020-06-26 7:33 ` Michal Hocko
2020-06-29 6:41 ` Joonsoo Kim
2020-06-29 8:03 ` Michal Hocko
2020-06-30 7:19 ` Joonsoo Kim
2020-07-03 15:25 ` Vlastimil Babka
2020-06-23 6:13 ` [PATCH v3 6/8] mm/gup: use a standard migration target allocation callback js1304
2020-06-25 12:08 ` Michal Hocko
2020-06-26 5:03 ` Joonsoo Kim
2020-07-03 15:56 ` Vlastimil Babka
2020-07-06 8:34 ` Joonsoo Kim
2020-06-23 6:13 ` js1304 [this message]
2020-06-25 12:09 ` [PATCH v3 7/8] mm/mempolicy: " Michal Hocko
2020-07-03 15:59 ` Vlastimil Babka
[not found] ` <20200708012044.GC992@lca.pw>
2020-07-08 6:45 ` Michal Hocko
2020-10-08 3:21 ` Hugh Dickins
2020-10-08 17:29 ` Mike Kravetz
2020-10-09 5:50 ` Hugh Dickins
2020-10-09 17:42 ` Mike Kravetz
2020-10-09 22:23 ` Hugh Dickins
2020-10-10 0:25 ` Mike Kravetz
2020-06-23 6:13 ` [PATCH v3 8/8] mm/page_alloc: remove a wrapper for alloc_migration_target() js1304
2020-06-25 12:10 ` Michal Hocko
2020-07-03 16:18 ` Vlastimil Babka
2020-07-06 8:44 ` Joonsoo Kim
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=1592892828-1934-8-git-send-email-iamjoonsoo.kim@lge.com \
--to=js1304@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=guro@fb.com \
--cc=hch@infradead.org \
--cc=iamjoonsoo.kim@lge.com \
--cc=kernel-team@lge.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mhocko@suse.com \
--cc=mike.kravetz@oracle.com \
--cc=n-horiguchi@ah.jp.nec.com \
--cc=vbabka@suse.cz \
/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).