From: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
To: linux-mm@kvack.org
Cc: Andrew Morton <akpm@linux-foundation.org>,
Mel Gorman <mel@csn.ul.ie>, Hugh Dickins <hughd@google.com>,
KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>,
Andi Kleen <andi@firstfloor.org>,
linux-kernel@vger.kernel.org
Subject: [PATCH 7/9] mbind: enable mbind() to migrate hugepage
Date: Thu, 21 Feb 2013 14:41:46 -0500 [thread overview]
Message-ID: <1361475708-25991-8-git-send-email-n-horiguchi@ah.jp.nec.com> (raw)
In-Reply-To: <1361475708-25991-1-git-send-email-n-horiguchi@ah.jp.nec.com>
This patch enables mbind(2) to migrate hugepages.
Page collecting function check_range() are already aware of hugepage
by the previous patch in this series.
Signed-off-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
---
include/linux/hugetlb.h | 3 +++
mm/hugetlb.c | 2 +-
mm/mempolicy.c | 15 ++++++---------
mm/migrate.c | 7 ++++++-
4 files changed, 16 insertions(+), 11 deletions(-)
diff --git v3.8.orig/include/linux/hugetlb.h v3.8/include/linux/hugetlb.h
index eb33df5..86a4d78 100644
--- v3.8.orig/include/linux/hugetlb.h
+++ v3.8/include/linux/hugetlb.h
@@ -263,6 +263,8 @@ struct huge_bootmem_page {
#endif
};
+struct page *alloc_huge_page(struct vm_area_struct *vma,
+ unsigned long addr, int avoid_reserve);
struct page *alloc_huge_page_node(struct hstate *h, int nid);
/* arch callback */
@@ -358,6 +360,7 @@ static inline int hstate_index(struct hstate *h)
#else
struct hstate {};
+#define alloc_huge_page(v, a, r) NULL
#define alloc_huge_page_node(h, nid) NULL
#define alloc_bootmem_huge_page(h) NULL
#define hstate_file(f) NULL
diff --git v3.8.orig/mm/hugetlb.c v3.8/mm/hugetlb.c
index 86ffcb7..ccf9995 100644
--- v3.8.orig/mm/hugetlb.c
+++ v3.8/mm/hugetlb.c
@@ -1116,7 +1116,7 @@ static void vma_commit_reservation(struct hstate *h,
}
}
-static struct page *alloc_huge_page(struct vm_area_struct *vma,
+struct page *alloc_huge_page(struct vm_area_struct *vma,
unsigned long addr, int avoid_reserve)
{
struct hugepage_subpool *spool = subpool_vma(vma);
diff --git v3.8.orig/mm/mempolicy.c v3.8/mm/mempolicy.c
index 8627135..9f56c40 100644
--- v3.8.orig/mm/mempolicy.c
+++ v3.8/mm/mempolicy.c
@@ -1187,6 +1187,8 @@ static struct page *new_vma_page(struct page *page, unsigned long private, int *
vma = vma->vm_next;
}
+ if (PageHuge(page))
+ return alloc_huge_page(vma, address, 1);
/*
* if !vma, alloc_page_vma() will use task or system default policy
*/
@@ -1291,15 +1293,10 @@ static long do_mbind(unsigned long start, unsigned long len,
if (!err) {
int nr_failed = 0;
- if (!list_empty(&pagelist)) {
- WARN_ON_ONCE(flags & MPOL_MF_LAZY);
- nr_failed = migrate_pages(&pagelist, new_vma_page,
- (unsigned long)vma,
- false, MIGRATE_SYNC,
- MR_MEMPOLICY_MBIND);
- if (nr_failed)
- putback_lru_pages(&pagelist);
- }
+ WARN_ON_ONCE(flags & MPOL_MF_LAZY);
+ nr_failed = migrate_movable_pages(&pagelist, new_vma_page,
+ (unsigned long)vma, false,
+ MIGRATE_SYNC, MR_MEMPOLICY_MBIND);
if (nr_failed && (flags & MPOL_MF_STRICT))
err = -EIO;
diff --git v3.8.orig/mm/migrate.c v3.8/mm/migrate.c
index 36959d6..8c457e7 100644
--- v3.8.orig/mm/migrate.c
+++ v3.8/mm/migrate.c
@@ -974,7 +974,12 @@ static int unmap_and_move_huge_page(new_page_t get_new_page,
struct page *new_hpage = get_new_page(hpage, private, &result);
struct anon_vma *anon_vma = NULL;
- if (!new_hpage)
+ /*
+ * Getting a new hugepage with alloc_huge_page() (which can happen
+ * when migration is caused by mbind()) can return ERR_PTR value,
+ * so we need take care of the case here.
+ */
+ if (!new_hpage || IS_ERR_VALUE(new_hpage))
return -ENOMEM;
rc = -EAGAIN;
--
1.7.11.7
next prev parent reply other threads:[~2013-02-21 19:43 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-21 19:41 [RFC][PATCH 0/9] extend hugepage migration Naoya Horiguchi
2013-02-21 19:41 ` [PATCH 1/9] migrate: add migrate_entry_wait_huge() Naoya Horiguchi
2013-03-18 14:51 ` Michal Hocko
2013-03-19 0:06 ` Naoya Horiguchi
2013-03-19 23:57 ` Simon Jeons
2013-03-20 21:53 ` Naoya Horiguchi
2013-03-20 23:36 ` Simon Jeons
2013-04-04 4:57 ` Simon Jeons
2013-02-21 19:41 ` [PATCH 2/9] migrate: make core migration code aware of hugepage Naoya Horiguchi
2013-03-18 15:22 ` Michal Hocko
2013-03-18 15:33 ` Michal Hocko
2013-03-19 0:06 ` Naoya Horiguchi
2013-02-21 19:41 ` [PATCH 3/9] soft-offline: use migrate_pages() instead of migrate_huge_page() Naoya Horiguchi
2013-02-27 7:25 ` Chen Gong
2013-02-27 17:06 ` Naoya Horiguchi
2013-02-27 17:57 ` Naoya Horiguchi
2013-02-21 19:41 ` [PATCH 4/9] migrate: clean up migrate_huge_page() Naoya Horiguchi
2013-02-21 19:41 ` [PATCH 5/9] migrate: enable migrate_pages() to migrate hugepage Naoya Horiguchi
2013-03-18 15:40 ` Michal Hocko
2013-03-19 0:07 ` Naoya Horiguchi
2013-03-19 7:11 ` Michal Hocko
2013-03-20 6:12 ` Naoya Horiguchi
2013-03-20 7:41 ` Michal Hocko
2013-03-20 0:31 ` Simon Jeons
2013-03-20 21:59 ` Naoya Horiguchi
2013-03-21 0:06 ` Simon Jeons
2013-02-21 19:41 ` [PATCH 6/9] migrate: enable move_pages() " Naoya Horiguchi
2013-02-21 19:41 ` Naoya Horiguchi [this message]
2013-02-21 19:41 ` [PATCH 8/9] memory-hotplug: enable memory hotplug to handle hugepage Naoya Horiguchi
2013-02-23 7:05 ` Hillf Danton
2013-02-25 16:57 ` Naoya Horiguchi
2013-02-27 7:36 ` Chen Gong
2013-02-27 17:16 ` Naoya Horiguchi
2013-03-18 16:07 ` Michal Hocko
2013-03-20 3:55 ` Naoya Horiguchi
2013-03-20 7:57 ` Michal Hocko
2013-03-20 1:03 ` Simon Jeons
2013-03-20 22:05 ` Naoya Horiguchi
2013-03-20 23:55 ` Simon Jeons
2013-02-21 19:41 ` [PATCH 9/9] remove /proc/sys/vm/hugepages_treat_as_movable Naoya Horiguchi
2013-02-28 6:02 ` KOSAKI Motohiro
2013-02-28 18:16 ` Naoya Horiguchi
2013-03-18 15:51 ` Michal Hocko
2013-03-19 0:07 ` Naoya Horiguchi
2013-03-19 23:43 ` [RFC][PATCH 0/9] extend hugepage migration Simon Jeons
2013-03-20 21:35 ` Naoya Horiguchi
2013-03-20 23:49 ` Simon Jeons
2013-03-21 12:56 ` Michal Hocko
2013-03-21 23:46 ` Simon Jeons
[not found] ` <20130322081532.GC31457@dhcp22.suse.cz>
2013-04-05 1:14 ` Simon Jeons
2013-04-05 8:08 ` Michal Hocko
2013-04-05 9:00 ` Simon Jeons
2013-04-05 9:30 ` Michal Hocko
2013-04-07 0:32 ` Simon Jeons
2013-04-07 14:05 ` KOSAKI Motohiro
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=1361475708-25991-8-git-send-email-n-horiguchi@ah.jp.nec.com \
--to=n-horiguchi@ah.jp.nec.com \
--cc=akpm@linux-foundation.org \
--cc=andi@firstfloor.org \
--cc=hughd@google.com \
--cc=kosaki.motohiro@jp.fujitsu.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mel@csn.ul.ie \
/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).