get_user_pages_remote(), now with creative macros
Subsystems (35)
cover get_user_pages_remote(), now with creative macros
This is responding to some feedback from Ingo on the "get_user_pages_foreign()" patch:
http://lkml.kernel.org/r/[email protected]
This new series breaks apart some of the changes in that original patch and adds some backward-compatibility to allow old-style get_user_pages() arguments to not break the build. The macros to do this are "fun". See patch #2.
We also change the name to get_user_pages_remote().
This is a preparatory patch for the Memory Protection Keys work, but I am sending this separately for review to spare you from the ~30 other patches in the series that have not changed.
PATCH 1/3 mm: introduce get_user_pages_remote()
From: Dave Hansen <[email protected]>
For protection keys, we need to understand whether protections should be enforced in software or not. In general, we enforce protections when working on our own task, but not when on others. We call these "current" and "remote" operations.
This patch introduces a new get_user_pages() variant:
get_user_pages_remote()
Which is a replacement for when get_user_pages() is called on non-current tsk/mm.
We also introduce a new gup flag: FOLL_REMOTE which can be used for the "__" gup variants to get this new behavior.
The uprobes is_trap_at_addr() location holds mmap_sem and calls get_user_pages(current->mm) on an instruction address. This makes it a pretty unique gup caller. Being an instruction access and also really originating from the kernel (vs. the app), I opted to consider this a 'remote' access where protection keys will not be enforced.
Without protection keys, this patch should not change any behavior.
---
b/drivers/gpu/drm/etnaviv/etnaviv_gem.c | 6 +++--- b/drivers/gpu/drm/i915/i915_gem_userptr.c | 10 +++++----- b/drivers/infiniband/core/umem_odp.c | 8 ++++---- b/fs/exec.c | 8 ++++++-- b/include/linux/mm.h | 5 +++++ b/kernel/events/uprobes.c | 10 ++++++++-- b/mm/gup.c | 27 ++++++++++++++++++++++----- b/mm/memory.c | 2 +- b/mm/process_vm_access.c | 11 ++++++++--- b/security/tomoyo/domain.c | 9 ++++++++- b/virt/kvm/async_pf.c | 8 +++++++- 11 files changed, 77 insertions(+), 27 deletions(-)
drivers/gpu/drm/etnaviv/etnaviv_gem.c renamed from drivers/gpu/drm/etnaviv/etnaviv_gem.c~introduce-get_user_pages_remote +3 -3
@@ -753,9 +753,9 @@ static struct page **etnaviv_gem_userptrdown_read (&mm->mmap_sem);while (pinned < npages) { - ret =get_user_pages (task, mm, ptr, npages - pinned, - !etnaviv_obj->userptr.ro,0 , - pvec + pinned,NULL ); + ret =get_user_pages_remote (task, mm, ptr, npages - pinned, + !etnaviv_obj->userptr.ro,0 , + pvec + pinned,NULL );if (ret <0 )break ;
drivers/gpu/drm/i915/i915_gem_userptr.c renamed from drivers/gpu/drm/i915/i915_gem_userptr.c~introduce-get_user_pages_remote +5 -5
@@ -584,11 +584,11 @@ __i915_gem_userptr_get_pages_worker(strudown_read (&mm->mmap_sem);while (pinned < npages) { - ret =get_user_pages (work->task, mm, - obj->userptr.ptr + pinned *PAGE_SIZE , - npages - pinned, - !obj->userptr.read_only,0 , - pvec + pinned,NULL ); + ret =get_user_pages_remote (work->task, mm, + obj->userptr.ptr + pinned *PAGE_SIZE , + npages - pinned, + !obj->userptr.read_only,0 , + pvec + pinned,NULL );if (ret <0 )break ;
drivers/infiniband/core/umem_odp.c renamed from drivers/infiniband/core/umem_odp.c~introduce-get_user_pages_remote +4 -4
@@ -572,10 +572,10 @@ int ib_umem_odp_map_dma_pages(struct ib_* complex (and doesn't gain us much performance in most use * cases). */ - npages =get_user_pages (owning_process, owning_mm, user_virt, - gup_num_pages, - access_mask &ODP_WRITE_ALLOWED_BIT ,0 , - local_page_list,NULL ); + npages =get_user_pages_remote (owning_process, owning_mm, + user_virt, gup_num_pages, + access_mask &ODP_WRITE_ALLOWED_BIT , +0 , local_page_list,NULL );up_read (&owning_mm->mmap_sem);if (npages <0 )
fs/exec.c renamed from fs/exec.c~introduce-get_user_pages_remote +6 -2
@@ -198,8 +198,12 @@ static struct page *get_arg_page(struct return NULL; }#endif - ret =get_user_pages (current, bprm->mm, pos, -1 , write,1 , &page,NULL ); +/* +* We are doing an exec(). 'current' is the process +* doing the exec and bprm->mm is the new process's mm. +*/ + ret =get_user_pages_remote (current, bprm->mm, pos,1 , write, +1 , &page,NULL );if (ret <=0 )return NULL ;
include/linux/mm.h renamed from include/linux/mm.h~introduce-get_user_pages_remote +5 -0
@@ -1225,6 +1225,10 @@ long __get_user_pages(struct task_struct unsigned long start, unsigned long nr_pages, unsigned int foll_flags, struct page **pages, struct vm_area_struct **vmas, int *nonblocking); +long get_user_pages_remote (struct task_struct *tsk,struct mm_struct *mm, +unsigned long start,unsigned long nr_pages, +int write,int force,struct page **pages, +struct vm_area_struct **vmas); long get_user_pages(struct task_struct *tsk, struct mm_struct *mm, unsigned long start, unsigned long nr_pages, int write, int force, struct page **pages,
@@ -2168,6 +2172,7 @@ static inline struct page *follow_page(s#define FOLL_MIGRATION 0x400/* wait for page to replace migration entry */ #define FOLL_TRIED 0x800/* a retry, previous pass started an IO */ #define FOLL_MLOCK 0x1000/* lock present pages */ +#define FOLL_REMOTE 0x2000/* we are working on non-current tsk/mm */ typedef int (*pte_fn_t )(pte_t *pte,pgtable_t token,unsigned long addr,void *data);
kernel/events/uprobes.c renamed from kernel/events/uprobes.c~introduce-get_user_pages_remote +8 -2
@@ -299,7 +299,7 @@ int uprobe_write_opcode(struct mm_struct retry:/* Read the page with vaddr into memory */ - ret =get_user_pages (NULL , mm, vaddr,1 ,0 ,1 , &old_page, &vma); + ret =get_user_pages_remote (NULL , mm, vaddr,1 ,0 ,1 , &old_page, &vma);if (ret <=0 )return ret;
@@ -1700,7 +1700,13 @@ static int is_trap_at_addr(struct mm_strif (likely (result ==0 )) goto out; - result =get_user_pages (NULL , mm, vaddr,1 ,0 ,1 , &page,NULL ); +/* +* The NULL 'tsk' here ensures that any faults that occur here +* will not be accounted to the task. 'mm' *is* current->mm, +* but we treat this as a 'remote' access since it is +* essentially a kernel access to the memory. +*/ + result =get_user_pages_remote (NULL , mm, vaddr,1 ,0 ,1 , &page,NULL );if (result <0 )return result;
mm/gup.c renamed from mm/gup.c~introduce-get_user_pages_remote +22 -5
@@ -870,7 +870,7 @@ long get_user_pages_unlocked(struct taskEXPORT_SYMBOL (get_user_pages_unlocked);/* -* get_user_pages() - pin user pages in memory +* get_user_pages_remote() - pin user pages in memory * @tsk: the task_struct to use for page fault accounting, or * NULL if faults are not to be recorded. * @mm: mm_struct of target mm
@@ -924,12 +924,29 @@ EXPORT_SYMBOL(get_user_pages_unlocked);* should use get_user_pages because it cannot pass * FAULT_FLAG_ALLOW_RETRY to handle_mm_fault. */ -long get_user_pages (struct task_struct *tsk,struct mm_struct *mm, -unsigned long start,unsigned long nr_pages,int write, -int force,struct page **pages,struct vm_area_struct **vmas) +long get_user_pages_remote (struct task_struct *tsk,struct mm_struct *mm, +unsigned long start,unsigned long nr_pages, +int write,int force,struct page **pages, +struct vm_area_struct **vmas) {return __get_user_pages_locked (tsk, mm, start, nr_pages, write, force, - pages, vmas,NULL , false,FOLL_TOUCH ); + pages, vmas,NULL , false, +FOLL_TOUCH |FOLL_REMOTE ); +} +EXPORT_SYMBOL (get_user_pages_remote); + +/* +* This is the same as get_user_pages_remote() for the time +* being. +*/ +long get_user_pages (struct task_struct *tsk,struct mm_struct *mm, +unsigned long start,unsigned long nr_pages, +int write,int force,struct page **pages, +struct vm_area_struct **vmas) +{ +return __get_user_pages_locked (tsk, mm, start, nr_pages, + write, force, pages, vmas,NULL , false, +FOLL_TOUCH ); }EXPORT_SYMBOL (get_user_pages);
mm/memory.c renamed from mm/memory.c~introduce-get_user_pages_remote +1 -1
@@ -3664,7 +3664,7 @@ static int __access_remote_vm(struct tasvoid *maddr;struct page *page =NULL ; - ret =get_user_pages (tsk, mm, addr,1 , + ret =get_user_pages_remote (tsk, mm, addr,1 , write,1 , &page, &vma);if (ret <=0 ) {#ifndef CONFIG_HAVE_IOREMAP_PROT
mm/process_vm_access.c renamed from mm/process_vm_access.c~introduce-get_user_pages_remote +8 -3
@@ -98,9 +98,14 @@ static int process_vm_rw_single_vec(unsiint pages =min (nr_pages, max_pages_per_loop);size_t bytes; -/* Get the pages we're interested in */ - pages =get_user_pages_unlocked (task, mm, pa, pages, - vm_write,0 , process_pages); +/* +* Get the pages we're interested in. We must +* add FOLL_REMOTE because task/mm might not +* current/current->mm +*/ + pages =__get_user_pages_unlocked (task, mm, pa, pages, + vm_write,0 , process_pages, +FOLL_REMOTE );if (pages <=0 )return -EFAULT ;
security/tomoyo/domain.c renamed from security/tomoyo/domain.c~introduce-get_user_pages_remote +8 -1
@@ -874,7 +874,14 @@ bool tomoyo_dump_page(struct linux_binpr }/* Same with get_arg_page(bprm, pos, 0) in fs/exec.c */ #ifdef CONFIG_MMU -if (get_user_pages (current, bprm->mm, pos,1 ,0 ,1 , &page,NULL ) <=0 ) +/* +* This is called at execve() time in order to dig around +* in the argv/environment of the new proceess +* (represented by bprm). 'current' is the process doing +* the execve(). +*/ +if (get_user_pages_remote (current, bprm->mm, pos,1 , +0 ,1 , &page,NULL ) <=0 )return false;#else page = bprm->page[pos /PAGE_SIZE ];
virt/kvm/async_pf.c renamed from virt/kvm/async_pf.c~introduce-get_user_pages_remote +7 -1
@@ -79,7 +79,13 @@ static void async_pf_execute(struct workmight_sleep (); -get_user_pages_unlocked (NULL , mm, addr,1 ,1 ,0 ,NULL ); +/* +* This work is run asynchromously to the task which owns +* mm and might be done in another context, so we must +* use FOLL_REMOTE. +*/ +__get_user_pages_unlocked (NULL , mm, addr,1 ,1 ,0 ,NULL ,FOLL_REMOTE ); +kvm_async_page_present_sync (vcpu, apf);spin_lock (&vcpu->async_pf.lock);
_
PATCH 2/3 mm: overload get_user_pages() functions
In reply to Dave HansenFrom: Dave Hansen <[email protected]>
The concept here was a suggestion from Ingo. The implementation horrors are all mine.
This allows get_user_pages(), get_user_pages_unlocked(), and get_user_pages_locked() to be called with or without the leading tsk/mm arguments. We will give a compile-time warning about the old style being __deprecated and we will also WARN_ON() if the non-remote version is used for a remote-style access.
Doing this, folks will get nice warnings and will not break the build. This should be nice for -next and will hopefully let developers fix up their own code instead of maintainers needing to do it at merge time.
The way we do this is hideous. It uses the __VA_ARGS__ macro functionality to call different functions based on the number of arguments passed to the macro.
There's an additional hack to ensure that our EXPORT_SYMBOL() of the deprecated symbols doesn't trigger a warning.
We should be able to remove this mess as soon as -rc1 hits in the release after this is merged.
---
b/include/linux/mm.h | 77 ++++++++++++++++++++++++++++++++++++++++++++------- b/mm/gup.c | 62 +++++++++++++++++++++++++++++++---------- b/mm/nommu.c | 64 +++++++++++++++++++++++++++++------------- b/mm/util.c | 4 -- 4 files changed, 161 insertions(+), 46 deletions(-)
include/linux/mm.h renamed from include/linux/mm.h~gup-arg-helpers +67 -10
@@ -1229,24 +1229,81 @@ long get_user_pages_remote(struct task_s unsigned long start, unsigned long nr_pages, int write, int force, struct page **pages, struct vm_area_struct **vmas); -long get_user_pages (struct task_struct *tsk,struct mm_struct *mm, -unsigned long start,unsigned long nr_pages, -int write,int force,struct page **pages, -struct vm_area_struct **vmas); -long get_user_pages_locked (struct task_struct *tsk,struct mm_struct *mm, -unsigned long start,unsigned long nr_pages, -int write,int force,struct page **pages, -int *locked); +long get_user_pages6 (unsigned long start,unsigned long nr_pages, +int write,int force,struct page **pages, +struct vm_area_struct **vmas); +long get_user_pages_locked6 (unsigned long start,unsigned long nr_pages, +int write,int force,struct page **pages,int *locked);long __get_user_pages_unlocked (struct task_struct *tsk,struct mm_struct *mm,unsigned long start,unsigned long nr_pages,int write,int force,struct page **pages,unsigned int gup_flags); -long get_user_pages_unlocked (struct task_struct *tsk,struct mm_struct *mm, -unsigned long start,unsigned long nr_pages, +long get_user_pages_unlocked5 (unsigned long start,unsigned long nr_pages,int write,int force,struct page **pages);int get_user_pages_fast (unsigned long start,int nr_pages,int write,struct page **pages); +/* suppress warnings from use in EXPORT_SYMBOL() */ +#ifndef __DISABLE_GUP_DEPRECATED +#define __gup_deprecated __deprecated +#else +#define __gup_deprecated +#endif +/* +* These macros provide backward-compatibility with the old +* get_user_pages() variants which took tsk/mm. These +* functions/macros provide both compile-time __deprecated so we +* can catch old-style use and not break the build. The actual +* functions also have WARN_ON()s to let us know at runtime if +* the get_user_pages() should have been the "remote" variant. +* +* These are hideous, but temporary. +* +* If you run into one of these __deprecated warnings, look +* at how you are calling get_user_pages(). If you are calling +* it with current/current->mm as the first two arguments, +* simply remove those arguments. The behavior will be the same +* as it is now. If you are calling it on another task, use +* get_user_pages_remote() instead. +* +* Any questions? Ask Dave Hansen <[email protected]> +*/ +long +__gup_deprecated +get_user_pages8 (struct task_struct *tsk,struct mm_struct *mm, +unsigned long start,unsigned long nr_pages, +int write,int force,struct page **pages, +struct vm_area_struct **vmas); +#define GUP_MACRO (_1, _2, _3, _4, _5, _6, _7, _8, get_user_pages, ...) \ + get_user_pages +#define get_user_pages (...) GUP_MACRO(__VA_ARGS__, \ + get_user_pages8, \ + get_user_pages7, \ + get_user_pages6)(__VA_ARGS__) + +__gup_deprecated +long get_user_pages_locked8 (struct task_struct *tsk,struct mm_struct *mm, +unsigned long start,unsigned long nr_pages, +int write,int force,struct page **pages, +int *locked); +#define GUPL_MACRO (_1, _2, _3, _4, _5, _6, _7, get_user_pages_locked, ...) \ + get_user_pages_locked +#define get_user_pages_locked (...) GUPL_MACRO(__VA_ARGS__, \ + get_user_pages_locked7, \ + get_user_pages_locked6, \ + get_user_pages_locked5)(__VA_ARGS__) + +__gup_deprecated +long get_user_pages_unlocked7 (struct task_struct *tsk,struct mm_struct *mm, +unsigned long start,unsigned long nr_pages, +int write,int force,struct page **pages); +#define GUPU_MACRO (_1, _2, _3, _4, _5, _6, _7, get_user_pages_unlocked, ...) \ + get_user_pages_unlocked +#define get_user_pages_unlocked (...) GUPU_MACRO(__VA_ARGS__, \ + get_user_pages_unlocked7, \ + get_user_pages_unlocked6, \ + get_user_pages_unlocked5)(__VA_ARGS__) +/* Container for pinned pfns / pages */ struct frame_vector {unsigned int nr_allocated;/* Number of frames we have space for */
mm/gup.c renamed from mm/gup.c~gup-arg-helpers +48 -14
99 lines not on this page · raw message
mm/nommu.c renamed from mm/nommu.c~gup-arg-helpers +45 -19
103 lines not on this page · raw message
mm/util.c renamed from mm/util.c~gup-arg-helpers +1 -3
@@ -283,9 +283,7 @@ EXPORT_SYMBOL_GPL(__get_user_pages_fast)int __weak get_user_pages_fast (unsigned long start,int nr_pages,int write,struct page **pages) { -struct mm_struct *mm = current->mm; -return get_user_pages_unlocked (current, mm, start, nr_pages, - write,0 , pages); +return get_user_pages_unlocked (start, nr_pages, write,0 , pages); }EXPORT_SYMBOL_GPL (get_user_pages_fast);
_
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
PATCH 3/3 mm, gup: switch callers of get_user_pages() to not pass tsk/mm
In reply to Dave HansenFrom: Dave Hansen <[email protected]>
We will soon modify the vanilla get_user_pages() so it can no longer be used on mm/tasks other than 'current/current->mm', which is by far the most common way it is called. For now, we allow the old-style calls, but warn when they are used. (implemented in previous patch)
This patch switches all callers of:
get_user_pages()
get_user_pages_unlocked()
get_user_pages_locked()
to stop passing tsk/mm so they will no longer see the warnings.
---
b/arch/cris/arch-v32/drivers/cryptocop.c | 8 ++------ b/arch/ia64/kernel/err_inject.c | 3 +-- b/arch/mips/mm/gup.c | 3 +-- b/arch/s390/mm/gup.c | 4 +--- b/arch/sh/mm/gup.c | 2 +- b/arch/sparc/mm/gup.c | 2 +- b/arch/x86/mm/gup.c | 2 +- b/arch/x86/mm/mpx.c | 4 ++-- b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 3 +-- b/drivers/gpu/drm/radeon/radeon_ttm.c | 3 +-- b/drivers/gpu/drm/via/via_dmablit.c | 3 +-- b/drivers/infiniband/core/umem.c | 2 +- b/drivers/infiniband/hw/mthca/mthca_memfree.c | 3 +-- b/drivers/infiniband/hw/qib/qib_user_pages.c | 3 +-- b/drivers/infiniband/hw/usnic/usnic_uiom.c | 2 +- b/drivers/media/pci/ivtv/ivtv-udma.c | 4 ++-- b/drivers/media/pci/ivtv/ivtv-yuv.c | 10 ++++------ b/drivers/media/v4l2-core/videobuf-dma-sg.c | 3 +-- b/drivers/misc/mic/scif/scif_rma.c | 2 -- b/drivers/misc/sgi-gru/grufault.c | 3 +-- b/drivers/scsi/st.c | 2 -- b/drivers/video/fbdev/pvr2fb.c | 4 ++-- b/drivers/virt/fsl_hypervisor.c | 5 ++--- b/mm/frame_vector.c | 2 +- b/mm/gup.c | 6 ++++-- b/mm/ksm.c | 2 +- b/mm/mempolicy.c | 6 +++--- b/net/ceph/pagevec.c | 2 +- b/virt/kvm/kvm_main.c | 10 +++++----- 29 files changed, 44 insertions(+), 64 deletions(-)
arch/cris/arch-v32/drivers/cryptocop.c renamed from arch/cris/arch-v32/drivers/cryptocop.c~get_current_user_pages +2 -6
@@ -2719,9 +2719,7 @@ static int cryptocop_ioctl_process(struc/* Acquire the mm page semaphore. */ down_read (¤t->mm->mmap_sem); - err = get_user_pages(current, - current->mm, - (unsigned long int)(oper.indata + prev_ix), + err = get_user_pages((unsigned long int)(oper.indata + prev_ix), noinpages, 0, /* read access only for in data */ 0, /* no force */
@@ -2736,9 +2734,7 @@ static int cryptocop_ioctl_process(struc } noinpages = err;if (oper.do_cipher){ - err = get_user_pages(current, - current->mm, - (unsigned long int)oper.cipher_outdata, + err = get_user_pages((unsigned long int)oper.cipher_outdata, nooutpages, 1, /* write access for out data */ 0, /* no force */
arch/ia64/kernel/err_inject.c renamed from arch/ia64/kernel/err_inject.c~get_current_user_pages +1 -2
@@ -142,8 +142,7 @@ store_virtual_to_phys(struct device *devu64 virt_addr=simple_strtoull (buf,NULL ,16 );int ret; - ret =get_user_pages (current, current->mm, virt_addr, -1 ,VM_READ ,0 ,NULL ,NULL ); + ret =get_user_pages (virt_addr,1 ,VM_READ ,0 ,NULL ,NULL );if (ret<=0 ) {#ifdef ERR_INJ_DEBUG printk ("Virtual address %lx is not existing.\n" ,virt_addr);
arch/mips/mm/gup.c renamed from arch/mips/mm/gup.c~get_current_user_pages +1 -2
@@ -286,8 +286,7 @@ slow_irqon: start += nr <<PAGE_SHIFT ; pages += nr; - ret =get_user_pages_unlocked (current, mm, start, - (end - start) >>PAGE_SHIFT , + ret =get_user_pages_unlocked (start, (end - start) >>PAGE_SHIFT , write,0 , pages);/* Have to be a bit careful with return values */
arch/s390/mm/gup.c renamed from arch/s390/mm/gup.c~get_current_user_pages +1 -3
@@ -210,7 +210,6 @@ int __get_user_pages_fast(unsigned longint get_user_pages_fast (unsigned long start,int nr_pages,int write,struct page **pages) { -struct mm_struct *mm = current->mm;int nr, ret;might_sleep ();
@@ -222,8 +221,7 @@ int get_user_pages_fast(unsigned long st/* Try to get the remaining pages with get_user_pages */ start += nr <<PAGE_SHIFT ; pages += nr; - ret =get_user_pages_unlocked (current, mm, start, - nr_pages - nr, write,0 , pages); + ret =get_user_pages_unlocked (start, nr_pages - nr, write,0 , pages);/* Have to be a bit careful with return values */ if (nr >0 ) ret = (ret <0 ) ? nr : ret + nr;
arch/sh/mm/gup.c renamed from arch/sh/mm/gup.c~get_current_user_pages +1 -1
@@ -257,7 +257,7 @@ slow_irqon: start += nr <<PAGE_SHIFT ; pages += nr; - ret =get_user_pages_unlocked (current, mm, start, + ret =get_user_pages_unlocked (start, (end - start) >>PAGE_SHIFT , write,0 , pages);/* Have to be a bit careful with return values */
arch/sparc/mm/gup.c renamed from arch/sparc/mm/gup.c~get_current_user_pages +1 -1
@@ -237,7 +237,7 @@ slow: start += nr <<PAGE_SHIFT ; pages += nr; - ret =get_user_pages_unlocked (current, mm, start, + ret =get_user_pages_unlocked (start, (end - start) >>PAGE_SHIFT , write,0 , pages);/* Have to be a bit careful with return values */
arch/x86/mm/gup.c renamed from arch/x86/mm/gup.c~get_current_user_pages +1 -1
@@ -422,7 +422,7 @@ slow_irqon: start += nr <<PAGE_SHIFT ; pages += nr; - ret =get_user_pages_unlocked (current, mm, start, + ret =get_user_pages_unlocked (start, (end - start) >>PAGE_SHIFT , write,0 , pages);
arch/x86/mm/mpx.c renamed from arch/x86/mm/mpx.c~get_current_user_pages +2 -2
@@ -546,8 +546,8 @@ static int mpx_resolve_fault(long __userint nr_pages =1 ;int force =0 ; - gup_ret =get_user_pages (current, current->mm, (unsigned long )addr, - nr_pages, write, force,NULL ,NULL ); + gup_ret =get_user_pages ((unsigned long )addr, nr_pages, write, + force,NULL ,NULL );/* * get_user_pages() returns number of pages gotten. * 0 means we failed to fault in and get anything,
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c renamed from drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c~get_current_user_pages +1 -2
@@ -518,8 +518,7 @@ static int amdgpu_ttm_tt_pin_userptr(struint64_t userptr = gtt->userptr + pinned *PAGE_SIZE ;struct page **pages = ttm->pages + pinned; - r =get_user_pages (current, current->mm, userptr, num_pages, - write,0 , pages,NULL ); + r =get_user_pages (userptr, num_pages, write,0 , pages,NULL );if (r <0 ) goto release_pages;
drivers/gpu/drm/radeon/radeon_ttm.c renamed from drivers/gpu/drm/radeon/radeon_ttm.c~get_current_user_pages +1 -2
@@ -554,8 +554,7 @@ static int radeon_ttm_tt_pin_userptr(struint64_t userptr = gtt->userptr + pinned *PAGE_SIZE ;struct page **pages = ttm->pages + pinned; - r =get_user_pages (current, current->mm, userptr, num_pages, - write,0 , pages,NULL ); + r =get_user_pages (userptr, num_pages, write,0 , pages,NULL );if (r <0 ) goto release_pages;
drivers/gpu/drm/via/via_dmablit.c renamed from drivers/gpu/drm/via/via_dmablit.c~get_current_user_pages +1 -2
@@ -239,8 +239,7 @@ via_lock_all_dma_pages(drm_via_sg_info_tif (NULL == vsg->pages)return -ENOMEM ;down_read (¤t->mm->mmap_sem); - ret =get_user_pages (current, current->mm, - (unsigned long )xfer->mem_addr, + ret =get_user_pages ((unsigned long )xfer->mem_addr, vsg->num_pages, (vsg->direction ==DMA_FROM_DEVICE ),0 , vsg->pages,NULL );
drivers/infiniband/core/umem.c renamed from drivers/infiniband/core/umem.c~get_current_user_pages +1 -1
@@ -188,7 +188,7 @@ struct ib_umem *ib_umem_get(struct ib_uc sg_list_start = umem->sg_head.sgl;while (npages) { - ret =get_user_pages (current, current->mm, cur_base, + ret =get_user_pages (cur_base, min_t(unsigned long, npages,PAGE_SIZE /sizeof (struct page *)),1 , !umem->writable, page_list, vma_list);
drivers/infiniband/hw/mthca/mthca_memfree.c renamed from drivers/infiniband/hw/mthca/mthca_memfree.c~get_current_user_pages +1 -2
@@ -472,8 +472,7 @@ int mthca_map_user_db(struct mthca_dev * goto out; } - ret =get_user_pages (current, current->mm, uaddr &PAGE_MASK ,1 ,1 ,0 , - pages,NULL ); + ret =get_user_pages (uaddr &PAGE_MASK ,1 ,1 ,0 , pages,NULL );if (ret <0 ) goto out;
drivers/infiniband/hw/qib/qib_user_pages.c renamed from drivers/infiniband/hw/qib/qib_user_pages.c~get_current_user_pages +1 -2
@@ -66,8 +66,7 @@ static int __qib_get_user_pages(unsigned }for (got =0 ; got < num_pages; got += ret) { - ret =get_user_pages (current, current->mm, - start_page + got *PAGE_SIZE , + ret =get_user_pages (start_page + got *PAGE_SIZE , num_pages - got,1 ,1 , p + got,NULL );if (ret <0 )
drivers/infiniband/hw/usnic/usnic_uiom.c renamed from drivers/infiniband/hw/usnic/usnic_uiom.c~get_current_user_pages +1 -1
@@ -144,7 +144,7 @@ static int usnic_uiom_get_pages(unsigned ret =0 ;while (npages) { - ret =get_user_pages (current, current->mm, cur_base, + ret =get_user_pages (cur_base, min_t(unsigned long, npages,PAGE_SIZE /sizeof (struct page *)),1 , !writable, page_list,NULL );
drivers/media/pci/ivtv/ivtv-udma.c renamed from drivers/media/pci/ivtv/ivtv-udma.c~get_current_user_pages +2 -2
@@ -124,8 +124,8 @@ int ivtv_udma_setup(struct ivtv *itv, un }/* Get user pages for DMA Xfer */ - err =get_user_pages_unlocked (current, current->mm, - user_dma.uaddr, user_dma.page_count,0 ,1 , dma->map); + err =get_user_pages_unlocked (user_dma.uaddr, user_dma.page_count,0 , +1 , dma->map);if (user_dma.page_count != err) { IVTV_DEBUG_WARN("failed to map user pages, returned %d instead of %d\n",
drivers/media/pci/ivtv/ivtv-yuv.c renamed from drivers/media/pci/ivtv/ivtv-yuv.c~get_current_user_pages +4 -6
@@ -75,14 +75,12 @@ static int ivtv_yuv_prep_user_dma(structivtv_udma_get_page_info (&uv_dma, (unsigned long )args->uv_source,360 * uv_decode_height);/* Get user pages for DMA Xfer */ - y_pages =get_user_pages_unlocked (current, current->mm, - y_dma.uaddr, y_dma.page_count,0 ,1 , - &dma->map[0 ]); + y_pages =get_user_pages_unlocked (y_dma.uaddr, + y_dma.page_count,0 ,1 , &dma->map[0 ]); uv_pages =0 ;/* silence gcc. value is set and consumed only if: */ if (y_pages == y_dma.page_count) { - uv_pages =get_user_pages_unlocked (current, current->mm, - uv_dma.uaddr, uv_dma.page_count,0 ,1 , - &dma->map[y_pages]); + uv_pages =get_user_pages_unlocked (uv_dma.uaddr, + uv_dma.page_count,0 ,1 , &dma->map[y_pages]); }if (y_pages != y_dma.page_count || uv_pages != uv_dma.page_count) {
drivers/media/v4l2-core/videobuf-dma-sg.c renamed from drivers/media/v4l2-core/videobuf-dma-sg.c~get_current_user_pages +1 -2
@@ -181,8 +181,7 @@ static int videobuf_dma_init_user_lockeddprintk (1 ,"init user [0x%lx+0x%lx => %d pages]\n" , data, size, dma->nr_pages); - err =get_user_pages (current, current->mm, - data &PAGE_MASK , dma->nr_pages, + err =get_user_pages (data &PAGE_MASK , dma->nr_pages, rw ==READ ,1 ,/* force */ dma->pages,NULL );
drivers/misc/mic/scif/scif_rma.c renamed from drivers/misc/mic/scif/scif_rma.c~get_current_user_pages +0 -2
@@ -1394,8 +1394,6 @@ retry: } pinned_pages->nr_pages = get_user_pages( - current, - mm, (u64)addr, nr_pages, !!(prot & SCIF_PROT_WRITE),
drivers/misc/sgi-gru/grufault.c renamed from drivers/misc/sgi-gru/grufault.c~get_current_user_pages +1 -2
@@ -198,8 +198,7 @@ static int non_atomic_pte_lookup(struct#else *pageshift =PAGE_SHIFT ;#endif -if (get_user_pages - (current, current->mm, vaddr,1 , write,0 , &page,NULL ) <=0 ) +if (get_user_pages (vaddr,1 , write,0 , &page,NULL ) <=0 )return -EFAULT ; *paddr =page_to_phys (page);put_page (page);
drivers/scsi/st.c renamed from drivers/scsi/st.c~get_current_user_pages +0 -2
@@ -4817,8 +4817,6 @@ static int sgl_map_user_pages(struct st_/* Try to fault in all of the necessary pages */ /* rw==READ means read from drive, write into memory area */ res = get_user_pages_unlocked( - current, - current->mm, uaddr, nr_pages, rw == READ,
drivers/video/fbdev/pvr2fb.c renamed from drivers/video/fbdev/pvr2fb.c~get_current_user_pages +2 -2
@@ -686,8 +686,8 @@ static ssize_t pvr2fb_write(struct fb_inif (!pages)return -ENOMEM ; - ret =get_user_pages_unlocked (current, current->mm, (unsigned long )buf, - nr_pages,WRITE ,0 , pages); + ret =get_user_pages_unlocked ((unsigned long )buf, nr_pages,WRITE , +0 , pages);if (ret < nr_pages) { nr_pages = ret;
drivers/virt/fsl_hypervisor.c renamed from drivers/virt/fsl_hypervisor.c~get_current_user_pages +2 -3
@@ -244,9 +244,8 @@ static long ioctl_memcpy(struct fsl_hv_i/* Get the physical addresses of the source buffer */ down_read (¤t->mm->mmap_sem); - num_pinned =get_user_pages (current, current->mm, - param.local_vaddr - lb_offset, num_pages, - (param.source ==-1 ) ?READ :WRITE , + num_pinned =get_user_pages (param.local_vaddr - lb_offset, + num_pages, (param.source ==-1 ) ?READ :WRITE ,0 , pages,NULL );up_read (¤t->mm->mmap_sem);
mm/frame_vector.c renamed from mm/frame_vector.c~get_current_user_pages +1 -1
@@ -58,7 +58,7 @@ int get_vaddr_frames(unsigned long startif (!(vma->vm_flags & (VM_IO |VM_PFNMAP ))) { vec->got_ref = true; vec->is_pfns = false; - ret =get_user_pages_locked (current, mm, start, nr_frames, + ret =get_user_pages_locked (start, nr_frames, write, force, (struct page **)(vec->ptrs), &locked); goto out; }
mm/gup.c renamed from mm/gup.c~get_current_user_pages +4 -2
@@ -936,8 +936,10 @@ long get_user_pages_remote(struct task_sEXPORT_SYMBOL (get_user_pages_remote);/* -* This is the same as get_user_pages_remote() for the time -* being. +* This is the same as get_user_pages_remote(), just with a +* less-flexible calling convention where we assume that the task +* and mm being operated on are the current task's. We also +* obviously don't pass FOLL_REMOTE in here. */ long get_user_pages6(unsigned long start, unsigned long nr_pages, int write, int force, struct page **pages,
mm/ksm.c renamed from mm/ksm.c~get_current_user_pages +1 -1
@@ -352,7 +352,7 @@ static inline bool ksm_test_exit(struct/* * We use break_ksm to break COW on a ksm page: it's a stripped down * -* if (get_user_pages(current, mm, addr, 1, 1, 1, &page, NULL) == 1) +* if (get_user_pages(addr, 1, 1, 1, &page, NULL) == 1) * put_page(page); * * but taking great care only to touch a ksm page, in a VM_MERGEABLE vma,
mm/mempolicy.c renamed from mm/mempolicy.c~get_current_user_pages +3 -3
@@ -844,12 +844,12 @@ static void get_policy_nodemask(struct m } } -static int lookup_node (struct mm_struct *mm,unsigned long addr) +static int lookup_node (unsigned long addr) {struct page *p;int err; - err =get_user_pages (current, mm, addr &PAGE_MASK ,1 ,0 ,0 , &p,NULL ); + err =get_user_pages (addr &PAGE_MASK ,1 ,0 ,0 , &p,NULL );if (err >=0 ) { err =page_to_nid (p);put_page (p);
@@ -904,7 +904,7 @@ static long do_get_mempolicy(int *policyif (flags &MPOL_F_NODE ) {if (flags &MPOL_F_ADDR ) { - err =lookup_node (mm, addr); + err =lookup_node (addr);if (err <0 ) goto out; *policy = err;
net/ceph/pagevec.c renamed from net/ceph/pagevec.c~get_current_user_pages +1 -1
@@ -24,7 +24,7 @@ struct page **ceph_get_direct_page_vectoreturn ERR_PTR (-ENOMEM );while (got < num_pages) { - rc =get_user_pages_unlocked (current, current->mm, + rc =get_user_pages_unlocked ( (unsigned long )data + ((unsigned long )got *PAGE_SIZE ), num_pages - got, write_page,0 , pages + got);if (rc <0 )
virt/kvm/kvm_main.c renamed from virt/kvm/kvm_main.c~get_current_user_pages +5 -5
@@ -1264,15 +1264,16 @@ unsigned long kvm_vcpu_gfn_to_hva_prot(sreturn gfn_to_hva_memslot_prot (slot, gfn, writable); } -static int get_user_page_nowait (struct task_struct *tsk,struct mm_struct *mm, -unsigned long start,int write,struct page **page) +static int get_user_page_nowait (unsigned long start,int write, +struct page **page) {int flags =FOLL_TOUCH |FOLL_NOWAIT |FOLL_HWPOISON |FOLL_GET ;if (write) flags |=FOLL_WRITE ; -return __get_user_pages (tsk, mm, start,1 , flags, page,NULL ,NULL ); +return __get_user_pages (current, current->mm, start,1 , flags, page, +NULL ,NULL ); }static inline int check_user_page_hwpoison (unsigned long addr)
@@ -1334,8 +1335,7 @@ static int hva_to_pfn_slow(unsigned longif (async) {down_read (¤t->mm->mmap_sem); - npages =get_user_page_nowait (current, current->mm, - addr, write_fault, page); + npages =get_user_page_nowait (addr, write_fault, page);up_read (¤t->mm->mmap_sem); }else npages = __get_user_pages_unlocked(current, current->mm, addr, 1,
_
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>