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 v4 07/11] mm/gup: use a standard migration target allocation callback
Date: Tue, 7 Jul 2020 16:44:45 +0900 [thread overview]
Message-ID: <1594107889-32228-8-git-send-email-iamjoonsoo.kim@lge.com> (raw)
In-Reply-To: <1594107889-32228-1-git-send-email-iamjoonsoo.kim@lge.com>
From: Joonsoo Kim <iamjoonsoo.kim@lge.com>
There is a well-defined migration target allocation callback. It's mostly
similar with new_non_cma_page() except considering CMA pages.
This patch adds a CMA consideration to the standard migration target
allocation callback and use it on gup.c.
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@lge.com>
---
mm/gup.c | 61 +++++++----------------------------------------------------
mm/internal.h | 1 +
mm/migrate.c | 9 ++++++++-
3 files changed, 16 insertions(+), 55 deletions(-)
diff --git a/mm/gup.c b/mm/gup.c
index 2c3dab4..6a74c30 100644
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -1608,58 +1608,6 @@ static bool check_dax_vmas(struct vm_area_struct **vmas, long nr_pages)
}
#ifdef CONFIG_CMA
-static struct page *new_non_cma_page(struct page *page, unsigned long private)
-{
- /*
- * We want to make sure we allocate the new page from the same node
- * as the source page.
- */
- int nid = page_to_nid(page);
- /*
- * Trying to allocate a page for migration. Ignore allocation
- * failure warnings. We don't force __GFP_THISNODE here because
- * this node here is the node where we have CMA reservation and
- * in some case these nodes will have really less non movable
- * allocation memory.
- */
- gfp_t gfp_mask = GFP_USER | __GFP_NOWARN;
-
- if (PageHighMem(page))
- gfp_mask |= __GFP_HIGHMEM;
-
-#ifdef CONFIG_HUGETLB_PAGE
- if (PageHuge(page)) {
- struct hstate *h = page_hstate(page);
-
- /*
- * We don't want to dequeue from the pool because pool pages will
- * mostly be from the CMA region.
- */
- return alloc_huge_page_nodemask(h, nid, NULL, gfp_mask, true);
- }
-#endif
- if (PageTransHuge(page)) {
- struct page *thp;
- /*
- * ignore allocation failure warnings
- */
- gfp_t thp_gfpmask = GFP_TRANSHUGE | __GFP_NOWARN;
-
- /*
- * Remove the movable mask so that we don't allocate from
- * CMA area again.
- */
- thp_gfpmask &= ~__GFP_MOVABLE;
- thp = __alloc_pages_node(nid, thp_gfpmask, HPAGE_PMD_ORDER);
- if (!thp)
- return NULL;
- prep_transhuge_page(thp);
- return thp;
- }
-
- return __alloc_pages_node(nid, gfp_mask, 0);
-}
-
static long check_and_migrate_cma_pages(struct task_struct *tsk,
struct mm_struct *mm,
unsigned long start,
@@ -1674,6 +1622,11 @@ static long check_and_migrate_cma_pages(struct task_struct *tsk,
bool migrate_allow = true;
LIST_HEAD(cma_page_list);
long ret = nr_pages;
+ struct migration_target_control mtc = {
+ .nid = NUMA_NO_NODE,
+ .gfp_mask = GFP_USER | __GFP_NOWARN,
+ .skip_cma = true,
+ };
check_again:
for (i = 0; i < nr_pages;) {
@@ -1719,8 +1672,8 @@ static long check_and_migrate_cma_pages(struct task_struct *tsk,
for (i = 0; i < nr_pages; i++)
put_page(pages[i]);
- if (migrate_pages(&cma_page_list, new_non_cma_page,
- NULL, 0, MIGRATE_SYNC, MR_CONTIG_RANGE)) {
+ if (migrate_pages(&cma_page_list, alloc_migration_target, NULL,
+ (unsigned long)&mtc, MIGRATE_SYNC, MR_CONTIG_RANGE)) {
/*
* some of the pages failed migration. Do get_user_pages
* without migration.
diff --git a/mm/internal.h b/mm/internal.h
index 0beacf3..3236fef 100644
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -619,6 +619,7 @@ struct migration_target_control {
int nid; /* preferred node id */
nodemask_t *nmask;
gfp_t gfp_mask;
+ bool skip_cma;
};
#endif /* __MM_INTERNAL_H */
diff --git a/mm/migrate.c b/mm/migrate.c
index 00cd81c..ab18b9c 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -1539,6 +1539,7 @@ struct page *alloc_migration_target(struct page *page, unsigned long private)
struct page *new_page = NULL;
int nid;
int zidx;
+ unsigned int flags = 0;
mtc = (struct migration_target_control *)private;
gfp_mask = mtc->gfp_mask;
@@ -1551,9 +1552,12 @@ struct page *alloc_migration_target(struct page *page, unsigned long private)
gfp_mask |= htlb_alloc_mask(h);
return alloc_huge_page_nodemask(h, nid, mtc->nmask,
- gfp_mask, false);
+ gfp_mask, mtc->skip_cma);
}
+ if (mtc->skip_cma)
+ flags = memalloc_nocma_save();
+
if (PageTransHuge(page)) {
/*
* clear __GFP_RECALIM since GFP_TRANSHUGE is the gfp_mask
@@ -1572,6 +1576,9 @@ struct page *alloc_migration_target(struct page *page, unsigned long private)
if (new_page && PageTransHuge(new_page))
prep_transhuge_page(new_page);
+ if (mtc->skip_cma)
+ memalloc_nocma_restore(flags);
+
return new_page;
}
--
2.7.4
next prev parent reply other threads:[~2020-07-07 7:45 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-07 7:44 [PATCH v4 00/11] clean-up the migration target allocation functions js1304
2020-07-07 7:44 ` [PATCH v4 01/11] mm/page_isolation: prefer the node of the source page js1304
2020-07-07 7:44 ` [PATCH v4 02/11] mm/migrate: move migration helper from .h to .c js1304
2020-07-07 7:44 ` [PATCH v4 03/11] mm/hugetlb: unify migration callbacks js1304
2020-07-07 11:05 ` Vlastimil Babka
2020-07-07 11:19 ` Michal Hocko
2020-07-07 7:44 ` [PATCH v4 04/11] mm/hugetlb: make hugetlb migration callback CMA aware js1304
2020-07-07 11:22 ` Vlastimil Babka
2020-07-08 7:16 ` Joonsoo Kim
2020-07-08 7:41 ` Michal Hocko
2020-07-08 9:26 ` Vlastimil Babka
2020-07-08 10:57 ` Aneesh Kumar K.V
2020-07-08 11:32 ` Michal Hocko
2020-07-09 6:43 ` Michal Hocko
2020-07-09 7:03 ` Joonsoo Kim
2020-07-09 0:27 ` Mike Kravetz
2020-07-07 11:31 ` Michal Hocko
2020-07-08 6:48 ` Michal Hocko
2020-07-08 7:12 ` Joonsoo Kim
2020-07-07 7:44 ` [PATCH v4 05/11] mm/migrate: clear __GFP_RECLAIM for THP allocation for migration js1304
2020-07-07 11:40 ` Michal Hocko
2020-07-08 7:19 ` Joonsoo Kim
2020-07-08 7:48 ` Michal Hocko
2020-07-09 3:26 ` Joonsoo Kim
2020-07-07 12:17 ` Vlastimil Babka
2020-07-08 7:17 ` Joonsoo Kim
2020-07-09 7:17 ` Joonsoo Kim
2020-07-07 7:44 ` [PATCH v4 06/11] mm/migrate: make a standard migration target allocation function js1304
2020-07-07 11:43 ` Michal Hocko
2020-07-07 14:49 ` Vlastimil Babka
2020-07-07 19:00 ` Michal Hocko
2020-07-09 7:15 ` Joonsoo Kim
2020-07-09 10:28 ` Michal Hocko
2020-07-07 7:44 ` js1304 [this message]
2020-07-07 11:46 ` [PATCH v4 07/11] mm/gup: use a standard migration target allocation callback Michal Hocko
2020-07-08 7:21 ` Joonsoo Kim
2020-07-07 7:44 ` [PATCH v4 08/11] mm/mempolicy: " js1304
2020-07-07 7:44 ` [PATCH v4 09/11] mm/page_alloc: remove a wrapper for alloc_migration_target() js1304
2020-07-07 7:44 ` [PATCH v4 10/11] mm/memory-failure: " js1304
2020-07-07 11:48 ` Michal Hocko
2020-07-07 15:03 ` Vlastimil Babka
2020-07-07 18:55 ` Michal Hocko
2020-07-07 15:00 ` Vlastimil Babka
2020-07-07 7:44 ` [PATCH v4 11/11] mm/memory_hotplug: " js1304
2020-07-07 11:52 ` Michal Hocko
2020-07-07 15:09 ` Vlastimil Babka
2020-07-09 3:25 ` 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=1594107889-32228-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).