From: John Hubbard <jhubbard@xxxxxxxxxx>
This patch sets and restores the new page->dma_pinned_flags and
page->dma_pinned_count fields, but does not actually use them for
anything yet.
In order to use these fields at all, the page must be removed from
any LRU list that it's on. The patch also adds some precautions that
prevent the page from getting moved back onto an LRU, once it is
in this state.
This is in preparation to fix some problems that came up when using
devices (NICs, GPUs, for example) that set up direct access to a chunk
of system (CPU) memory, so that they can DMA to/from that memory.
Cc: Matthew Wilcox <willy@xxxxxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxxxx>
Cc: Christopher Lameter <cl@xxxxxxxxx>
Cc: Jason Gunthorpe <jgg@xxxxxxxx>
Cc: Dan Williams <dan.j.williams@xxxxxxxxx>
Cc: Jan Kara <jack@xxxxxxx>
Signed-off-by: John Hubbard <jhubbard@xxxxxxxxxx>
---
include/linux/mm.h | 19 +++++----------
mm/gup.c | 55 +++++++++++++++++++++++++++++++++++++++++--
mm/memcontrol.c | 8 +++++++
mm/swap.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 125 insertions(+), 15 deletions(-)
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 09fbb2c81aba..6c64b1e0b777 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -950,6 +950,10 @@ static inline void put_page(struct page *page)
{
page = compound_head(page);
+ VM_BUG_ON_PAGE(PageDmaPinned(page) &&
+ page_ref_count(page) <
+ atomic_read(&page->dma_pinned_count),
+ page);
/*
* For devmap managed pages we need to catch refcount transition from
* 2 to 1, when refcount reach one it means the page is free and we
@@ -964,21 +968,10 @@ static inline void put_page(struct page *page)
}
/*
- * put_user_page() - release a page that had previously been acquired via
- * a call to one of the get_user_pages*() functions.
- *
* Pages that were pinned via get_user_pages*() must be released via
- * either put_user_page(), or one of the put_user_pages*() routines
- * below. This is so that eventually, pages that are pinned via
- * get_user_pages*() can be separately tracked and uniquely handled. In
- * particular, interactions with RDMA and filesystems need special
- * handling.
+ * one of these put_user_pages*() routines:
*/
-static inline void put_user_page(struct page *page)
-{
- put_page(page);
-}
-
+void put_user_page(struct page *page);
void put_user_pages_dirty(struct page **pages, unsigned long npages);
void put_user_pages_dirty_lock(struct page **pages, unsigned long npages);
void put_user_pages(struct page **pages, unsigned long npages);
diff --git a/mm/gup.c b/mm/gup.c
index 55a41dee0340..ec1b26591532 100644
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -25,6 +25,50 @@ struct follow_page_context {
unsigned int page_mask;
};
+static void pin_page_for_dma(struct page *page)
+{
+ int ret = 0;
+ struct zone *zone;
+
+ page = compound_head(page);
+ zone = page_zone(page);
+
+ spin_lock(zone_gup_lock(zone));
+
+ if (PageDmaPinned(page)) {
+ /* Page was not on an LRU list, because it was DMA-pinned. */
+ VM_BUG_ON_PAGE(PageLRU(page), page);
+
+ atomic_inc(&page->dma_pinned_count);
+ goto unlock_out;
+ }
+
+ /*
+ * Note that page->dma_pinned_flags is unioned with page->lru.
+ * The rules are: reading PageDmaPinned(page) is allowed even if
+ * PageLRU(page) is true. That works because of pointer alignment:
+ * the PageDmaPinned bit is less than the pointer alignment, so
+ * either the page is on an LRU, or (maybe) the PageDmaPinned
+ * bit is set.
+ *
+ * However, SetPageDmaPinned requires that the page is both locked,
+ * and also, removed from the LRU.
+ *
+ * The other flag, PageDmaPinnedWasLru, is not used for
+ * synchronization, and so is only read or written after we are
+ * certain that the full page->dma_pinned_flags field is available.
+ */
+ ret = isolate_lru_page(page);
+ if (ret == 0)
+ SetPageDmaPinnedWasLru(page);
+
+ atomic_set(&page->dma_pinned_count, 1);
+ SetPageDmaPinned(page);
+
+unlock_out:
+ spin_unlock(zone_gup_lock(zone));
+}
+
static struct page *no_page_table(struct vm_area_struct *vma,
unsigned int flags)
{
@@ -670,7 +714,7 @@ static long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
unsigned int gup_flags, struct page **pages,
struct vm_area_struct **vmas, int *nonblocking)
{
- long ret = 0, i = 0;
+ long ret = 0, i = 0, j;
struct vm_area_struct *vma = NULL;
struct follow_page_context ctx = { NULL };
@@ -774,6 +818,10 @@ static long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
nr_pages -= page_increm;
} while (nr_pages);
out:
+ if (pages)
+ for (j = 0; j < i; j++)
+ pin_page_for_dma(pages[j]);
+
if (ctx.pgmap)
put_dev_pagemap(ctx.pgmap);
return i ? i : ret;
@@ -1852,7 +1900,7 @@ int get_user_pages_fast(unsigned long start, int nr_pages, int write,
struct page **pages)
{
unsigned long addr, len, end;
- int nr = 0, ret = 0;
+ int nr = 0, ret = 0, i;
start &= PAGE_MASK;
addr = start;
@@ -1873,6 +1921,9 @@ int get_user_pages_fast(unsigned long start, int nr_pages, int write,
ret = nr;
}
+ for (i = 0; i < nr; i++)
+ pin_page_for_dma(pages[i]);
+
if (nr < nr_pages) {
/* Try to get the remaining pages with get_user_pages */
start += nr << PAGE_SHIFT;
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 6e1469b80cb7..fbe61d13036f 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -2335,6 +2335,12 @@ static void lock_page_lru(struct page *page, int *isolated)
if (PageLRU(page)) {
struct lruvec *lruvec;
+ /*
+ * LRU and PageDmaPinned are mutually exclusive: they use the
+ * same fields in struct page, but for different purposes.
+ */
+ VM_BUG_ON_PAGE(PageDmaPinned(page), page);
+
lruvec = mem_cgroup_page_lruvec(page, zone->zone_pgdat);
ClearPageLRU(page);
del_page_from_lru_list(page, lruvec, page_lru(page));
@@ -2352,6 +2358,8 @@ static void unlock_page_lru(struct page *page, int isolated)
lruvec = mem_cgroup_page_lruvec(page, zone->zone_pgdat);
VM_BUG_ON_PAGE(PageLRU(page), page);
+ VM_BUG_ON_PAGE(PageDmaPinned(page), page);
+
SetPageLRU(page);
add_page_to_lru_list(page, lruvec, page_lru(page));
}
diff --git a/mm/swap.c b/mm/swap.c
index bb8c32595e5f..79f874ce78c3 100644
--- a/mm/swap.c
+++ b/mm/swap.c
@@ -151,6 +151,51 @@ static void __put_user_pages_dirty(struct page **pages,
}
}
+/*
+ * put_user_page() - release a page that had previously been acquired via
+ * a call to one of the get_user_pages*() functions.
+ *
+ * Usage: Pages that were pinned via get_user_pages*() must be released via
+ * either put_user_page(), or one of the put_user_pages*() routines
+ * below. This is so that eventually, pages that are pinned via
+ * get_user_pages*() can be separately tracked and uniquely handled. In
+ * particular, interactions with RDMA and filesystems need special
+ * handling.
+ */
+void put_user_page(struct page *page)
+{
+ struct zone *zone = page_zone(page);
+
+ page = compound_head(page);
+
+ if (atomic_dec_and_test(&page->dma_pinned_count)) {
+ spin_lock(zone_gup_lock(zone));
+ /* Re-check while holding the lock, because
+ * pin_page_for_dma() or get_page() may have snuck in right
+ * after the atomic_dec_and_test, and raised the count
+ * above zero again. If so, just leave the flag set. And
+ * because the atomic_dec_and_test above already got the
+ * accounting correct, no other action is required.
+ */
+ VM_BUG_ON_PAGE(PageLRU(page), page);
+ VM_BUG_ON_PAGE(!PageDmaPinned(page), page);
+
+ if (atomic_read(&page->dma_pinned_count) == 0) {
+ ClearPageDmaPinned(page);
+
+ if (PageDmaPinnedWasLru(page)) {
+ ClearPageDmaPinnedWasLru(page);
+ putback_lru_page(page);
+ }
+ }
+
+ spin_unlock(zone_gup_lock(zone));
+ }
+
+ put_page(page);
+}
+EXPORT_SYMBOL(put_user_page);
+
/*
* put_user_pages_dirty() - for each page in the @pages array, make
* that page (or its head page, if a compound page) dirty, if it was
@@ -903,6 +948,12 @@ void lru_add_page_tail(struct page *page, struct page *page_tail,
VM_BUG_ON_PAGE(!PageHead(page), page);
VM_BUG_ON_PAGE(PageCompound(page_tail), page);
VM_BUG_ON_PAGE(PageLRU(page_tail), page);
+
+ /*
+ * LRU and PageDmaPinned are mutually exclusive: they use the
+ * same fields in struct page, but for different purposes.
+ */
+ VM_BUG_ON_PAGE(PageDmaPinned(page_tail), page);
VM_BUG_ON(NR_CPUS != 1 &&
!spin_is_locked(&lruvec_pgdat(lruvec)->lru_lock));
@@ -942,6 +993,13 @@ static void __pagevec_lru_add_fn(struct page *page, struct lruvec *lruvec,
VM_BUG_ON_PAGE(PageLRU(page), page);
+ /*
+ * LRU and PageDmaPinned are mutually exclusive: they use the
+ * same fields in struct page, but for different purposes.
+ */
+ if (PageDmaPinned(page))
+ return;
+
SetPageLRU(page);
/*
* Page becomes evictable in two ways:
--
2.19.1
