From: Joao Martins <joao.m.martins@oracle.com>
To: linux-mm@kvack.org
Cc: linux-nvdimm@lists.01.org, Matthew Wilcox <willy@infradead.org>,
Jason Gunthorpe <jgg@ziepe.ca>,
Muchun Song <songmuchun@bytedance.com>,
Mike Kravetz <mike.kravetz@oracle.com>,
Andrew Morton <akpm@linux-foundation.org>,
Joao Martins <joao.m.martins@oracle.com>
Subject: [PATCH RFC 8/9] RDMA/umem: batch page unpin in __ib_mem_release()
Date: Tue, 8 Dec 2020 17:29:00 +0000 [thread overview]
Message-ID: <20201208172901.17384-10-joao.m.martins@oracle.com> (raw)
In-Reply-To: <20201208172901.17384-1-joao.m.martins@oracle.com>
Take advantage of the newly added unpin_user_pages() batched
refcount update, by calculating a page array from an SGL
(same size as the one used in ib_mem_get()) and call
unpin_user_pages() with that.
unpin_user_pages() will check on consecutive pages that belong
to the same compound page set and batch the refcount update in
a single write.
Running a test program which calls mr reg/unreg on a 1G in size
and measures cost of both operations together (in a guest using rxe)
with device-dax and hugetlbfs:
Before:
159 rounds in 5.027 sec: 31617.923 usec / round (device-dax)
466 rounds in 5.009 sec: 10748.456 usec / round (hugetlbfs)
After:
305 rounds in 5.010 sec: 16426.047 usec / round (device-dax)
1073 rounds in 5.004 sec: 4663.622 usec / round (hugetlbfs)
We also see similar improvements on a setup with pmem and RDMA hardware.
Signed-off-by: Joao Martins <joao.m.martins@oracle.com>
---
drivers/infiniband/core/umem.c | 25 ++++++++++++++++++++++---
1 file changed, 22 insertions(+), 3 deletions(-)
diff --git a/drivers/infiniband/core/umem.c b/drivers/infiniband/core/umem.c
index e9fecbdf391b..493cfdcf7381 100644
--- a/drivers/infiniband/core/umem.c
+++ b/drivers/infiniband/core/umem.c
@@ -44,20 +44,40 @@
#include "uverbs.h"
+#define PAGES_PER_LIST (PAGE_SIZE / sizeof(struct page *))
+
static void __ib_umem_release(struct ib_device *dev, struct ib_umem *umem, int dirty)
{
+ bool make_dirty = umem->writable && dirty;
+ struct page **page_list = NULL;
struct sg_page_iter sg_iter;
+ unsigned long nr = 0;
struct page *page;
+ page_list = (struct page **) __get_free_page(GFP_KERNEL);
+
if (umem->nmap > 0)
ib_dma_unmap_sg(dev, umem->sg_head.sgl, umem->sg_nents,
DMA_BIDIRECTIONAL);
for_each_sg_page(umem->sg_head.sgl, &sg_iter, umem->sg_nents, 0) {
page = sg_page_iter_page(&sg_iter);
- unpin_user_pages_dirty_lock(&page, 1, umem->writable && dirty);
+ if (page_list)
+ page_list[nr++] = page;
+
+ if (!page_list) {
+ unpin_user_pages_dirty_lock(&page, 1, make_dirty);
+ } else if (nr == PAGES_PER_LIST) {
+ unpin_user_pages_dirty_lock(page_list, nr, make_dirty);
+ nr = 0;
+ }
}
+ if (nr)
+ unpin_user_pages_dirty_lock(page_list, nr, make_dirty);
+
+ if (page_list)
+ free_page((unsigned long) page_list);
sg_free_table(&umem->sg_head);
}
@@ -212,8 +232,7 @@ struct ib_umem *ib_umem_get(struct ib_device *device, unsigned long addr,
cond_resched();
ret = pin_user_pages_fast(cur_base,
min_t(unsigned long, npages,
- PAGE_SIZE /
- sizeof(struct page *)),
+ PAGES_PER_LIST),
gup_flags | FOLL_LONGTERM, page_list);
if (ret < 0)
goto umem_release;
--
2.17.1
_______________________________________________
Linux-nvdimm mailing list -- linux-nvdimm@lists.01.org
To unsubscribe send an email to linux-nvdimm-leave@lists.01.org
next prev parent reply other threads:[~2020-12-08 17:30 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-08 17:28 [PATCH RFC 0/9] mm, sparse-vmemmap: Introduce compound pagemaps Joao Martins
2020-12-08 17:28 ` [PATCH RFC 1/9] memremap: add ZONE_DEVICE support for compound pages Joao Martins
2020-12-09 5:59 ` John Hubbard
2020-12-09 6:33 ` Matthew Wilcox
2020-12-09 13:12 ` Joao Martins
2021-02-20 1:43 ` Dan Williams
2021-02-22 11:24 ` Joao Martins
2021-02-22 20:37 ` Dan Williams
2021-02-23 15:46 ` Joao Martins
2021-02-23 16:50 ` Dan Williams
2021-02-23 17:18 ` Joao Martins
2021-02-23 18:18 ` Dan Williams
2021-03-10 18:12 ` Joao Martins
2021-03-12 5:54 ` Dan Williams
2021-02-20 1:24 ` Dan Williams
2021-02-22 11:09 ` Joao Martins
2020-12-08 17:28 ` [PATCH RFC 2/9] sparse-vmemmap: Consolidate arguments in vmemmap section populate Joao Martins
2020-12-09 6:16 ` John Hubbard
2020-12-09 13:51 ` Joao Martins
2021-02-20 1:49 ` Dan Williams
2021-02-22 11:26 ` Joao Martins
2020-12-08 17:28 ` [PATCH RFC 3/9] sparse-vmemmap: Reuse vmemmap areas for a given mhp_params::align Joao Martins
2020-12-08 17:38 ` Joao Martins
2020-12-08 17:28 ` [PATCH RFC 3/9] sparse-vmemmap: Reuse vmemmap areas for a given page size Joao Martins
2021-02-20 3:34 ` Dan Williams
2021-02-22 11:42 ` Joao Martins
2021-02-22 22:40 ` Dan Williams
2021-02-23 15:46 ` Joao Martins
2020-12-08 17:28 ` [PATCH RFC 4/9] mm/page_alloc: Reuse tail struct pages for compound pagemaps Joao Martins
2021-02-20 6:17 ` Dan Williams
2021-02-22 12:01 ` Joao Martins
2020-12-08 17:28 ` [PATCH RFC 5/9] device-dax: Compound pagemap support Joao Martins
2020-12-08 17:28 ` [PATCH RFC 6/9] mm/gup: Grab head page refcount once for group of subpages Joao Martins
2020-12-09 4:40 ` John Hubbard
2020-12-09 13:44 ` Joao Martins
[not found] ` <20201208194905.GQ5487@ziepe.ca>
2020-12-09 11:05 ` Joao Martins
[not found] ` <20201209151505.GV5487@ziepe.ca>
2020-12-09 16:02 ` Joao Martins
[not found] ` <20201209162438.GW5487@ziepe.ca>
2020-12-09 17:27 ` Joao Martins
2020-12-09 18:14 ` Matthew Wilcox
2020-12-10 15:43 ` Joao Martins
2020-12-08 17:28 ` [PATCH RFC 7/9] mm/gup: Decrement head page " Joao Martins
[not found] ` <20201208193446.GP5487@ziepe.ca>
2020-12-09 5:06 ` John Hubbard
2020-12-09 12:17 ` Joao Martins
2020-12-17 19:05 ` Joao Martins
[not found] ` <20201217200530.GK5487@ziepe.ca>
2020-12-17 22:34 ` Joao Martins
2020-12-19 2:06 ` John Hubbard
2020-12-19 13:10 ` Joao Martins
2020-12-08 17:29 ` Joao Martins [this message]
2020-12-09 5:18 ` [PATCH RFC 8/9] RDMA/umem: batch page unpin in __ib_mem_release() John Hubbard
[not found] ` <20201208192935.GA1908088@ziepe.ca>
2020-12-09 10:59 ` Joao Martins
2020-12-19 13:15 ` Joao Martins
2020-12-08 17:29 ` [PATCH RFC 9/9] mm: Add follow_devmap_page() for devdax vmas Joao Martins
2020-12-09 5:23 ` John Hubbard
[not found] ` <20201208195754.GR5487@ziepe.ca>
2020-12-09 8:05 ` Christoph Hellwig
2020-12-09 11:19 ` Joao Martins
2020-12-09 9:38 ` [PATCH RFC 0/9] mm, sparse-vmemmap: Introduce compound pagemaps David Hildenbrand
2020-12-09 9:52 ` [External] " Muchun Song
2021-02-20 1:18 ` Dan Williams
2021-02-22 11:06 ` Joao Martins
2021-02-22 14:32 ` Joao Martins
2021-02-23 16:28 ` Joao Martins
2021-02-23 16:44 ` Dan Williams
2021-02-23 17:15 ` Joao Martins
2021-02-23 18:15 ` Dan Williams
[not found] ` <20210223185435.GO2643399@ziepe.ca>
2021-02-23 22:48 ` Dan Williams
[not found] ` <20210223230723.GP2643399@ziepe.ca>
2021-02-24 0:14 ` Dan Williams
[not found] ` <20210224010017.GQ2643399@ziepe.ca>
2021-02-24 1:32 ` Dan Williams
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=20201208172901.17384-10-joao.m.martins@oracle.com \
--to=joao.m.martins@oracle.com \
--cc=akpm@linux-foundation.org \
--cc=jgg@ziepe.ca \
--cc=linux-mm@kvack.org \
--cc=linux-nvdimm@lists.01.org \
--cc=mike.kravetz@oracle.com \
--cc=songmuchun@bytedance.com \
--cc=willy@infradead.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;
as well as URLs for NNTP newsgroup(s).