leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vmw_vmci: Convert driver to use get_user_pages_fast()

Browse Source 
Convert vmci_host_setup_notify() and qp_host_get_user_memory() to use
get_user_pages_fast() instead of get_user_pages(). Note that
qp_host_get_user_memory() was using mmap_sem for writing without an
apparent reason.

CC: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jan Kara 2013-10-02 16:27:47 +02:00 committed by Greg Kroah-Hartman
parent af190494f9
commit 240ddd495a
2 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/misc/vmw_vmci/vmci_host.c
View File

@ -243,11 +243,7 @@ static int vmci_host_setup_notify(struct vmci_ctx *context,
/* /*
* Lock physical page backing a given user VA. * Lock physical page backing a given user VA.
*/ */
down_read(&current->mm->mmap_sem); retval = get_user_pages_fast(PAGE_ALIGN(uva), 1, 1, &page);
retval = get_user_pages(current, current->mm,
PAGE_ALIGN(uva),
1, 1, 0, &page, NULL);
up_read(&current->mm->mmap_sem);
if (retval != 1) if (retval != 1)
return VMCI_ERROR_GENERIC; return VMCI_ERROR_GENERIC;

21
drivers/misc/vmw_vmci/vmci_queue_pair.c
View File

@ -732,13 +732,9 @@ static int qp_host_get_user_memory(u64 produce_uva,
int retval; int retval;
int err = VMCI_SUCCESS; int err = VMCI_SUCCESS;
down_write(&current->mm->mmap_sem); retval = get_user_pages_fast((uintptr_t) produce_uva,
retval = get_user_pages(current, produce_q->kernel_if->num_pages, 1,
current->mm, produce_q->kernel_if->u.h.header_page);
(uintptr_t) produce_uva,
produce_q->kernel_if->num_pages,
1, 0,
produce_q->kernel_if->u.h.header_page, NULL);
if (retval < produce_q->kernel_if->num_pages) { if (retval < produce_q->kernel_if->num_pages) {
pr_warn("get_user_pages(produce) failed (retval=%d)", retval); pr_warn("get_user_pages(produce) failed (retval=%d)", retval);
qp_release_pages(produce_q->kernel_if->u.h.header_page, qp_release_pages(produce_q->kernel_if->u.h.header_page,
@ -747,12 +743,9 @@ static int qp_host_get_user_memory(u64 produce_uva,
goto out; goto out;
} }
retval = get_user_pages(current, retval = get_user_pages_fast((uintptr_t) consume_uva,
current->mm, consume_q->kernel_if->num_pages, 1,
(uintptr_t) consume_uva, consume_q->kernel_if->u.h.header_page);
consume_q->kernel_if->num_pages,
1, 0,
consume_q->kernel_if->u.h.header_page, NULL);
if (retval < consume_q->kernel_if->num_pages) { if (retval < consume_q->kernel_if->num_pages) {
pr_warn("get_user_pages(consume) failed (retval=%d)", retval); pr_warn("get_user_pages(consume) failed (retval=%d)", retval);
qp_release_pages(consume_q->kernel_if->u.h.header_page, qp_release_pages(consume_q->kernel_if->u.h.header_page,
@ -763,8 +756,6 @@ static int qp_host_get_user_memory(u64 produce_uva,
} }
out: out:
up_write(&current->mm->mmap_sem);
return err; return err;
} }