From: Marek Szyprowski <m.szyprowski@samsung.com>
To: linux-mm@kvack.org, linaro-mm-sig@lists.linaro.org,
linux-kernel@vger.kernel.org
Cc: Marek Szyprowski <m.szyprowski@samsung.com>,
Kyungmin Park <kyungmin.park@samsung.com>,
Arnd Bergmann <arnd@arndb.de>,
Andrew Morton <akpm@linux-foundation.org>,
Mel Gorman <mel@csn.ul.ie>, Michal Nazarewicz <mina86@mina86.com>,
Minchan Kim <minchan@kernel.org>,
Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Subject: [RFC/PATCH 4/5] mm: get_user_pages: migrate out CMA pages when FOLL_DURABLE flag is set
Date: Tue, 05 Mar 2013 07:57:58 +0100 [thread overview]
Message-ID: <1362466679-17111-5-git-send-email-m.szyprowski@samsung.com> (raw)
In-Reply-To: <1362466679-17111-1-git-send-email-m.szyprowski@samsung.com>
When __get_user_pages() is called with FOLL_DURABLE flag, ensure that no
page in CMA pageblocks gets locked. This workarounds the permanent
migration failures caused by locking the pages by get_user_pages() call for
a long period of time.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
---
mm/internal.h | 12 ++++++++++++
mm/memory.c | 43 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 55 insertions(+)
diff --git a/mm/internal.h b/mm/internal.h
index 8562de0..a290d04 100644
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -105,6 +105,18 @@ extern void prep_compound_page(struct page *page, unsigned long order);
extern bool is_free_buddy_page(struct page *page);
#endif
+#ifdef CONFIG_CMA
+static inline int is_cma_page(struct page *page)
+{
+ unsigned mt = get_pageblock_migratetype(page);
+ if (mt == MIGRATE_ISOLATE || mt == MIGRATE_CMA)
+ return true;
+ return false;
+}
+#else
+#define is_cma_page(page) 0
+#endif
+
#if defined CONFIG_COMPACTION || defined CONFIG_CMA
/*
diff --git a/mm/memory.c b/mm/memory.c
index 2b9c2dd..f81b273 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -1650,6 +1650,45 @@ static inline int stack_guard_page(struct vm_area_struct *vma, unsigned long add
}
/**
+ * replace_cma_page() - migrate page out of CMA page blocks
+ * @page: source page to be migrated
+ *
+ * Returns either the old page (if migration was not possible) or the pointer
+ * to the newly allocated page (with additional reference taken).
+ *
+ * get_user_pages() might take a reference to a page for a long period of time,
+ * what prevent such page from migration. This is fatal to the preffered usage
+ * pattern of CMA pageblocks. This function replaces the given user page with
+ * a new one allocated from NON-MOVABLE pageblock, so locking CMA page can be
+ * avoided.
+ */
+static inline struct page *migrate_replace_cma_page(struct page *page)
+{
+ struct page *newpage = alloc_page(GFP_HIGHUSER);
+
+ if (!newpage)
+ goto out;
+
+ /*
+ * Take additional reference to the new page to ensure it won't get
+ * freed after migration procedure end.
+ */
+ get_page_foll(newpage);
+
+ if (migrate_replace_page(page, newpage) == 0)
+ return newpage;
+
+ put_page(newpage);
+ __free_page(newpage);
+out:
+ /*
+ * Migration errors in case of get_user_pages() might not
+ * be fatal to CMA itself, so better don't fail here.
+ */
+ return page;
+}
+
+/**
* __get_user_pages() - pin user pages in memory
* @tsk: task_struct of target task
* @mm: mm_struct of target mm
@@ -1884,6 +1923,10 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
}
if (IS_ERR(page))
return i ? i : PTR_ERR(page);
+
+ if ((gup_flags & FOLL_DURABLE) && is_cma_page(page))
+ page = migrate_replace_cma_page(page);
+
if (pages) {
pages[i] = page;
--
1.7.9.5
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2013-03-05 6:58 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-05 6:57 [RFC/PATCH 0/5] Contiguous Memory Allocator and get_user_pages() Marek Szyprowski
2013-03-05 6:57 ` [RFC/PATCH 1/5] mm: introduce migrate_replace_page() for migrating page to the given target Marek Szyprowski
2013-03-05 6:57 ` [RFC/PATCH 2/5] mm: get_user_pages: use static inline Marek Szyprowski
2013-03-05 6:57 ` [RFC/PATCH 3/5] mm: get_user_pages: use NON-MOVABLE pages when FOLL_DURABLE flag is set Marek Szyprowski
2013-03-06 2:02 ` Yasuaki Ishimatsu
2013-03-06 9:30 ` Lin Feng
2013-03-06 10:53 ` Lin Feng
2013-05-06 7:19 ` Tang Chen
2013-05-07 10:47 ` Marek Szyprowski
2013-05-08 5:33 ` Tang Chen
2013-03-05 6:57 ` Marek Szyprowski [this message]
2013-03-06 2:41 ` [RFC/PATCH 4/5] mm: get_user_pages: migrate out CMA " Yasuaki Ishimatsu
2013-03-05 6:57 ` [RFC/PATCH 5/5] media: vb2: use FOLL_DURABLE and __get_user_pages() to avoid CMA migration issues Marek Szyprowski
2013-03-05 8:50 ` [RFC/PATCH 0/5] Contiguous Memory Allocator and get_user_pages() Arnd Bergmann
2013-03-05 13:47 ` Marek Szyprowski
2013-03-05 19:59 ` Arnd Bergmann
2013-03-05 22:42 ` Daniel Vetter
2013-03-06 1:34 ` Yasuaki Ishimatsu
2013-03-06 8:47 ` Minchan Kim
2013-03-06 10:48 ` Marek Szyprowski
2013-03-06 11:57 ` Daniel Vetter
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=1362466679-17111-5-git-send-email-m.szyprowski@samsung.com \
--to=m.szyprowski@samsung.com \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=b.zolnierkie@samsung.com \
--cc=kyungmin.park@samsung.com \
--cc=linaro-mm-sig@lists.linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mel@csn.ul.ie \
--cc=mina86@mina86.com \
--cc=minchan@kernel.org \
/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