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 2/8] mm/migrate: move migration helper from .h to .c
Date: Tue, 23 Jun 2020 15:13:42 +0900 [thread overview]
Message-ID: <1592892828-1934-3-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>
It's not performance sensitive function. Move it to .c.
This is a preparation step for future change.
Acked-by: Mike Kravetz <mike.kravetz@oracle.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Reviewed-by: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@lge.com>
---
include/linux/migrate.h | 33 +++++----------------------------
mm/migrate.c | 29 +++++++++++++++++++++++++++++
2 files changed, 34 insertions(+), 28 deletions(-)
diff --git a/include/linux/migrate.h b/include/linux/migrate.h
index 3e546cb..1d70b4a 100644
--- a/include/linux/migrate.h
+++ b/include/linux/migrate.h
@@ -31,34 +31,6 @@ enum migrate_reason {
/* In mm/debug.c; also keep sync with include/trace/events/migrate.h */
extern const char *migrate_reason_names[MR_TYPES];
-static inline struct page *new_page_nodemask(struct page *page,
- int preferred_nid, nodemask_t *nodemask)
-{
- gfp_t gfp_mask = GFP_USER | __GFP_MOVABLE | __GFP_RETRY_MAYFAIL;
- unsigned int order = 0;
- struct page *new_page = NULL;
-
- if (PageHuge(page))
- return alloc_huge_page_nodemask(page_hstate(compound_head(page)),
- preferred_nid, nodemask);
-
- if (PageTransHuge(page)) {
- gfp_mask |= GFP_TRANSHUGE;
- order = HPAGE_PMD_ORDER;
- }
-
- if (PageHighMem(page) || (zone_idx(page_zone(page)) == ZONE_MOVABLE))
- gfp_mask |= __GFP_HIGHMEM;
-
- new_page = __alloc_pages_nodemask(gfp_mask, order,
- preferred_nid, nodemask);
-
- if (new_page && PageTransHuge(new_page))
- prep_transhuge_page(new_page);
-
- return new_page;
-}
-
#ifdef CONFIG_MIGRATION
extern void putback_movable_pages(struct list_head *l);
@@ -67,6 +39,8 @@ extern int migrate_page(struct address_space *mapping,
enum migrate_mode mode);
extern int migrate_pages(struct list_head *l, new_page_t new, free_page_t free,
unsigned long private, enum migrate_mode mode, int reason);
+extern struct page *new_page_nodemask(struct page *page,
+ int preferred_nid, nodemask_t *nodemask);
extern int isolate_movable_page(struct page *page, isolate_mode_t mode);
extern void putback_movable_page(struct page *page);
@@ -85,6 +59,9 @@ static inline int migrate_pages(struct list_head *l, new_page_t new,
free_page_t free, unsigned long private, enum migrate_mode mode,
int reason)
{ return -ENOSYS; }
+static inline struct page *new_page_nodemask(struct page *page,
+ int preferred_nid, nodemask_t *nodemask)
+ { return NULL; }
static inline int isolate_movable_page(struct page *page, isolate_mode_t mode)
{ return -EBUSY; }
diff --git a/mm/migrate.c b/mm/migrate.c
index c95912f..6b5c75b 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -1536,6 +1536,35 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page,
return rc;
}
+struct page *new_page_nodemask(struct page *page,
+ int preferred_nid, nodemask_t *nodemask)
+{
+ gfp_t gfp_mask = GFP_USER | __GFP_MOVABLE | __GFP_RETRY_MAYFAIL;
+ unsigned int order = 0;
+ struct page *new_page = NULL;
+
+ if (PageHuge(page))
+ return alloc_huge_page_nodemask(
+ page_hstate(compound_head(page)),
+ preferred_nid, nodemask);
+
+ if (PageTransHuge(page)) {
+ gfp_mask |= GFP_TRANSHUGE;
+ order = HPAGE_PMD_ORDER;
+ }
+
+ if (PageHighMem(page) || (zone_idx(page_zone(page)) == ZONE_MOVABLE))
+ gfp_mask |= __GFP_HIGHMEM;
+
+ new_page = __alloc_pages_nodemask(gfp_mask, order,
+ preferred_nid, nodemask);
+
+ if (new_page && PageTransHuge(new_page))
+ prep_transhuge_page(new_page);
+
+ return new_page;
+}
+
#ifdef CONFIG_NUMA
static int store_status(int __user *status, int start, int value, int nr)
--
2.7.4
next prev parent reply other threads:[~2020-06-23 6:14 UTC|newest]
Thread overview: 62+ 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 ` js1304 [this message]
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-06-26 4:02 ` Joonsoo Kim
2020-07-02 16:13 ` Vlastimil Babka
2020-07-03 0:55 ` Joonsoo Kim
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 4:49 ` Joonsoo Kim
2020-06-26 7:23 ` Michal Hocko
2020-06-29 6:27 ` Joonsoo Kim
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:30 ` Joonsoo Kim
2020-06-30 6:42 ` Michal Hocko
2020-06-30 7:22 ` Joonsoo Kim
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 5:02 ` Joonsoo Kim
2020-06-26 7:33 ` Michal Hocko
2020-06-29 6:41 ` Joonsoo Kim
2020-06-29 6:41 ` Joonsoo Kim
2020-06-29 8:03 ` Michal Hocko
2020-06-30 7:19 ` Joonsoo Kim
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-06-26 5:03 ` Joonsoo Kim
2020-07-03 15:56 ` Vlastimil Babka
2020-07-06 8:34 ` Joonsoo Kim
2020-07-06 8:34 ` Joonsoo Kim
2020-06-23 6:13 ` [PATCH v3 7/8] mm/mempolicy: " js1304
2020-06-25 12:09 ` Michal Hocko
2020-07-03 15:59 ` Vlastimil Babka
2020-07-08 1:20 ` Qian Cai
2020-07-08 6:45 ` Michal Hocko
2020-10-08 3:21 ` Hugh Dickins
2020-10-08 3:21 ` Hugh Dickins
2020-10-08 17:29 ` Mike Kravetz
2020-10-09 5:50 ` Hugh Dickins
2020-10-09 5:50 ` Hugh Dickins
2020-10-09 17:42 ` Mike Kravetz
2020-10-09 22:23 ` Hugh Dickins
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
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-3-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.