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 10/11] mm/mempolicy: use standard migration target allocation function
Date: Mon, 18 May 2020 10:20:56 +0900 [thread overview]
Message-ID: <1589764857-6800-11-git-send-email-iamjoonsoo.kim@lge.com> (raw)
In-Reply-To: <1589764857-6800-1-git-send-email-iamjoonsoo.kim@lge.com>
From: Joonsoo Kim <iamjoonsoo.kim@lge.com>
There is no reason to implement it's own function for migration
target allocation. Use standard one.
Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@lge.com>
---
mm/internal.h | 3 ---
mm/mempolicy.c | 33 ++++-----------------------------
mm/migrate.c | 4 +++-
3 files changed, 7 insertions(+), 33 deletions(-)
diff --git a/mm/internal.h b/mm/internal.h
index abe94a7..5ade079 100644
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -612,9 +612,6 @@ static inline bool is_migrate_highatomic_page(struct page *page)
}
void setup_zone_pageset(struct zone *zone);
-struct alloc_control;
-extern struct page *alloc_new_node_page(struct page *page,
- struct alloc_control *ac);
struct alloc_control {
int nid;
diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index 7241621..8d3ccab 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -1065,33 +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, struct alloc_control *__ac)
-{
- if (PageHuge(page)) {
- struct hstate *h = page_hstate(page);
- struct alloc_control ac = {
- .nid = __ac->nid,
- .nmask = NULL,
- .thisnode = true,
- };
-
- return alloc_huge_page_nodemask(h, &ac);
- } else if (PageTransHuge(page)) {
- struct page *thp;
-
- thp = alloc_pages_node(__ac->nid,
- (GFP_TRANSHUGE | __GFP_THISNODE),
- HPAGE_PMD_ORDER);
- if (!thp)
- return NULL;
- prep_transhuge_page(thp);
- return thp;
- } else
- return __alloc_pages_node(__ac->nid, GFP_HIGHUSER_MOVABLE |
- __GFP_THISNODE, 0);
-}
-
/*
* Migrate pages from one node to a target node.
* Returns error or the number of pages not migrated.
@@ -1104,6 +1077,8 @@ static int migrate_to_node(struct mm_struct *mm, int source, int dest,
int err = 0;
struct alloc_control ac = {
.nid = dest,
+ .gfp_mask = GFP_HIGHUSER_MOVABLE,
+ .thisnode = true,
};
nodes_clear(nmask);
@@ -1119,8 +1094,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, &ac,
- MIGRATE_SYNC, MR_SYSCALL);
+ err = migrate_pages(&pagelist, alloc_migration_target, NULL,
+ &ac, MIGRATE_SYNC, MR_SYSCALL);
if (err)
putback_movable_pages(&pagelist);
}
diff --git a/mm/migrate.c b/mm/migrate.c
index 029af0b..3dfb108 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -1574,9 +1574,11 @@ static int do_move_pages_to_node(struct mm_struct *mm,
int err;
struct alloc_control ac = {
.nid = node,
+ .gfp_mask = GFP_HIGHUSER_MOVABLE,
+ .thisnode = true,
};
- err = migrate_pages(pagelist, alloc_new_node_page, NULL, &ac,
+ err = migrate_pages(pagelist, alloc_migration_target, NULL, &ac,
MIGRATE_SYNC, MR_SYSCALL);
if (err)
putback_movable_pages(pagelist);
--
2.7.4
next prev parent reply other threads:[~2020-05-18 1:22 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-18 1:20 [PATCH 00/11] clean-up the migration target allocation functions js1304
2020-05-18 1:20 ` [PATCH 01/11] mm/page_isolation: prefer the node of the source page js1304
2020-05-21 0:37 ` Roman Gushchin
2020-05-21 1:18 ` Joonsoo Kim
2020-05-27 6:45 ` Joonsoo Kim
2020-05-18 1:20 ` [PATCH 02/11] mm/migrate: move migration helper from .h to .c js1304
2020-05-21 18:17 ` Mike Kravetz
2020-05-18 1:20 ` [PATCH 03/11] mm/hugetlb: introduce alloc_control structure to simplify migration target allocation APIs js1304
2020-05-21 0:43 ` Roman Gushchin
2020-05-21 1:20 ` Joonsoo Kim
2020-05-21 18:57 ` Mike Kravetz
2020-05-22 5:52 ` Joonsoo Kim
2020-05-18 1:20 ` [PATCH 04/11] mm/hugetlb: unify hugetlb migration callback function js1304
2020-05-21 0:46 ` Roman Gushchin
2020-05-21 1:22 ` Joonsoo Kim
2020-05-21 20:54 ` Mike Kravetz
2020-05-22 7:38 ` Joonsoo Kim
2020-05-18 1:20 ` [PATCH 05/11] mm/hugetlb: make hugetlb migration target allocation APIs CMA aware js1304
2020-05-21 21:43 ` Mike Kravetz
2020-05-18 1:20 ` [PATCH 06/11] mm/hugetlb: do not modify user provided gfp_mask js1304
2020-05-21 22:19 ` Mike Kravetz
2020-05-22 7:42 ` Joonsoo Kim
2020-05-18 1:20 ` [PATCH 07/11] mm/migrate: change the interface of the migration target alloc/free functions js1304
2020-05-18 1:20 ` [PATCH 08/11] mm/migrate: make standard migration target allocation functions js1304
2020-05-18 1:20 ` [PATCH 09/11] mm/gup: use standard migration target allocation function js1304
2020-05-18 1:20 ` js1304 [this message]
2020-05-18 1:20 ` [PATCH 11/11] mm/page_alloc: use standard migration target allocation function directly js1304
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=1589764857-6800-11-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).