dma: get_user_pages -> get_user_pages_fast
PATCH 1/1 dma: get_user_pages -> get_user_pages_fast
There doesn't seem to be any advantage to using get_user_pages, so switch iovlock to get_user_pages_fast instead.
---
Lightly tested. This patch is on top of the bugfix patch I posted previously.
drivers/dma/iovlock.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-)
drivers/dma/iovlock.c +2 -8
@@ -95,17 +95,11 @@ struct dma_pinned_list *dma_pin_iovec_pages(struct iovec *iov, size_t len) pages += page_list->nr_pages;/* pin pages down */ -down_read (¤t->mm->mmap_sem); - ret =get_user_pages ( - current, - current->mm, + ret =get_user_pages_fast ( (unsigned long ) iov[i].iov_base, page_list->nr_pages,1 ,/* write */ -0 ,/* force */ - page_list->pages, -NULL ); -up_read (¤t->mm->mmap_sem); + page_list->pages);if (unlikely (ret <0 )) goto unpin;
Signature · 1 line
1.7.3-rc1
Quoted 18 lines · Michael S. Tsirkin
There doesn't seem to be any advantage to using
get_user_pages, so switch iovlock toget_user_pages_fastinstead.Signed-off-by Michael S. Tsirkin <[email protected]>---
Lightly tested. This patch is on top of the bugfix patch I posted previously.
drivers/dma/iovlock.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-)drivers/dma/iovlock.c +0
-0
drivers/dma/iovlock.c struct dma_pinned_list *dma_pin_iovec_pages(struct iovec *iov, size_t len) · line 100
Quoted 10 lines
drivers/dma/iovlock.c +1
-4@@ -95,17 +95,11 @@ struct dma_pinned_list *dma_pin_iovec_pages(struct iovec *iov, size_t len) pages += page_list->nr_pages;/* pin pages down */ -down_read (¤t->mm->mmap_sem); - ret = get_user_pages( - current, - current->mm, + ret = get_user_pages_fast( (unsigned long) iov[i].iov_base, page_list->nr_pages,
What's the actual nr_pages here? Is it limited to some small number or can it be arbitrarily large?
Quoted 9 lines
drivers/dma/iovlock.c +1
-41 ,/* write */ -0 ,/* force */ - page_list->pages, - NULL); -up_read (¤t->mm->mmap_sem); + page_list->pages);if (unlikely (ret <0 )) goto unpin;
Quoted 39 lines · Peter Zijlstra
Quoted 18 lines · Michael S. Tsirkin
There doesn't seem to be any advantage to using
get_user_pages, so switch iovlock toget_user_pages_fastinstead.Signed-off-by Michael S. Tsirkin <[email protected]>---
Lightly tested. This patch is on top of the bugfix patch I posted previously.
drivers/dma/iovlock.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-)drivers/dma/iovlock.c +0
-0drivers/dma/iovlock.c struct dma_pinned_list *dma_pin_iovec_pages(struct iovec *iov, size_t len) · line 100
Quoted 10 lines
drivers/dma/iovlock.c +1
-4@@ -95,17 +95,11 @@ struct dma_pinned_list *dma_pin_iovec_pages(struct iovec *iov, size_t len) pages += page_list->nr_pages;/* pin pages down */ -down_read (¤t->mm->mmap_sem); - ret = get_user_pages( - current, - current->mm, + ret = get_user_pages_fast( (unsigned long) iov[i].iov_base, page_list->nr_pages,What's the actual
nr_pageshere? Is it limited to some small number or can it be arbitrarily large?Quoted 7 lines
drivers/dma/iovlock.c +1
-41 ,/* write */ -0 ,/* force */ - page_list->pages, - NULL); -up_read (¤t->mm->mmap_sem); + page_list->pages);
Quoted 3 lines
drivers/dma/iovlock.c struct dma_pinned_list *dma_pin_iovec_pages(struct iovec *iov, size_t len) · line 105
Quoted 2 lines
drivers/dma/iovlock.c +0
-0if (unlikely (ret <0 )) goto unpin;
I think it can get arbitrarily large: just above this is this code:
len -= iov[i].iov_len;
if (!access_ok(VERIFY_WRITE, iov[i].iov_base, iov[i].iov_len))
goto unpin;
page_list->nr_pages = num_pages_spanned(&iov[i]);part of this is a bug: we should be locking at most len bytes. This could be solved by an untested patch below.
Comments?
We probably should set a limit on the number of pages, too:
currently there could be a large # of very small chunks in the iovec.
---
drivers/dma/iovlock.c +14 -11
@@ -32,11 +32,11 @@#include <asm/io.h> #include <asm/uaccess.h> -static int num_pages_spanned (struct iovec *iov) +static int num_pages_spanned (void __user *iov_base,size_t iov_len) {return - ((PAGE_ALIGN ((unsigned long )iov->iov_base + iov->iov_len) - - ((unsigned long )iov->iov_base &PAGE_MASK )) >>PAGE_SHIFT ); + ((PAGE_ALIGN ((unsigned long )iov_base + iov_len) - + ((unsigned long )iov_base &PAGE_MASK )) >>PAGE_SHIFT ); }/*
@@ -54,19 +54,21 @@ struct dma_pinned_list *dma_pin_iovec_pages(struct iovec *iov, size_t len)int i;int ret;int nr_iovecs =0 ; -int iovec_len_used =0 ;int iovec_pages_used =0 ; +size_t l = len;/* don't pin down non-user-based iovecs */ if (segment_eq (get_fs (),KERNEL_DS ))return NULL ;/* determine how many iovecs/pages there are, up front */ -do { - iovec_len_used += iov[nr_iovecs].iov_len; - iovec_pages_used +=num_pages_spanned (&iov[nr_iovecs]); +while (l) { +size_t s =min (l, iov[nr_iovecs].iov_len); + l -= s; + iovec_pages_used +=num_pages_spanned (iov[nr_iovecs].iov_base, + s); nr_iovecs++; - }while (iovec_len_used < len); + }/* single kmalloc for pinned list, page_list[], and the page arrays */ local_list = kmalloc(sizeof(*local_list)
@@ -82,13 +84,14 @@ struct dma_pinned_list *dma_pin_iovec_pages(struct iovec *iov, size_t len)for (i =0 ; i < nr_iovecs; i++) {struct dma_page_list *page_list = &local_list->page_list[i]; +size_t s =min (len, iov[nr_iovecs].iov_len); - len -= iov[i].iov_len; + len -= s; -if (!access_ok (VERIFY_WRITE , iov[i].iov_base, iov[i].iov_len)) +if (!access_ok (VERIFY_WRITE , iov[i].iov_base, s)) goto unpin; - page_list->nr_pages =num_pages_spanned (&iov[i]); + page_list->nr_pages =num_pages_spanned (iov[i].iov_base, s); page_list->base_address = iov[i].iov_base; page_list->pages = pages;
Quoted 2 lines · Michael S. Tsirkin
We probably should set a limit on the number of pages, too:
currently there could be a large # of very small chunks in the iovec.
Well, there's also the gup_fast batch stuff that I keep forgetting to push:
http://lkml.org/lkml/2009/6/24/457
Which would solve that part.