mmap locking API: use coccinelle to convert mmap_sem rwsem call sites
authorMichel Lespinasse <walken@google.com>
Tue, 9 Jun 2020 04:33:25 +0000 (21:33 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 9 Jun 2020 16:39:14 +0000 (09:39 -0700)
This change converts the existing mmap_sem rwsem calls to use the new mmap
locking API instead.

The change is generated using coccinelle with the following rule:

// spatch --sp-file mmap_lock_api.cocci --in-place --include-headers --dir .

@@
expression mm;
@@
(
-init_rwsem
+mmap_init_lock
|
-down_write
+mmap_write_lock
|
-down_write_killable
+mmap_write_lock_killable
|
-down_write_trylock
+mmap_write_trylock
|
-up_write
+mmap_write_unlock
|
-downgrade_write
+mmap_write_downgrade
|
-down_read
+mmap_read_lock
|
-down_read_killable
+mmap_read_lock_killable
|
-down_read_trylock
+mmap_read_trylock
|
-up_read
+mmap_read_unlock
)
-(&mm->mmap_sem)
+(mm)

Signed-off-by: Michel Lespinasse <walken@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: Daniel Jordan <daniel.m.jordan@oracle.com>
Reviewed-by: Laurent Dufour <ldufour@linux.ibm.com>
Reviewed-by: Vlastimil Babka <vbabka@suse.cz>
Cc: Davidlohr Bueso <dbueso@suse.de>
Cc: David Rientjes <rientjes@google.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Jason Gunthorpe <jgg@ziepe.ca>
Cc: Jerome Glisse <jglisse@redhat.com>
Cc: John Hubbard <jhubbard@nvidia.com>
Cc: Liam Howlett <Liam.Howlett@oracle.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ying Han <yinghan@google.com>
Link: http://lkml.kernel.org/r/20200520052908.204642-5-walken@google.com
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
148 files changed:
arch/alpha/kernel/traps.c
arch/alpha/mm/fault.c
arch/arc/kernel/process.c
arch/arc/kernel/troubleshoot.c
arch/arc/mm/fault.c
arch/arm/kernel/process.c
arch/arm/kernel/swp_emulate.c
arch/arm/lib/uaccess_with_memcpy.c
arch/arm/mm/fault.c
arch/arm64/kernel/traps.c
arch/arm64/kernel/vdso.c
arch/arm64/mm/fault.c
arch/csky/kernel/vdso.c
arch/csky/mm/fault.c
arch/hexagon/kernel/vdso.c
arch/hexagon/mm/vm_fault.c
arch/ia64/kernel/perfmon.c
arch/ia64/mm/fault.c
arch/ia64/mm/init.c
arch/m68k/kernel/sys_m68k.c
arch/m68k/mm/fault.c
arch/microblaze/mm/fault.c
arch/mips/kernel/traps.c
arch/mips/kernel/vdso.c
arch/nds32/kernel/vdso.c
arch/nds32/mm/fault.c
arch/nios2/mm/fault.c
arch/nios2/mm/init.c
arch/openrisc/mm/fault.c
arch/parisc/kernel/traps.c
arch/parisc/mm/fault.c
arch/powerpc/kernel/vdso.c
arch/powerpc/kvm/book3s_hv.c
arch/powerpc/kvm/book3s_hv_uvmem.c
arch/powerpc/kvm/e500_mmu_host.c
arch/powerpc/mm/book3s64/iommu_api.c
arch/powerpc/mm/book3s64/subpage_prot.c
arch/powerpc/mm/copro_fault.c
arch/powerpc/mm/fault.c
arch/powerpc/oprofile/cell/spu_task_sync.c
arch/powerpc/platforms/cell/spufs/file.c
arch/riscv/kernel/vdso.c
arch/riscv/mm/fault.c
arch/s390/kernel/uv.c
arch/s390/kernel/vdso.c
arch/s390/kvm/gaccess.c
arch/s390/kvm/interrupt.c
arch/s390/kvm/kvm-s390.c
arch/s390/kvm/priv.c
arch/s390/mm/fault.c
arch/s390/mm/gmap.c
arch/s390/pci/pci_mmio.c
arch/sh/kernel/sys_sh.c
arch/sh/kernel/vsyscall/vsyscall.c
arch/sh/mm/fault.c
arch/sparc/mm/fault_32.c
arch/sparc/mm/fault_64.c
arch/sparc/vdso/vma.c
arch/um/include/asm/mmu_context.h
arch/um/kernel/tlb.c
arch/um/kernel/trap.c
arch/unicore32/mm/fault.c
arch/x86/entry/vdso/vma.c
arch/x86/kernel/vm86_32.c
arch/x86/mm/fault.c
arch/x86/um/vdso/vma.c
arch/xtensa/mm/fault.c
drivers/android/binder_alloc.c
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
drivers/gpu/drm/amd/amdkfd/kfd_events.c
drivers/gpu/drm/i915/gem/i915_gem_mman.c
drivers/gpu/drm/i915/gem/i915_gem_userptr.c
drivers/gpu/drm/nouveau/nouveau_svm.c
drivers/gpu/drm/radeon/radeon_cs.c
drivers/gpu/drm/radeon/radeon_gem.c
drivers/gpu/drm/ttm/ttm_bo_vm.c
drivers/infiniband/core/umem_odp.c
drivers/infiniband/core/uverbs_main.c
drivers/infiniband/hw/mlx4/mr.c
drivers/infiniband/hw/qib/qib_user_pages.c
drivers/infiniband/hw/usnic/usnic_uiom.c
drivers/infiniband/sw/siw/siw_mem.c
drivers/iommu/amd_iommu_v2.c
drivers/iommu/intel-svm.c
drivers/media/v4l2-core/videobuf-core.c
drivers/media/v4l2-core/videobuf-dma-contig.c
drivers/media/v4l2-core/videobuf-dma-sg.c
drivers/misc/cxl/cxllib.c
drivers/misc/cxl/fault.c
drivers/misc/sgi-gru/grufault.c
drivers/misc/sgi-gru/grufile.c
drivers/oprofile/buffer_sync.c
drivers/staging/kpc2000/kpc_dma/fileops.c
drivers/tee/optee/call.c
drivers/vfio/vfio_iommu_type1.c
drivers/vhost/vdpa.c
drivers/xen/gntdev.c
drivers/xen/privcmd.c
fs/aio.c
fs/coredump.c
fs/exec.c
fs/io_uring.c
fs/proc/base.c
fs/proc/task_mmu.c
fs/proc/task_nommu.c
fs/userfaultfd.c
ipc/shm.c
kernel/acct.c
kernel/bpf/stackmap.c
kernel/events/core.c
kernel/events/uprobes.c
kernel/exit.c
kernel/fork.c
kernel/futex.c
kernel/sched/fair.c
kernel/sys.c
kernel/trace/trace_output.c
lib/test_lockup.c
mm/filemap.c
mm/frame_vector.c
mm/gup.c
mm/internal.h
mm/khugepaged.c
mm/ksm.c
mm/madvise.c
mm/memcontrol.c
mm/memory.c
mm/mempolicy.c
mm/migrate.c
mm/mincore.c
mm/mlock.c
mm/mmap.c
mm/mmu_notifier.c
mm/mprotect.c
mm/mremap.c
mm/msync.c
mm/nommu.c
mm/oom_kill.c
mm/process_vm_access.c
mm/ptdump.c
mm/swapfile.c
mm/userfaultfd.c
mm/util.c
net/ipv4/tcp.c
net/xdp/xdp_umem.c
virt/kvm/async_pf.c
virt/kvm/kvm_main.c

index 8383ccf..49754e0 100644 (file)
@@ -957,12 +957,12 @@ give_sigsegv:
                si_code = SEGV_ACCERR;
        else {
                struct mm_struct *mm = current->mm;
-               down_read(&mm->mmap_sem);
+               mmap_read_lock(mm);
                if (find_vma(mm, (unsigned long)va))
                        si_code = SEGV_ACCERR;
                else
                        si_code = SEGV_MAPERR;
-               up_read(&mm->mmap_sem);
+               mmap_read_unlock(mm);
        }
        send_sig_fault(SIGSEGV, si_code, va, 0, current);
        return;
index c2d7b6d..36efa77 100644 (file)
@@ -117,7 +117,7 @@ do_page_fault(unsigned long address, unsigned long mmcsr,
        if (user_mode(regs))
                flags |= FAULT_FLAG_USER;
 retry:
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
        vma = find_vma(mm, address);
        if (!vma)
                goto bad_area;
@@ -180,14 +180,14 @@ retry:
                }
        }
 
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 
        return;
 
        /* Something tried to access memory that isn't in our memory map.
           Fix it, but check if it's kernel or user first.  */
  bad_area:
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 
        if (user_mode(regs))
                goto do_sigsegv;
@@ -211,14 +211,14 @@ retry:
        /* We ran out of memory, or some other thing happened to us that
           made us unable to handle the page fault gracefully.  */
  out_of_memory:
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        if (!user_mode(regs))
                goto no_context;
        pagefault_out_of_memory();
        return;
 
  do_sigbus:
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        /* Send a sigbus, regardless of whether we were in kernel
           or user mode.  */
        force_sig_fault(SIGBUS, BUS_ADRERR, (void __user *) address, 0);
index 315528f..8c8e517 100644 (file)
@@ -90,10 +90,10 @@ fault:
        if (unlikely(ret != -EFAULT))
                 goto fail;
 
-       down_read(&current->mm->mmap_sem);
+       mmap_read_lock(current->mm);
        ret = fixup_user_fault(current, current->mm, (unsigned long) uaddr,
                               FAULT_FLAG_WRITE, NULL);
-       up_read(&current->mm->mmap_sem);
+       mmap_read_unlock(current->mm);
 
        if (likely(!ret))
                 goto again;
index 3044c83..28e8bf0 100644 (file)
@@ -89,7 +89,7 @@ static void show_faulting_vma(unsigned long address)
        /* can't use print_vma_addr() yet as it doesn't check for
         * non-inclusive vma
         */
-       down_read(&active_mm->mmap_sem);
+       mmap_read_lock(active_mm);
        vma = find_vma(active_mm, address);
 
        /* check against the find_vma( ) behaviour which returns the next VMA
@@ -111,7 +111,7 @@ static void show_faulting_vma(unsigned long address)
        } else
                pr_info("    @No matching VMA found\n");
 
-       up_read(&active_mm->mmap_sem);
+       mmap_read_unlock(active_mm);
 }
 
 static void show_ecr_verbose(struct pt_regs *regs)
index 92b339c..5b213bc 100644 (file)
@@ -107,7 +107,7 @@ void do_page_fault(unsigned long address, struct pt_regs *regs)
                flags |= FAULT_FLAG_WRITE;
 
 retry:
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
 
        vma = find_vma(mm, address);
        if (!vma)
@@ -150,7 +150,7 @@ retry:
        }
 
 bad_area:
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 
        /*
         * Major/minor page fault accounting
index 46e478f..58eaa1f 100644 (file)
@@ -431,7 +431,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
        npages = 1; /* for sigpage */
        npages += vdso_total_pages;
 
-       if (down_write_killable(&mm->mmap_sem))
+       if (mmap_write_lock_killable(mm))
                return -EINTR;
        hint = sigpage_addr(mm, npages);
        addr = get_unmapped_area(NULL, hint, npages << PAGE_SHIFT, 0, 0);
@@ -458,7 +458,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
        arm_install_vdso(mm, addr + PAGE_SIZE);
 
  up_fail:
-       up_write(&mm->mmap_sem);
+       mmap_write_unlock(mm);
        return ret;
 }
 #endif
index e640871..6166ba3 100644 (file)
@@ -97,12 +97,12 @@ static void set_segfault(struct pt_regs *regs, unsigned long addr)
 {
        int si_code;
 
-       down_read(&current->mm->mmap_sem);
+       mmap_read_lock(current->mm);
        if (find_vma(current->mm, addr) == NULL)
                si_code = SEGV_MAPERR;
        else
                si_code = SEGV_ACCERR;
-       up_read(&current->mm->mmap_sem);
+       mmap_read_unlock(current->mm);
 
        pr_debug("SWP{B} emulation: access caused memory abort!\n");
        arm_notify_die("Illegal memory access", regs,
index d72b14c..106f83a 100644 (file)
@@ -101,7 +101,7 @@ __copy_to_user_memcpy(void __user *to, const void *from, unsigned long n)
        atomic = faulthandler_disabled();
 
        if (!atomic)
-               down_read(&current->mm->mmap_sem);
+               mmap_read_lock(current->mm);
        while (n) {
                pte_t *pte;
                spinlock_t *ptl;
@@ -109,11 +109,11 @@ __copy_to_user_memcpy(void __user *to, const void *from, unsigned long n)
 
                while (!pin_page_for_write(to, &pte, &ptl)) {
                        if (!atomic)
-                               up_read(&current->mm->mmap_sem);
+                               mmap_read_unlock(current->mm);
                        if (__put_user(0, (char __user *)to))
                                goto out;
                        if (!atomic)
-                               down_read(&current->mm->mmap_sem);
+                               mmap_read_lock(current->mm);
                }
 
                tocopy = (~(unsigned long)to & ~PAGE_MASK) + 1;
@@ -133,7 +133,7 @@ __copy_to_user_memcpy(void __user *to, const void *from, unsigned long n)
                        spin_unlock(ptl);
        }
        if (!atomic)
-               up_read(&current->mm->mmap_sem);
+               mmap_read_unlock(current->mm);
 
 out:
        return n;
@@ -170,17 +170,17 @@ __clear_user_memset(void __user *addr, unsigned long n)
                return 0;
        }
 
-       down_read(&current->mm->mmap_sem);
+       mmap_read_lock(current->mm);
        while (n) {
                pte_t *pte;
                spinlock_t *ptl;
                int tocopy;
 
                while (!pin_page_for_write(addr, &pte, &ptl)) {
-                       up_read(&current->mm->mmap_sem);
+                       mmap_read_unlock(current->mm);
                        if (__put_user(0, (char __user *)addr))
                                goto out;
-                       down_read(&current->mm->mmap_sem);
+                       mmap_read_lock(current->mm);
                }
 
                tocopy = (~(unsigned long)addr & ~PAGE_MASK) + 1;
@@ -198,7 +198,7 @@ __clear_user_memset(void __user *addr, unsigned long n)
                else
                        spin_unlock(ptl);
        }
-       up_read(&current->mm->mmap_sem);
+       mmap_read_unlock(current->mm);
 
 out:
        return n;
index 6229e9d..8e56c43 100644 (file)
@@ -271,11 +271,11 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
         * validly references user space from well defined areas of the code,
         * we can bug out early if this is from code which shouldn't.
         */
-       if (!down_read_trylock(&mm->mmap_sem)) {
+       if (!mmap_read_trylock(mm)) {
                if (!user_mode(regs) && !search_exception_tables(regs->ARM_pc))
                        goto no_context;
 retry:
-               down_read(&mm->mmap_sem);
+               mmap_read_lock(mm);
        } else {
                /*
                 * The above down_read_trylock() might have succeeded in
@@ -325,7 +325,7 @@ retry:
                }
        }
 
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 
        /*
         * Handle the "normal" case first - VM_FAULT_MAJOR
index 3fd9e27..50cc30a 100644 (file)
@@ -448,12 +448,12 @@ void arm64_notify_segfault(unsigned long addr)
 {
        int code;
 
-       down_read(&current->mm->mmap_sem);
+       mmap_read_lock(current->mm);
        if (find_vma(current->mm, addr) == NULL)
                code = SEGV_MAPERR;
        else
                code = SEGV_ACCERR;
-       up_read(&current->mm->mmap_sem);
+       mmap_read_unlock(current->mm);
 
        force_signal_inject(SIGSEGV, code, addr);
 }
index d51a898..4e01657 100644 (file)
@@ -340,7 +340,7 @@ int aarch32_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
        struct mm_struct *mm = current->mm;
        int ret;
 
-       if (down_write_killable(&mm->mmap_sem))
+       if (mmap_write_lock_killable(mm))
                return -EINTR;
 
        ret = aarch32_kuser_helpers_setup(mm);
@@ -357,7 +357,7 @@ int aarch32_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
 #endif /* CONFIG_COMPAT_VDSO */
 
 out:
-       up_write(&mm->mmap_sem);
+       mmap_write_unlock(mm);
        return ret;
 }
 #endif /* CONFIG_COMPAT */
@@ -398,7 +398,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm,
        struct mm_struct *mm = current->mm;
        int ret;
 
-       if (down_write_killable(&mm->mmap_sem))
+       if (mmap_write_lock_killable(mm))
                return -EINTR;
 
        ret = __setup_additional_pages(VDSO_ABI_AA64,
@@ -406,7 +406,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm,
                                       bprm,
                                       uses_interp);
 
-       up_write(&mm->mmap_sem);
+       mmap_write_unlock(mm);
 
        return ret;
 }
index fe30e95..8afb238 100644 (file)
@@ -497,11 +497,11 @@ static int __kprobes do_page_fault(unsigned long addr, unsigned int esr,
         * validly references user space from well defined areas of the code,
         * we can bug out early if this is from code which shouldn't.
         */
-       if (!down_read_trylock(&mm->mmap_sem)) {
+       if (!mmap_read_trylock(mm)) {
                if (!user_mode(regs) && !search_exception_tables(regs->pc))
                        goto no_context;
 retry:
-               down_read(&mm->mmap_sem);
+               mmap_read_lock(mm);
        } else {
                /*
                 * The above down_read_trylock() might have succeeded in which
@@ -510,7 +510,7 @@ retry:
                might_sleep();
 #ifdef CONFIG_DEBUG_VM
                if (!user_mode(regs) && !search_exception_tables(regs->pc)) {
-                       up_read(&mm->mmap_sem);
+                       mmap_read_unlock(mm);
                        goto no_context;
                }
 #endif
@@ -532,7 +532,7 @@ retry:
                        goto retry;
                }
        }
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 
        /*
         * Handle the "normal" (no error) case first.
index 60ff7ad..abc3dbc 100644 (file)
@@ -50,7 +50,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
        unsigned long addr;
        struct mm_struct *mm = current->mm;
 
-       down_write(&mm->mmap_sem);
+       mmap_write_lock(mm);
 
        addr = get_unmapped_area(NULL, STACK_TOP, PAGE_SIZE, 0, 0);
        if (IS_ERR_VALUE(addr)) {
@@ -70,7 +70,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
        mm->context.vdso = (void *)addr;
 
 up_fail:
-       up_write(&mm->mmap_sem);
+       mmap_write_unlock(mm);
        return ret;
 }
 
index 4055d43..0b9cbf2 100644 (file)
@@ -120,7 +120,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long write,
        if (in_atomic() || !mm)
                goto bad_area_nosemaphore;
 
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
        vma = find_vma(mm, address);
        if (!vma)
                goto bad_area;
@@ -170,7 +170,7 @@ good_area:
                              address);
        }
 
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        return;
 
        /*
@@ -178,7 +178,7 @@ good_area:
         * Fix it, but check if it's kernel or user first..
         */
 bad_area:
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 
 bad_area_nosemaphore:
        /* User mode accesses just cause a SIGSEGV */
@@ -217,7 +217,7 @@ out_of_memory:
 do_sigbus:
        tsk->thread.trap_no = (regs->sr >> 16) & 0xff;
 
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 
        /* Kernel mode? Handle exceptions or die */
        if (!user_mode(regs))
index 25a1d9c..b70970a 100644 (file)
@@ -52,7 +52,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
        unsigned long vdso_base;
        struct mm_struct *mm = current->mm;
 
-       if (down_write_killable(&mm->mmap_sem))
+       if (mmap_write_lock_killable(mm))
                return -EINTR;
 
        /* Try to get it loaded right near ld.so/glibc. */
@@ -76,7 +76,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
        mm->context.vdso = (void *)vdso_base;
 
 up_fail:
-       up_write(&mm->mmap_sem);
+       mmap_write_unlock(mm);
        return ret;
 }
 
index 6ed0993..cd3808f 100644 (file)
@@ -54,7 +54,7 @@ void do_page_fault(unsigned long address, long cause, struct pt_regs *regs)
        if (user_mode(regs))
                flags |= FAULT_FLAG_USER;
 retry:
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
        vma = find_vma(mm, address);
        if (!vma)
                goto bad_area;
@@ -106,11 +106,11 @@ good_area:
                        }
                }
 
-               up_read(&mm->mmap_sem);
+               mmap_read_unlock(mm);
                return;
        }
 
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 
        /* Handle copyin/out exception cases */
        if (!user_mode(regs))
@@ -137,7 +137,7 @@ good_area:
        return;
 
 bad_area:
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 
        if (user_mode(regs)) {
                force_sig_fault(SIGSEGV, si_code, (void __user *)address);
index df25700..971f166 100644 (file)
@@ -2260,13 +2260,13 @@ pfm_smpl_buffer_alloc(struct task_struct *task, struct file *filp, pfm_context_t
         * now we atomically find some area in the address space and
         * remap the buffer in it.
         */
-       down_write(&task->mm->mmap_sem);
+       mmap_write_lock(task->mm);
 
        /* find some free area in address space, must have mmap sem held */
        vma->vm_start = get_unmapped_area(NULL, 0, size, 0, MAP_PRIVATE|MAP_ANONYMOUS);
        if (IS_ERR_VALUE(vma->vm_start)) {
                DPRINT(("Cannot find unmapped area for size %ld\n", size));
-               up_write(&task->mm->mmap_sem);
+               mmap_write_unlock(task->mm);
                goto error;
        }
        vma->vm_end = vma->vm_start + size;
@@ -2277,7 +2277,7 @@ pfm_smpl_buffer_alloc(struct task_struct *task, struct file *filp, pfm_context_t
        /* can only be applied to current task, need to have the mm semaphore held when called */
        if (pfm_remap_buffer(vma, (unsigned long)smpl_buf, vma->vm_start, size)) {
                DPRINT(("Can't remap buffer\n"));
-               up_write(&task->mm->mmap_sem);
+               mmap_write_unlock(task->mm);
                goto error;
        }
 
@@ -2288,7 +2288,7 @@ pfm_smpl_buffer_alloc(struct task_struct *task, struct file *filp, pfm_context_t
        insert_vm_struct(mm, vma);
 
        vm_stat_account(vma->vm_mm, vma->vm_flags, vma_pages(vma));
-       up_write(&task->mm->mmap_sem);
+       mmap_write_unlock(task->mm);
 
        /*
         * keep track of user level virtual address
index 1bad5be..245545b 100644 (file)
@@ -106,7 +106,7 @@ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *re
        if (mask & VM_WRITE)
                flags |= FAULT_FLAG_WRITE;
 retry:
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
 
        vma = find_vma_prev(mm, address, &prev_vma);
        if (!vma && !prev_vma )
@@ -182,7 +182,7 @@ retry:
                }
        }
 
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        return;
 
   check_expansion:
@@ -213,7 +213,7 @@ retry:
        goto good_area;
 
   bad_area:
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 #ifdef CONFIG_VIRTUAL_MEM_MAP
   bad_area_no_up:
 #endif
@@ -279,7 +279,7 @@ retry:
        return;
 
   out_of_memory:
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        if (!user_mode(regs))
                goto no_context;
        pagefault_out_of_memory();
index ca760f6..0b3fb4c 100644 (file)
@@ -118,13 +118,13 @@ ia64_init_addr_space (void)
                vma->vm_end = vma->vm_start + PAGE_SIZE;
                vma->vm_flags = VM_DATA_DEFAULT_FLAGS|VM_GROWSUP|VM_ACCOUNT;
                vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
-               down_write(&current->mm->mmap_sem);
+               mmap_write_lock(current->mm);
                if (insert_vm_struct(current->mm, vma)) {
-                       up_write(&current->mm->mmap_sem);
+                       mmap_write_unlock(current->mm);
                        vm_area_free(vma);
                        return;
                }
-               up_write(&current->mm->mmap_sem);
+               mmap_write_unlock(current->mm);
        }
 
        /* map NaT-page at address zero to speed up speculative dereferencing of NULL: */
@@ -136,13 +136,13 @@ ia64_init_addr_space (void)
                        vma->vm_page_prot = __pgprot(pgprot_val(PAGE_READONLY) | _PAGE_MA_NAT);
                        vma->vm_flags = VM_READ | VM_MAYREAD | VM_IO |
                                        VM_DONTEXPAND | VM_DONTDUMP;
-                       down_write(&current->mm->mmap_sem);
+                       mmap_write_lock(current->mm);
                        if (insert_vm_struct(current->mm, vma)) {
-                               up_write(&current->mm->mmap_sem);
+                               mmap_write_unlock(current->mm);
                                vm_area_free(vma);
                                return;
                        }
-                       up_write(&current->mm->mmap_sem);
+                       mmap_write_unlock(current->mm);
                }
        }
 }
index 18a4de7..1c235d8 100644 (file)
@@ -399,7 +399,7 @@ sys_cacheflush (unsigned long addr, int scope, int cache, unsigned long len)
                 * Verify that the specified address region actually belongs
                 * to this process.
                 */
-               down_read(&current->mm->mmap_sem);
+               mmap_read_lock(current->mm);
                vma = find_vma(current->mm, addr);
                if (!vma || addr < vma->vm_start || addr + len > vma->vm_end)
                        goto out_unlock;
@@ -450,7 +450,7 @@ sys_cacheflush (unsigned long addr, int scope, int cache, unsigned long len)
            }
        }
 out_unlock:
-       up_read(&current->mm->mmap_sem);
+       mmap_read_unlock(current->mm);
 out:
        return ret;
 }
@@ -472,7 +472,7 @@ sys_atomic_cmpxchg_32(unsigned long newval, int oldval, int d3, int d4, int d5,
                spinlock_t *ptl;
                unsigned long mem_value;
 
-               down_read(&mm->mmap_sem);
+               mmap_read_lock(mm);
                pgd = pgd_offset(mm, (unsigned long)mem);
                if (!pgd_present(*pgd))
                        goto bad_access;
@@ -501,11 +501,11 @@ sys_atomic_cmpxchg_32(unsigned long newval, int oldval, int d3, int d4, int d5,
                        __put_user(newval, mem);
 
                pte_unmap_unlock(pte, ptl);
-               up_read(&mm->mmap_sem);
+               mmap_read_unlock(mm);
                return mem_value;
 
              bad_access:
-               up_read(&mm->mmap_sem);
+               mmap_read_unlock(mm);
                /* This is not necessarily a bad access, we can get here if
                   a memory we're trying to write to should be copied-on-write.
                   Make the kernel do the necessary page stuff, then re-iterate.
@@ -545,13 +545,13 @@ sys_atomic_cmpxchg_32(unsigned long newval, int oldval, int d3, int d4, int d5,
        struct mm_struct *mm = current->mm;
        unsigned long mem_value;
 
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
 
        mem_value = *mem;
        if (mem_value == oldval)
                *mem = newval;
 
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        return mem_value;
 }
 
index 3bfb5c8..650acab 100644 (file)
@@ -86,7 +86,7 @@ int do_page_fault(struct pt_regs *regs, unsigned long address,
        if (user_mode(regs))
                flags |= FAULT_FLAG_USER;
 retry:
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
 
        vma = find_vma(mm, address);
        if (!vma)
@@ -174,7 +174,7 @@ good_area:
                }
        }
 
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        return 0;
 
 /*
@@ -182,7 +182,7 @@ good_area:
  * us unable to handle the page fault gracefully.
  */
 out_of_memory:
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        if (!user_mode(regs))
                goto no_context;
        pagefault_out_of_memory();
@@ -211,6 +211,6 @@ acc_err:
        current->thread.faddr = address;
 
 send_sig:
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        return send_fault_sig(regs);
 }
index 77dabc9..952ab61 100644 (file)
@@ -136,12 +136,12 @@ void do_page_fault(struct pt_regs *regs, unsigned long address,
         * source.  If this is invalid we can skip the address space check,
         * thus avoiding the deadlock.
         */
-       if (unlikely(!down_read_trylock(&mm->mmap_sem))) {
+       if (unlikely(!mmap_read_trylock(mm))) {
                if (kernel_mode(regs) && !search_exception_tables(regs->pc))
                        goto bad_area_nosemaphore;
 
 retry:
-               down_read(&mm->mmap_sem);
+               mmap_read_lock(mm);
        }
 
        vma = find_vma(mm, address);
@@ -247,7 +247,7 @@ good_area:
                }
        }
 
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 
        /*
         * keep track of tlb+htab misses that are good addrs but
@@ -258,7 +258,7 @@ good_area:
        return;
 
 bad_area:
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 
 bad_area_nosemaphore:
        pte_errors++;
@@ -277,7 +277,7 @@ bad_area_nosemaphore:
  * us unable to handle the page fault gracefully.
  */
 out_of_memory:
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        if (!user_mode(regs))
                bad_page_fault(regs, address, SIGKILL);
        else
@@ -285,7 +285,7 @@ out_of_memory:
        return;
 
 do_sigbus:
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        if (user_mode(regs)) {
                force_sig_fault(SIGBUS, BUS_ADRERR, (void __user *)address);
                return;
index e8cc10a..7c32c95 100644 (file)
@@ -793,13 +793,13 @@ int process_fpemu_return(int sig, void __user *fault_addr, unsigned long fcr31)
                return 1;
 
        case SIGSEGV:
-               down_read(&current->mm->mmap_sem);
+               mmap_read_lock(current->mm);
                vma = find_vma(current->mm, (unsigned long)fault_addr);
                if (vma && (vma->vm_start <= (unsigned long)fault_addr))
                        si_code = SEGV_ACCERR;
                else
                        si_code = SEGV_MAPERR;
-               up_read(&current->mm->mmap_sem);
+               mmap_read_unlock(current->mm);
                force_sig_fault(SIGSEGV, si_code, fault_addr);
                return 1;
 
index 3adb735..242dc5e 100644 (file)
@@ -94,7 +94,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
        struct vm_area_struct *vma;
        int ret;
 
-       if (down_write_killable(&mm->mmap_sem))
+       if (mmap_write_lock_killable(mm))
                return -EINTR;
 
        if (IS_ENABLED(CONFIG_MIPS_FP_SUPPORT)) {
@@ -187,6 +187,6 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
        ret = 0;
 
 out:
-       up_write(&mm->mmap_sem);
+       mmap_write_unlock(mm);
        return ret;
 }
index 90bcae6..e16009a 100644 (file)
@@ -130,7 +130,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
        vdso_mapping_len += L1_cache_info[DCACHE].aliasing_num - 1;
 #endif
 
-       if (down_write_killable(&mm->mmap_sem))
+       if (mmap_write_lock_killable(mm))
                return -EINTR;
 
        addr = vdso_random_addr(vdso_mapping_len);
@@ -185,12 +185,12 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
                goto up_fail;
        }
 
-       up_write(&mm->mmap_sem);
+       mmap_write_unlock(mm);
        return 0;
 
 up_fail:
        mm->context.vdso = NULL;
-       up_write(&mm->mmap_sem);
+       mmap_write_unlock(mm);
        return ret;
 }
 
index ccd7000..b927855 100644 (file)
@@ -126,12 +126,12 @@ void do_page_fault(unsigned long entry, unsigned long addr,
         * validly references user space from well defined areas of the code,
         * we can bug out early if this is from code which shouldn't.
         */
-       if (unlikely(!down_read_trylock(&mm->mmap_sem))) {
+       if (unlikely(!mmap_read_trylock(mm))) {
                if (!user_mode(regs) &&
                    !search_exception_tables(instruction_pointer(regs)))
                        goto no_context;
 retry:
-               down_read(&mm->mmap_sem);
+               mmap_read_lock(mm);
        } else {
                /*
                 * The above down_read_trylock() might have succeeded in which
@@ -255,7 +255,7 @@ good_area:
                }
        }
 
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        return;
 
        /*
@@ -263,7 +263,7 @@ good_area:
         * Fix it, but check if it's kernel or user first..
         */
 bad_area:
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 
 bad_area_nosemaphore:
 
@@ -323,14 +323,14 @@ no_context:
         */
 
 out_of_memory:
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        if (!user_mode(regs))
                goto no_context;
        pagefault_out_of_memory();
        return;
 
 do_sigbus:
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 
        /* Kernel mode? Handle exceptions or die */
        if (!user_mode(regs))
index 964eac1..b8a0b51 100644 (file)
@@ -83,11 +83,11 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long cause,
        if (user_mode(regs))
                flags |= FAULT_FLAG_USER;
 
-       if (!down_read_trylock(&mm->mmap_sem)) {
+       if (!mmap_read_trylock(mm)) {
                if (!user_mode(regs) && !search_exception_tables(regs->ea))
                        goto bad_area_nosemaphore;
 retry:
-               down_read(&mm->mmap_sem);
+               mmap_read_lock(mm);
        }
 
        vma = find_vma(mm, address);
@@ -169,7 +169,7 @@ good_area:
                }
        }
 
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        return;
 
 /*
@@ -177,7 +177,7 @@ good_area:
  * Fix it, but check if it's kernel or user first..
  */
 bad_area:
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 
 bad_area_nosemaphore:
        /* User mode accesses just cause a SIGSEGV */
@@ -215,14 +215,14 @@ no_context:
  * us unable to handle the page fault gracefully.
  */
 out_of_memory:
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        if (!user_mode(regs))
                goto no_context;
        pagefault_out_of_memory();
        return;
 
 do_sigbus:
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 
        /* Kernel mode? Handle exceptions or die */
        if (!user_mode(regs))
index 2ab0a16..61862db 100644 (file)
@@ -109,14 +109,14 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
        struct mm_struct *mm = current->mm;
        int ret;
 
-       down_write(&mm->mmap_sem);
+       mmap_write_lock(mm);
 
        /* Map kuser helpers to user space address */
        ret = install_special_mapping(mm, KUSER_BASE, KUSER_SIZE,
                                      VM_READ | VM_EXEC | VM_MAYREAD |
                                      VM_MAYEXEC, kuser_page);
 
-       up_write(&mm->mmap_sem);
+       mmap_write_unlock(mm);
 
        return ret;
 }
index 6e0a11a..0bbb1a7 100644 (file)
@@ -104,7 +104,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long address,
                goto no_context;
 
 retry:
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
        vma = find_vma(mm, address);
 
        if (!vma)
@@ -192,7 +192,7 @@ good_area:
                }
        }
 
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        return;
 
        /*
@@ -201,7 +201,7 @@ good_area:
         */
 
 bad_area:
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 
 bad_area_nosemaphore:
 
@@ -260,14 +260,14 @@ out_of_memory:
        __asm__ __volatile__("l.nop 42");
        __asm__ __volatile__("l.nop 1");
 
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        if (!user_mode(regs))
                goto no_context;
        pagefault_out_of_memory();
        return;
 
 do_sigbus:
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 
        /*
         * Send a sigbus, regardless of whether we were in kernel
index 0a89899..5400e23 100644 (file)
@@ -717,7 +717,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs)
                if (user_mode(regs)) {
                        struct vm_area_struct *vma;
 
-                       down_read(&current->mm->mmap_sem);
+                       mmap_read_lock(current->mm);
                        vma = find_vma(current->mm,regs->iaoq[0]);
                        if (vma && (regs->iaoq[0] >= vma->vm_start)
                                && (vma->vm_flags & VM_EXEC)) {
@@ -725,10 +725,10 @@ void notrace handle_interruption(int code, struct pt_regs *regs)
                                fault_address = regs->iaoq[0];
                                fault_space = regs->iasq[0];
 
-                               up_read(&current->mm->mmap_sem);
+                               mmap_read_unlock(current->mm);
                                break; /* call do_page_fault() */
                        }
-                       up_read(&current->mm->mmap_sem);
+                       mmap_read_unlock(current->mm);
                }
                /* Fall Through */
        case 27: 
index 86e8c84..bc840fd 100644 (file)
@@ -282,7 +282,7 @@ void do_page_fault(struct pt_regs *regs, unsigned long code,
        if (acc_type & VM_WRITE)
                flags |= FAULT_FLAG_WRITE;
 retry:
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
        vma = find_vma_prev(mm, address, &prev_vma);
        if (!vma || address < vma->vm_start)
                goto check_expansion;
@@ -337,7 +337,7 @@ good_area:
                        goto retry;
                }
        }
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        return;
 
 check_expansion:
@@ -349,7 +349,7 @@ check_expansion:
  * Something tried to access memory that isn't in our memory map..
  */
 bad_area:
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 
        if (user_mode(regs)) {
                int signo, si_code;
@@ -421,7 +421,7 @@ no_context:
        parisc_terminate("Bad Address (null pointer deref?)", regs, code, address);
 
   out_of_memory:
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        if (!user_mode(regs))
                goto no_context;
        pagefault_out_of_memory();
index 7478212..e0f4ba4 100644 (file)
@@ -170,7 +170,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
         * and end up putting it elsewhere.
         * Add enough to the size so that the result can be aligned.
         */
-       if (down_write_killable(&mm->mmap_sem))
+       if (mmap_write_lock_killable(mm))
                return -EINTR;
        vdso_base = get_unmapped_area(NULL, vdso_base,
                                      (vdso_pages << PAGE_SHIFT) +
@@ -210,11 +210,11 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
                goto fail_mmapsem;
        }
 
-       up_write(&mm->mmap_sem);
+       mmap_write_unlock(mm);
        return 0;
 
  fail_mmapsem:
-       up_write(&mm->mmap_sem);
+       mmap_write_unlock(mm);
        return rc;
 }
 
index a07e12e..7f5d586 100644 (file)
@@ -4621,14 +4621,14 @@ static int kvmppc_hv_setup_htab_rma(struct kvm_vcpu *vcpu)
 
        /* Look up the VMA for the start of this memory slot */
        hva = memslot->userspace_addr;
-       down_read(&kvm->mm->mmap_sem);
+       mmap_read_lock(kvm->mm);
        vma = find_vma(kvm->mm, hva);
        if (!vma || vma->vm_start > hva || (vma->vm_flags & VM_IO))
                goto up_out;
 
        psize = vma_kernel_pagesize(vma);
 
-       up_read(&kvm->mm->mmap_sem);
+       mmap_read_unlock(kvm->mm);
 
        /* We can handle 4k, 64k or 16M pages in the VRMA */
        if (psize >= 0x1000000)
@@ -4661,7 +4661,7 @@ static int kvmppc_hv_setup_htab_rma(struct kvm_vcpu *vcpu)
        return err;
 
  up_out:
-       up_read(&kvm->mm->mmap_sem);
+       mmap_read_unlock(kvm->mm);
        goto out_srcu;
 }
 
index 76d05c7..305997b 100644 (file)
@@ -408,7 +408,7 @@ kvmppc_svm_page_in(struct vm_area_struct *vma, unsigned long start,
         */
        ret = ksm_madvise(vma, vma->vm_start, vma->vm_end,
                          MADV_UNMERGEABLE, &vma->vm_flags);
-       downgrade_write(&kvm->mm->mmap_sem);
+       mmap_write_downgrade(kvm->mm);
        *downgrade = true;
        if (ret)
                return ret;
@@ -525,7 +525,7 @@ kvmppc_h_svm_page_in(struct kvm *kvm, unsigned long gpa,
 
        ret = H_PARAMETER;
        srcu_idx = srcu_read_lock(&kvm->srcu);
-       down_write(&kvm->mm->mmap_sem);
+       mmap_write_lock(kvm->mm);
 
        start = gfn_to_hva(kvm, gfn);
        if (kvm_is_error_hva(start))
@@ -548,9 +548,9 @@ out_unlock:
        mutex_unlock(&kvm->arch.uvmem_lock);
 out:
        if (downgrade)
-               up_read(&kvm->mm->mmap_sem);
+               mmap_read_unlock(kvm->mm);
        else
-               up_write(&kvm->mm->mmap_sem);
+               mmap_write_unlock(kvm->mm);
        srcu_read_unlock(&kvm->srcu, srcu_idx);
        return ret;
 }
@@ -703,7 +703,7 @@ kvmppc_h_svm_page_out(struct kvm *kvm, unsigned long gpa,
 
        ret = H_PARAMETER;
        srcu_idx = srcu_read_lock(&kvm->srcu);
-       down_read(&kvm->mm->mmap_sem);
+       mmap_read_lock(kvm->mm);
        start = gfn_to_hva(kvm, gfn);
        if (kvm_is_error_hva(start))
                goto out;
@@ -716,7 +716,7 @@ kvmppc_h_svm_page_out(struct kvm *kvm, unsigned long gpa,
        if (!kvmppc_svm_page_out(vma, start, end, page_shift, kvm, gpa))
                ret = H_SUCCESS;
 out:
-       up_read(&kvm->mm->mmap_sem);
+       mmap_read_unlock(kvm->mm);
        srcu_read_unlock(&kvm->srcu, srcu_idx);
        return ret;
 }
index df9989c..d6c1069 100644 (file)
@@ -355,7 +355,7 @@ static inline int kvmppc_e500_shadow_map(struct kvmppc_vcpu_e500 *vcpu_e500,
 
        if (tlbsel == 1) {
                struct vm_area_struct *vma;
-               down_read(&kvm->mm->mmap_sem);
+               mmap_read_lock(kvm->mm);
 
                vma = find_vma(kvm->mm, hva);
                if (vma && hva >= vma->vm_start &&
@@ -441,7 +441,7 @@ static inline int kvmppc_e500_shadow_map(struct kvmppc_vcpu_e500 *vcpu_e500,
                        tsize = max(BOOK3E_PAGESZ_4K, tsize & ~1);
                }
 
-               up_read(&kvm->mm->mmap_sem);
+               mmap_read_unlock(kvm->mm);
        }
 
        if (likely(!pfnmap)) {
index fa05bbd..563faa1 100644 (file)
@@ -96,7 +96,7 @@ static long mm_iommu_do_alloc(struct mm_struct *mm, unsigned long ua,
                goto unlock_exit;
        }
 
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
        chunk = (1UL << (PAGE_SHIFT + MAX_ORDER - 1)) /
                        sizeof(struct vm_area_struct *);
        chunk = min(chunk, entries);
@@ -114,7 +114,7 @@ static long mm_iommu_do_alloc(struct mm_struct *mm, unsigned long ua,
                        pinned += ret;
                break;
        }
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        if (pinned != entries) {
                if (!ret)
                        ret = -EFAULT;
index 6c9d541..e814d34 100644 (file)
@@ -94,7 +94,7 @@ static void subpage_prot_clear(unsigned long addr, unsigned long len)
        size_t nw;
        unsigned long next, limit;
 
-       down_write(&mm->mmap_sem);
+       mmap_write_lock(mm);
 
        spt = mm_ctx_subpage_prot(&mm->context);
        if (!spt)
@@ -129,7 +129,7 @@ static void subpage_prot_clear(unsigned long addr, unsigned long len)
        }
 
 err_out:
-       up_write(&mm->mmap_sem);
+       mmap_write_unlock(mm);
 }
 
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
@@ -219,7 +219,7 @@ SYSCALL_DEFINE3(subpage_prot, unsigned long, addr,
        if (!access_ok(map, (len >> PAGE_SHIFT) * sizeof(u32)))
                return -EFAULT;
 
-       down_write(&mm->mmap_sem);
+       mmap_write_lock(mm);
 
        spt = mm_ctx_subpage_prot(&mm->context);
        if (!spt) {
@@ -269,11 +269,11 @@ SYSCALL_DEFINE3(subpage_prot, unsigned long, addr,
                if (addr + (nw << PAGE_SHIFT) > next)
                        nw = (next - addr) >> PAGE_SHIFT;
 
-               up_write(&mm->mmap_sem);
+               mmap_write_unlock(mm);
                if (__copy_from_user(spp, map, nw * sizeof(u32)))
                        return -EFAULT;
                map += nw;
-               down_write(&mm->mmap_sem);
+               mmap_write_lock(mm);
 
                /* now flush any existing HPTEs for the range */
                hpte_flush_range(mm, addr, nw);
@@ -282,6 +282,6 @@ SYSCALL_DEFINE3(subpage_prot, unsigned long, addr,
                spt->maxaddr = limit;
        err = 0;
  out:
-       up_write(&mm->mmap_sem);
+       mmap_write_unlock(mm);
        return err;
 }
index beb060b..b83abbe 100644 (file)
@@ -33,7 +33,7 @@ int copro_handle_mm_fault(struct mm_struct *mm, unsigned long ea,
        if (mm->pgd == NULL)
                return -EFAULT;
 
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
        ret = -EFAULT;
        vma = find_vma(mm, ea);
        if (!vma)
@@ -82,7 +82,7 @@ int copro_handle_mm_fault(struct mm_struct *mm, unsigned long ea,
                current->min_flt++;
 
 out_unlock:
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        return ret;
 }
 EXPORT_SYMBOL_GPL(copro_handle_mm_fault);
index 39d23a5..ff3653e 100644 (file)
@@ -108,7 +108,7 @@ static int __bad_area(struct pt_regs *regs, unsigned long address, int si_code)
         * Something tried to access memory that isn't in our memory map..
         * Fix it, but check if it's kernel or user first..
         */
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 
        return __bad_area_nosemaphore(regs, address, si_code);
 }
@@ -144,7 +144,7 @@ static noinline int bad_access_pkey(struct pt_regs *regs, unsigned long address,
         */
        pkey = vma_pkey(vma);
 
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 
        /*
         * If we are in kernel mode, bail out with a SEGV, this will
@@ -551,12 +551,12 @@ static int __do_page_fault(struct pt_regs *regs, unsigned long address,
         * source.  If this is invalid we can skip the address space check,
         * thus avoiding the deadlock.
         */
-       if (unlikely(!down_read_trylock(&mm->mmap_sem))) {
+       if (unlikely(!mmap_read_trylock(mm))) {
                if (!is_user && !search_exception_tables(regs->nip))
                        return bad_area_nosemaphore(regs, address);
 
 retry:
-               down_read(&mm->mmap_sem);
+               mmap_read_lock(mm);
        } else {
                /*
                 * The above down_read_trylock() might have succeeded in
@@ -580,7 +580,7 @@ retry:
                if (!must_retry)
                        return bad_area(regs, address);
 
-               up_read(&mm->mmap_sem);
+               mmap_read_unlock(mm);
                if (fault_in_pages_readable((const char __user *)regs->nip,
                                            sizeof(unsigned int)))
                        return bad_area_nosemaphore(regs, address);
@@ -625,7 +625,7 @@ good_area:
                }
        }
 
-       up_read(&current->mm->mmap_sem);
+       mmap_read_unlock(current->mm);
 
        if (unlikely(fault & VM_FAULT_ERROR))
                return mm_fault_error(regs, address, fault);
index 0caec3d..df59d0b 100644 (file)
@@ -332,7 +332,7 @@ get_exec_dcookie_and_offset(struct spu *spu, unsigned int *offsetp,
                fput(exe_file);
        }
 
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
        for (vma = mm->mmap; vma; vma = vma->vm_next) {
                if (vma->vm_start > spu_ref || vma->vm_end <= spu_ref)
                        continue;
@@ -349,13 +349,13 @@ get_exec_dcookie_and_offset(struct spu *spu, unsigned int *offsetp,
        *spu_bin_dcookie = fast_get_dcookie(&vma->vm_file->f_path);
        pr_debug("got dcookie for %pD\n", vma->vm_file);
 
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 
 out:
        return app_cookie;
 
 fail_no_image_cookie:
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 
        printk(KERN_ERR "SPU_PROF: "
                "%s, line %d: Cannot find dcookie for SPU binary\n",
index e44427c..324c0fb 100644 (file)
@@ -343,11 +343,11 @@ static vm_fault_t spufs_ps_fault(struct vm_fault *vmf,
                goto refault;
 
        if (ctx->state == SPU_STATE_SAVED) {
-               up_read(&current->mm->mmap_sem);
+               mmap_read_unlock(current->mm);
                spu_context_nospu_trace(spufs_ps_fault__sleep, ctx);
                err = spufs_wait(ctx->run_wq, ctx->state == SPU_STATE_RUNNABLE);
                spu_context_trace(spufs_ps_fault__wake, ctx, ctx->spu);
-               down_read(&current->mm->mmap_sem);
+               mmap_read_lock(current->mm);
        } else {
                area = ctx->spu->problem_phys + ps_offs;
                ret = vmf_insert_pfn(vmf->vma, vmf->address,
index 484d95a..e827fae 100644 (file)
@@ -61,7 +61,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm,
 
        vdso_len = (vdso_pages + 1) << PAGE_SHIFT;
 
-       down_write(&mm->mmap_sem);
+       mmap_write_lock(mm);
        vdso_base = get_unmapped_area(NULL, 0, vdso_len, 0, 0);
        if (IS_ERR_VALUE(vdso_base)) {
                ret = vdso_base;
@@ -83,7 +83,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm,
                mm->context.vdso = NULL;
 
 end:
-       up_write(&mm->mmap_sem);
+       mmap_write_unlock(mm);
        return ret;
 }
 
index be84e32..cd7f4af 100644 (file)
@@ -69,7 +69,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs)
        perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, addr);
 
 retry:
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
        vma = find_vma(mm, addr);
        if (unlikely(!vma))
                goto bad_area;
@@ -155,7 +155,7 @@ good_area:
                }
        }
 
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        return;
 
        /*
@@ -163,7 +163,7 @@ good_area:
         * Fix it, but check if it's kernel or user first.
         */
 bad_area:
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        /* User mode accesses just cause a SIGSEGV */
        if (user_mode(regs)) {
                do_trap(regs, SIGSEGV, code, addr);
@@ -191,14 +191,14 @@ no_context:
         * (which will retry the fault, or kill us if we got oom-killed).
         */
 out_of_memory:
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        if (!user_mode(regs))
                goto no_context;
        pagefault_out_of_memory();
        return;
 
 do_sigbus:
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        /* Kernel mode? Handle exceptions or die */
        if (!user_mode(regs))
                goto no_context;
index 4c0677f..66e89b2 100644 (file)
@@ -205,7 +205,7 @@ int gmap_make_secure(struct gmap *gmap, unsigned long gaddr, void *uvcb)
 
 again:
        rc = -EFAULT;
-       down_read(&gmap->mm->mmap_sem);
+       mmap_read_lock(gmap->mm);
 
        uaddr = __gmap_translate(gmap, gaddr);
        if (IS_ERR_VALUE(uaddr))
@@ -234,7 +234,7 @@ again:
        pte_unmap_unlock(ptep, ptelock);
        unlock_page(page);
 out:
-       up_read(&gmap->mm->mmap_sem);
+       mmap_read_unlock(gmap->mm);
 
        if (rc == -EAGAIN) {
                wait_on_page_writeback(page);
index 0e98a5d..c4baefa 100644 (file)
@@ -207,7 +207,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
         * it at vdso_base which is the "natural" base for it, but we might
         * fail and end up putting it elsewhere.
         */
-       if (down_write_killable(&mm->mmap_sem))
+       if (mmap_write_lock_killable(mm))
                return -EINTR;
        vdso_base = get_unmapped_area(NULL, 0, vdso_pages << PAGE_SHIFT, 0, 0);
        if (IS_ERR_VALUE(vdso_base)) {
@@ -238,7 +238,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
        rc = 0;
 
 out_up:
-       up_write(&mm->mmap_sem);
+       mmap_write_unlock(mm);
        return rc;
 }
 
index 4e6fb34..6d6b570 100644 (file)
@@ -1173,7 +1173,7 @@ int kvm_s390_shadow_fault(struct kvm_vcpu *vcpu, struct gmap *sg,
        int dat_protection, fake;
        int rc;
 
-       down_read(&sg->mm->mmap_sem);
+       mmap_read_lock(sg->mm);
        /*
         * We don't want any guest-2 tables to change - so the parent
         * tables/pointers we read stay valid - unshadowing is however
@@ -1202,6 +1202,6 @@ shadow_page:
        if (!rc)
                rc = gmap_shadow_page(sg, saddr, __pte(pte.val));
        ipte_unlock(vcpu);
-       up_read(&sg->mm->mmap_sem);
+       mmap_read_unlock(sg->mm);
        return rc;
 }
index a4d4ca2..1608fd9 100644 (file)
@@ -2767,10 +2767,10 @@ static struct page *get_map_page(struct kvm *kvm, u64 uaddr)
 {
        struct page *page = NULL;
 
-       down_read(&kvm->mm->mmap_sem);
+       mmap_read_lock(kvm->mm);
        get_user_pages_remote(NULL, kvm->mm, uaddr, 1, FOLL_WRITE,
                              &page, NULL, NULL);
-       up_read(&kvm->mm->mmap_sem);
+       mmap_read_unlock(kvm->mm);
        return page;
 }
 
index 5c546d2..d0ff26d 100644 (file)
@@ -763,9 +763,9 @@ int kvm_vm_ioctl_enable_cap(struct kvm *kvm, struct kvm_enable_cap *cap)
                        r = -EINVAL;
                else {
                        r = 0;
-                       down_write(&kvm->mm->mmap_sem);
+                       mmap_write_lock(kvm->mm);
                        kvm->mm->context.allow_gmap_hpage_1m = 1;
-                       up_write(&kvm->mm->mmap_sem);
+                       mmap_write_unlock(kvm->mm);
                        /*
                         * We might have to create fake 4k page
                         * tables. To avoid that the hardware works on
@@ -1815,7 +1815,7 @@ static long kvm_s390_get_skeys(struct kvm *kvm, struct kvm_s390_skeys *args)
        if (!keys)
                return -ENOMEM;
 
-       down_read(&current->mm->mmap_sem);
+       mmap_read_lock(current->mm);
        srcu_idx = srcu_read_lock(&kvm->srcu);
        for (i = 0; i < args->count; i++) {
                hva = gfn_to_hva(kvm, args->start_gfn + i);
@@ -1829,7 +1829,7 @@ static long kvm_s390_get_skeys(struct kvm *kvm, struct kvm_s390_skeys *args)
                        break;
        }
        srcu_read_unlock(&kvm->srcu, srcu_idx);
-       up_read(&current->mm->mmap_sem);
+       mmap_read_unlock(current->mm);
 
        if (!r) {
                r = copy_to_user((uint8_t __user *)args->skeydata_addr, keys,
@@ -1873,7 +1873,7 @@ static long kvm_s390_set_skeys(struct kvm *kvm, struct kvm_s390_skeys *args)
                goto out;
 
        i = 0;
-       down_read(&current->mm->mmap_sem);
+       mmap_read_lock(current->mm);
        srcu_idx = srcu_read_lock(&kvm->srcu);
         while (i < args->count) {
                unlocked = false;
@@ -1900,7 +1900,7 @@ static long kvm_s390_set_skeys(struct kvm *kvm, struct kvm_s390_skeys *args)
                        i++;
        }
        srcu_read_unlock(&kvm->srcu, srcu_idx);
-       up_read(&current->mm->mmap_sem);
+       mmap_read_unlock(current->mm);
 out:
        kvfree(keys);
        return r;
@@ -2089,14 +2089,14 @@ static int kvm_s390_get_cmma_bits(struct kvm *kvm,
        if (!values)
                return -ENOMEM;
 
-       down_read(&kvm->mm->mmap_sem);
+       mmap_read_lock(kvm->mm);
        srcu_idx = srcu_read_lock(&kvm->srcu);
        if (peek)
                ret = kvm_s390_peek_cmma(kvm, args, values, bufsize);
        else
                ret = kvm_s390_get_cmma(kvm, args, values, bufsize);
        srcu_read_unlock(&kvm->srcu, srcu_idx);
-       up_read(&kvm->mm->mmap_sem);
+       mmap_read_unlock(kvm->mm);
 
        if (kvm->arch.migration_mode)
                args->remaining = atomic64_read(&kvm->arch.cmma_dirty_pages);
@@ -2146,7 +2146,7 @@ static int kvm_s390_set_cmma_bits(struct kvm *kvm,
                goto out;
        }
 
-       down_read(&kvm->mm->mmap_sem);
+       mmap_read_lock(kvm->mm);
        srcu_idx = srcu_read_lock(&kvm->srcu);
        for (i = 0; i < args->count; i++) {
                hva = gfn_to_hva(kvm, args->start_gfn + i);
@@ -2161,12 +2161,12 @@ static int kvm_s390_set_cmma_bits(struct kvm *kvm,
                set_pgste_bits(kvm->mm, hva, mask, pgstev);
        }
        srcu_read_unlock(&kvm->srcu, srcu_idx);
-       up_read(&kvm->mm->mmap_sem);
+       mmap_read_unlock(kvm->mm);
 
        if (!kvm->mm->context.uses_cmm) {
-               down_write(&kvm->mm->mmap_sem);
+               mmap_write_lock(kvm->mm);
                kvm->mm->context.uses_cmm = 1;
-               up_write(&kvm->mm->mmap_sem);
+               mmap_write_unlock(kvm->mm);
        }
 out:
        vfree(bits);
@@ -2239,9 +2239,9 @@ static int kvm_s390_handle_pv(struct kvm *kvm, struct kvm_pv_cmd *cmd)
                if (r)
                        break;
 
-               down_write(&current->mm->mmap_sem);
+               mmap_write_lock(current->mm);
                r = gmap_mark_unmergeable();
-               up_write(&current->mm->mmap_sem);
+               mmap_write_unlock(current->mm);
                if (r)
                        break;
 
index b579b77..57e08b0 100644 (file)
@@ -270,18 +270,18 @@ static int handle_iske(struct kvm_vcpu *vcpu)
                return kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING);
 retry:
        unlocked = false;
-       down_read(&current->mm->mmap_sem);
+       mmap_read_lock(current->mm);
        rc = get_guest_storage_key(current->mm, vmaddr, &key);
 
        if (rc) {
                rc = fixup_user_fault(current, current->mm, vmaddr,
                                      FAULT_FLAG_WRITE, &unlocked);
                if (!rc) {
-                       up_read(&current->mm->mmap_sem);
+                       mmap_read_unlock(current->mm);
                        goto retry;
                }
        }
-       up_read(&current->mm->mmap_sem);
+       mmap_read_unlock(current->mm);
        if (rc == -EFAULT)
                return kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING);
        if (rc < 0)
@@ -317,17 +317,17 @@ static int handle_rrbe(struct kvm_vcpu *vcpu)
                return kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING);
 retry:
        unlocked = false;
-       down_read(&current->mm->mmap_sem);
+       mmap_read_lock(current->mm);
        rc = reset_guest_reference_bit(current->mm, vmaddr);
        if (rc < 0) {
                rc = fixup_user_fault(current, current->mm, vmaddr,
                                      FAULT_FLAG_WRITE, &unlocked);
                if (!rc) {
-                       up_read(&current->mm->mmap_sem);
+                       mmap_read_unlock(current->mm);
                        goto retry;
                }
        }
-       up_read(&current->mm->mmap_sem);
+       mmap_read_unlock(current->mm);
        if (rc == -EFAULT)
                return kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING);
        if (rc < 0)
@@ -385,7 +385,7 @@ static int handle_sske(struct kvm_vcpu *vcpu)
                if (kvm_is_error_hva(vmaddr))
                        return kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING);
 
-               down_read(&current->mm->mmap_sem);
+               mmap_read_lock(current->mm);
                rc = cond_set_guest_storage_key(current->mm, vmaddr, key, &oldkey,
                                                m3 & SSKE_NQ, m3 & SSKE_MR,
                                                m3 & SSKE_MC);
@@ -395,7 +395,7 @@ static int handle_sske(struct kvm_vcpu *vcpu)
                                              FAULT_FLAG_WRITE, &unlocked);
                        rc = !rc ? -EAGAIN : rc;
                }
-               up_read(&current->mm->mmap_sem);
+               mmap_read_unlock(current->mm);
                if (rc == -EFAULT)
                        return kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING);
                if (rc < 0)
@@ -1091,7 +1091,7 @@ static int handle_pfmf(struct kvm_vcpu *vcpu)
 
                        if (rc)
                                return rc;
-                       down_read(&current->mm->mmap_sem);
+                       mmap_read_lock(current->mm);
                        rc = cond_set_guest_storage_key(current->mm, vmaddr,
                                                        key, NULL, nq, mr, mc);
                        if (rc < 0) {
@@ -1099,7 +1099,7 @@ static int handle_pfmf(struct kvm_vcpu *vcpu)
                                                      FAULT_FLAG_WRITE, &unlocked);
                                rc = !rc ? -EAGAIN : rc;
                        }
-                       up_read(&current->mm->mmap_sem);
+                       mmap_read_unlock(current->mm);
                        if (rc == -EFAULT)
                                return kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING);
                        if (rc == -EAGAIN)
@@ -1220,9 +1220,9 @@ static int handle_essa(struct kvm_vcpu *vcpu)
                 * already correct, we do nothing and avoid the lock.
                 */
                if (vcpu->kvm->mm->context.uses_cmm == 0) {
-                       down_write(&vcpu->kvm->mm->mmap_sem);
+                       mmap_write_lock(vcpu->kvm->mm);
                        vcpu->kvm->mm->context.uses_cmm = 1;
-                       up_write(&vcpu->kvm->mm->mmap_sem);
+                       mmap_write_unlock(vcpu->kvm->mm);
                }
                /*
                 * If we are here, we are supposed to have CMMA enabled in
@@ -1239,11 +1239,11 @@ static int handle_essa(struct kvm_vcpu *vcpu)
        } else {
                int srcu_idx;
 
-               down_read(&vcpu->kvm->mm->mmap_sem);
+               mmap_read_lock(vcpu->kvm->mm);
                srcu_idx = srcu_read_lock(&vcpu->kvm->srcu);
                i = __do_essa(vcpu, orc);
                srcu_read_unlock(&vcpu->kvm->srcu, srcu_idx);
-               up_read(&vcpu->kvm->mm->mmap_sem);
+               mmap_read_unlock(vcpu->kvm->mm);
                if (i < 0)
                        return i;
                /* Account for the possible extra cbrl entry */
@@ -1251,10 +1251,10 @@ static int handle_essa(struct kvm_vcpu *vcpu)
        }
        vcpu->arch.sie_block->cbrlo &= PAGE_MASK;       /* reset nceo */
        cbrlo = phys_to_virt(vcpu->arch.sie_block->cbrlo);
-       down_read(&gmap->mm->mmap_sem);
+       mmap_read_lock(gmap->mm);
        for (i = 0; i < entries; ++i)
                __gmap_zap(gmap, cbrlo[i]);
-       up_read(&gmap->mm->mmap_sem);
+       mmap_read_unlock(gmap->mm);
        return 0;
 }
 
index 2082323..f0fa51a 100644 (file)
@@ -433,7 +433,7 @@ static inline vm_fault_t do_exception(struct pt_regs *regs, int access)
                flags |= FAULT_FLAG_USER;
        if (access == VM_WRITE || (trans_exc_code & store_indication) == 0x400)
                flags |= FAULT_FLAG_WRITE;
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
 
        gmap = NULL;
        if (IS_ENABLED(CONFIG_PGSTE) && type == GMAP_FAULT) {
@@ -514,7 +514,7 @@ retry:
                        }
                        flags &= ~FAULT_FLAG_RETRY_NOWAIT;
                        flags |= FAULT_FLAG_TRIED;
-                       down_read(&mm->mmap_sem);
+                       mmap_read_lock(mm);
                        goto retry;
                }
        }
@@ -532,7 +532,7 @@ retry:
        }
        fault = 0;
 out_up:
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 out:
        return fault;
 }
@@ -824,22 +824,22 @@ void do_secure_storage_access(struct pt_regs *regs)
        switch (get_fault_type(regs)) {
        case USER_FAULT:
                mm = current->mm;
-               down_read(&mm->mmap_sem);
+               mmap_read_lock(mm);
                vma = find_vma(mm, addr);
                if (!vma) {
-                       up_read(&mm->mmap_sem);
+                       mmap_read_unlock(mm);
                        do_fault_error(regs, VM_READ | VM_WRITE, VM_FAULT_BADMAP);
                        break;
                }
                page = follow_page(vma, addr, FOLL_WRITE | FOLL_GET);
                if (IS_ERR_OR_NULL(page)) {
-                       up_read(&mm->mmap_sem);
+                       mmap_read_unlock(mm);
                        break;
                }
                if (arch_make_page_accessible(page))
                        send_sig(SIGSEGV, current, 0);
                put_page(page);
-               up_read(&mm->mmap_sem);
+               mmap_read_unlock(mm);
                break;
        case KERNEL_FAULT:
                page = phys_to_page(addr);
index 223e14d..a8e818d 100644 (file)
@@ -405,10 +405,10 @@ int gmap_unmap_segment(struct gmap *gmap, unsigned long to, unsigned long len)
                return -EINVAL;
 
        flush = 0;
-       down_write(&gmap->mm->mmap_sem);
+       mmap_write_lock(gmap->mm);
        for (off = 0; off < len; off += PMD_SIZE)
                flush |= __gmap_unmap_by_gaddr(gmap, to + off);
-       up_write(&gmap->mm->mmap_sem);
+       mmap_write_unlock(gmap->mm);
        if (flush)
                gmap_flush_tlb(gmap);
        return 0;
@@ -438,7 +438,7 @@ int gmap_map_segment(struct gmap *gmap, unsigned long from,
                return -EINVAL;
 
        flush = 0;
-       down_write(&gmap->mm->mmap_sem);
+       mmap_write_lock(gmap->mm);
        for (off = 0; off < len; off += PMD_SIZE) {
                /* Remove old translation */
                flush |= __gmap_unmap_by_gaddr(gmap, to + off);
@@ -448,7 +448,7 @@ int gmap_map_segment(struct gmap *gmap, unsigned long from,
                                      (void *) from + off))
                        break;
        }
-       up_write(&gmap->mm->mmap_sem);
+       mmap_write_unlock(gmap->mm);
        if (flush)
                gmap_flush_tlb(gmap);
        if (off >= len)
@@ -495,9 +495,9 @@ unsigned long gmap_translate(struct gmap *gmap, unsigned long gaddr)
 {
        unsigned long rc;
 
-       down_read(&gmap->mm->mmap_sem);
+       mmap_read_lock(gmap->mm);
        rc = __gmap_translate(gmap, gaddr);
-       up_read(&gmap->mm->mmap_sem);
+       mmap_read_unlock(gmap->mm);
        return rc;
 }
 EXPORT_SYMBOL_GPL(gmap_translate);
@@ -640,7 +640,7 @@ int gmap_fault(struct gmap *gmap, unsigned long gaddr,
        int rc;
        bool unlocked;
 
-       down_read(&gmap->mm->mmap_sem);
+       mmap_read_lock(gmap->mm);
 
 retry:
        unlocked = false;
@@ -663,7 +663,7 @@ retry:
 
        rc = __gmap_link(gmap, gaddr, vmaddr);
 out_up:
-       up_read(&gmap->mm->mmap_sem);
+       mmap_read_unlock(gmap->mm);
        return rc;
 }
 EXPORT_SYMBOL_GPL(gmap_fault);
@@ -696,7 +696,7 @@ void gmap_discard(struct gmap *gmap, unsigned long from, unsigned long to)
        unsigned long gaddr, vmaddr, size;
        struct vm_area_struct *vma;
 
-       down_read(&gmap->mm->mmap_sem);
+       mmap_read_lock(gmap->mm);
        for (gaddr = from; gaddr < to;
             gaddr = (gaddr + PMD_SIZE) & PMD_MASK) {
                /* Find the vm address for the guest address */
@@ -719,7 +719,7 @@ void gmap_discard(struct gmap *gmap, unsigned long from, unsigned long to)
                size = min(to - gaddr, PMD_SIZE - (gaddr & ~PMD_MASK));
                zap_page_range(vma, vmaddr, size);
        }
-       up_read(&gmap->mm->mmap_sem);
+       mmap_read_unlock(gmap->mm);
 }
 EXPORT_SYMBOL_GPL(gmap_discard);
 
@@ -1106,9 +1106,9 @@ int gmap_mprotect_notify(struct gmap *gmap, unsigned long gaddr,
                return -EINVAL;
        if (!MACHINE_HAS_ESOP && prot == PROT_READ)
                return -EINVAL;
-       down_read(&gmap->mm->mmap_sem);
+       mmap_read_lock(gmap->mm);
        rc = gmap_protect_range(gmap, gaddr, len, prot, GMAP_NOTIFY_MPROT);
-       up_read(&gmap->mm->mmap_sem);
+       mmap_read_unlock(gmap->mm);
        return rc;
 }
 EXPORT_SYMBOL_GPL(gmap_mprotect_notify);
@@ -1696,11 +1696,11 @@ struct gmap *gmap_shadow(struct gmap *parent, unsigned long asce,
        }
        spin_unlock(&parent->shadow_lock);
        /* protect after insertion, so it will get properly invalidated */
-       down_read(&parent->mm->mmap_sem);
+       mmap_read_lock(parent->mm);
        rc = gmap_protect_range(parent, asce & _ASCE_ORIGIN,
                                ((asce & _ASCE_TABLE_LENGTH) + 1) * PAGE_SIZE,
                                PROT_READ, GMAP_NOTIFY_SHADOW);
-       up_read(&parent->mm->mmap_sem);
+       mmap_read_unlock(parent->mm);
        spin_lock(&parent->shadow_lock);
        new->initialized = true;
        if (rc) {
@@ -2543,12 +2543,12 @@ int s390_enable_sie(void)
        /* Fail if the page tables are 2K */
        if (!mm_alloc_pgste(mm))
                return -EINVAL;
-       down_write(&mm->mmap_sem);
+       mmap_write_lock(mm);
        mm->context.has_pgste = 1;
        /* split thp mappings and disable thp for future mappings */
        thp_split_mm(mm);
        walk_page_range(mm, 0, TASK_SIZE, &zap_zero_walk_ops, NULL);
-       up_write(&mm->mmap_sem);
+       mmap_write_unlock(mm);
        return 0;
 }
 EXPORT_SYMBOL_GPL(s390_enable_sie);
@@ -2617,7 +2617,7 @@ int s390_enable_skey(void)
        struct mm_struct *mm = current->mm;
        int rc = 0;
 
-       down_write(&mm->mmap_sem);
+       mmap_write_lock(mm);
        if (mm_uses_skeys(mm))
                goto out_up;
 
@@ -2630,7 +2630,7 @@ int s390_enable_skey(void)
        walk_page_range(mm, 0, TASK_SIZE, &enable_skey_walk_ops, NULL);
 
 out_up:
-       up_write(&mm->mmap_sem);
+       mmap_write_unlock(mm);
        return rc;
 }
 EXPORT_SYMBOL_GPL(s390_enable_skey);
@@ -2651,9 +2651,9 @@ static const struct mm_walk_ops reset_cmma_walk_ops = {
 
 void s390_reset_cmma(struct mm_struct *mm)
 {
-       down_write(&mm->mmap_sem);
+       mmap_write_lock(mm);
        walk_page_range(mm, 0, TASK_SIZE, &reset_cmma_walk_ops, NULL);
-       up_write(&mm->mmap_sem);
+       mmap_write_unlock(mm);
 }
 EXPORT_SYMBOL_GPL(s390_reset_cmma);
 
@@ -2685,9 +2685,9 @@ void s390_reset_acc(struct mm_struct *mm)
         */
        if (!mmget_not_zero(mm))
                return;
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
        walk_page_range(mm, 0, TASK_SIZE, &reset_acc_walk_ops, NULL);
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        mmput(mm);
 }
 EXPORT_SYMBOL_GPL(s390_reset_acc);
index 020a2c5..38efa3e 100644 (file)
@@ -125,7 +125,7 @@ static long get_pfn(unsigned long user_addr, unsigned long access,
        struct vm_area_struct *vma;
        long ret;
 
-       down_read(&current->mm->mmap_sem);
+       mmap_read_lock(current->mm);
        ret = -EINVAL;
        vma = find_vma(current->mm, user_addr);
        if (!vma)
@@ -135,7 +135,7 @@ static long get_pfn(unsigned long user_addr, unsigned long access,
                goto out;
        ret = follow_pfn(vma, user_addr, pfn);
 out:
-       up_read(&current->mm->mmap_sem);
+       mmap_read_unlock(current->mm);
        return ret;
 }
 
index f8afc01..a5a7b33 100644 (file)
@@ -69,10 +69,10 @@ asmlinkage int sys_cacheflush(unsigned long addr, unsigned long len, int op)
        if (addr + len < addr)
                return -EFAULT;
 
-       down_read(&current->mm->mmap_sem);
+       mmap_read_lock(current->mm);
        vma = find_vma (current->mm, addr);
        if (vma == NULL || addr < vma->vm_start || addr + len > vma->vm_end) {
-               up_read(&current->mm->mmap_sem);
+               mmap_read_unlock(current->mm);
                return -EFAULT;
        }
 
@@ -91,6 +91,6 @@ asmlinkage int sys_cacheflush(unsigned long addr, unsigned long len, int op)
        if (op & CACHEFLUSH_I)
                flush_icache_range(addr, addr+len);
 
-       up_read(&current->mm->mmap_sem);
+       mmap_read_unlock(current->mm);
        return 0;
 }
index 9849448..1bd85a6 100644 (file)
@@ -61,7 +61,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
        unsigned long addr;
        int ret;
 
-       if (down_write_killable(&mm->mmap_sem))
+       if (mmap_write_lock_killable(mm))
                return -EINTR;
 
        addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, 0);
@@ -80,7 +80,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
        current->mm->context.vdso = (void *)addr;
 
 up_fail:
-       up_write(&mm->mmap_sem);
+       mmap_write_unlock(mm);
        return ret;
 }
 
index 67d0e73..d0c0d53 100644 (file)
@@ -279,7 +279,7 @@ __bad_area(struct pt_regs *regs, unsigned long error_code,
         * Something tried to access memory that isn't in our memory map..
         * Fix it, but check if it's kernel or user first..
         */
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 
        __bad_area_nosemaphore(regs, error_code, address, si_code);
 }
@@ -303,7 +303,7 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address)
        struct task_struct *tsk = current;
        struct mm_struct *mm = tsk->mm;
 
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 
        /* Kernel mode? Handle exceptions or die: */
        if (!user_mode(regs))
@@ -328,7 +328,7 @@ mm_fault_error(struct pt_regs *regs, unsigned long error_code,
 
        /* Release mmap_sem first if necessary */
        if (!(fault & VM_FAULT_RETRY))
-               up_read(&current->mm->mmap_sem);
+               mmap_read_unlock(current->mm);
 
        if (!(fault & VM_FAULT_ERROR))
                return 0;
@@ -442,7 +442,7 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs,
        }
 
 retry:
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
 
        vma = find_vma(mm, address);
        if (unlikely(!vma)) {
@@ -510,5 +510,5 @@ good_area:
                }
        }
 
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 }
index 9489513..34588c4 100644 (file)
@@ -195,7 +195,7 @@ asmlinkage void do_sparc_fault(struct pt_regs *regs, int text_fault, int write,
        perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, address);
 
 retry:
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
 
        if (!from_user && address >= PAGE_OFFSET)
                goto bad_area;
@@ -271,7 +271,7 @@ good_area:
                }
        }
 
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        return;
 
        /*
@@ -279,7 +279,7 @@ good_area:
         * Fix it, but check if it's kernel or user first..
         */
 bad_area:
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 
 bad_area_nosemaphore:
        /* User mode accesses just cause a SIGSEGV */
@@ -328,7 +328,7 @@ no_context:
  * us unable to handle the page fault gracefully.
  */
 out_of_memory:
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        if (from_user) {
                pagefault_out_of_memory();
                return;
@@ -336,7 +336,7 @@ out_of_memory:
        goto no_context;
 
 do_sigbus:
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        do_fault_siginfo(BUS_ADRERR, SIGBUS, regs, text_fault);
        if (!from_user)
                goto no_context;
@@ -390,7 +390,7 @@ static void force_user_fault(unsigned long address, int write)
 
        code = SEGV_MAPERR;
 
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
        vma = find_vma(mm, address);
        if (!vma)
                goto bad_area;
@@ -415,15 +415,15 @@ good_area:
        case VM_FAULT_OOM:
                goto do_sigbus;
        }
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        return;
 bad_area:
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        __do_fault_siginfo(code, SIGSEGV, tsk->thread.kregs, address);
        return;
 
 do_sigbus:
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        __do_fault_siginfo(BUS_ADRERR, SIGBUS, tsk->thread.kregs, address);
 }
 
index d8cd85a..417d7f6 100644 (file)
@@ -318,7 +318,7 @@ asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
 
        perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, address);
 
-       if (!down_read_trylock(&mm->mmap_sem)) {
+       if (!mmap_read_trylock(mm)) {
                if ((regs->tstate & TSTATE_PRIV) &&
                    !search_exception_tables(regs->tpc)) {
                        insn = get_fault_insn(regs, insn);
@@ -326,7 +326,7 @@ asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
                }
 
 retry:
-               down_read(&mm->mmap_sem);
+               mmap_read_lock(mm);
        }
 
        if (fault_code & FAULT_CODE_BAD_RA)
@@ -458,7 +458,7 @@ good_area:
                        goto retry;
                }
        }
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 
        mm_rss = get_mm_rss(mm);
 #if defined(CONFIG_TRANSPARENT_HUGEPAGE)
@@ -489,7 +489,7 @@ exit_exception:
         */
 bad_area:
        insn = get_fault_insn(regs, insn);
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 
 handle_kernel_fault:
        do_kernel_fault(regs, si_code, fault_code, insn, address);
@@ -501,7 +501,7 @@ handle_kernel_fault:
  */
 out_of_memory:
        insn = get_fault_insn(regs, insn);
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        if (!(regs->tstate & TSTATE_PRIV)) {
                pagefault_out_of_memory();
                goto exit_exception;
@@ -514,7 +514,7 @@ intr_or_no_mm:
 
 do_sigbus:
        insn = get_fault_insn(regs, insn);
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 
        /*
         * Send a sigbus, regardless of whether we were in kernel
index 9961b0f..cc19e09 100644 (file)
@@ -366,7 +366,7 @@ static int map_vdso(const struct vdso_image *image,
        unsigned long text_start, addr = 0;
        int ret = 0;
 
-       down_write(&mm->mmap_sem);
+       mmap_write_lock(mm);
 
        /*
         * First, get an unmapped region: then randomize it, and make sure that
@@ -422,7 +422,7 @@ up_fail:
        if (ret)
                current->mm->context.vdso = NULL;
 
-       up_write(&mm->mmap_sem);
+       mmap_write_unlock(mm);
        return ret;
 }
 
index b4deb1b..62262c5 100644 (file)
@@ -49,7 +49,7 @@ static inline void activate_mm(struct mm_struct *old, struct mm_struct *new)
        __switch_mm(&new->context.id);
        down_write_nested(&new->mmap_sem, 1);
        uml_setup_stubs(new);
-       up_write(&new->mmap_sem);
+       mmap_write_unlock(new);
 }
 
 static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, 
index ed7f024..6c0e765 100644 (file)
@@ -349,7 +349,7 @@ void fix_range_common(struct mm_struct *mm, unsigned long start_addr,
                printk(KERN_ERR "fix_range_common: failed, killing current "
                       "process: %d\n", task_tgid_vnr(current));
                /* We are under mmap_sem, release it such that current can terminate */
-               up_write(&current->mm->mmap_sem);
+               mmap_write_unlock(current->mm);
                force_sig(SIGKILL);
                do_signal(&current->thread.regs);
        }
index 9c4b7e7..2b3afa3 100644 (file)
@@ -43,7 +43,7 @@ int handle_page_fault(unsigned long address, unsigned long ip,
        if (is_user)
                flags |= FAULT_FLAG_USER;
 retry:
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
        vma = find_vma(mm, address);
        if (!vma)
                goto out;
@@ -116,7 +116,7 @@ good_area:
 #endif
        flush_tlb_page(vma, address);
 out:
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 out_nosemaphore:
        return err;
 
@@ -125,7 +125,7 @@ out_of_memory:
         * We ran out of memory, call the OOM killer, and return the userspace
         * (which will retry the fault, or kill us if we got oom-killed).
         */
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        if (!is_user)
                goto out_nosemaphore;
        pagefault_out_of_memory();
index 0549d5b..99869b5 100644 (file)
@@ -223,12 +223,12 @@ static int do_pf(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
         * validly references user space from well defined areas of the code,
         * we can bug out early if this is from code which shouldn't.
         */
-       if (!down_read_trylock(&mm->mmap_sem)) {
+       if (!mmap_read_trylock(mm)) {
                if (!user_mode(regs)
                    && !search_exception_tables(regs->UCreg_pc))
                        goto no_context;
 retry:
-               down_read(&mm->mmap_sem);
+               mmap_read_lock(mm);
        } else {
                /*
                 * The above down_read_trylock() might have succeeded in
@@ -263,7 +263,7 @@ retry:
                }
        }
 
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 
        /*
         * Handle the "normal" case first - VM_FAULT_MAJOR
index 43428cc..ea7c1f0 100644 (file)
@@ -144,7 +144,7 @@ int vdso_join_timens(struct task_struct *task, struct time_namespace *ns)
        struct mm_struct *mm = task->mm;
        struct vm_area_struct *vma;
 
-       if (down_write_killable(&mm->mmap_sem))
+       if (mmap_write_lock_killable(mm))
                return -EINTR;
 
        for (vma = mm->mmap; vma; vma = vma->vm_next) {
@@ -154,7 +154,7 @@ int vdso_join_timens(struct task_struct *task, struct time_namespace *ns)
                        zap_page_range(vma, vma->vm_start, size);
        }
 
-       up_write(&mm->mmap_sem);
+       mmap_write_unlock(mm);
        return 0;
 }
 #else
@@ -268,7 +268,7 @@ static int map_vdso(const struct vdso_image *image, unsigned long addr)
        unsigned long text_start;
        int ret = 0;
 
-       if (down_write_killable(&mm->mmap_sem))
+       if (mmap_write_lock_killable(mm))
                return -EINTR;
 
        addr = get_unmapped_area(NULL, addr,
@@ -311,7 +311,7 @@ static int map_vdso(const struct vdso_image *image, unsigned long addr)
        }
 
 up_fail:
-       up_write(&mm->mmap_sem);
+       mmap_write_unlock(mm);
        return ret;
 }
 
@@ -373,7 +373,7 @@ int map_vdso_once(const struct vdso_image *image, unsigned long addr)
        struct mm_struct *mm = current->mm;
        struct vm_area_struct *vma;
 
-       down_write(&mm->mmap_sem);
+       mmap_write_lock(mm);
        /*
         * Check if we have already mapped vdso blob - fail to prevent
         * abusing from userspace install_speciall_mapping, which may
@@ -384,11 +384,11 @@ int map_vdso_once(const struct vdso_image *image, unsigned long addr)
        for (vma = mm->mmap; vma; vma = vma->vm_next) {
                if (vma_is_special_mapping(vma, &vdso_mapping) ||
                                vma_is_special_mapping(vma, &vvar_mapping)) {
-                       up_write(&mm->mmap_sem);
+                       mmap_write_unlock(mm);
                        return -EEXIST;
                }
        }
-       up_write(&mm->mmap_sem);
+       mmap_write_unlock(mm);
 
        return map_vdso(image, addr);
 }
index 47a8676..764573d 100644 (file)
@@ -171,7 +171,7 @@ static void mark_screen_rdonly(struct mm_struct *mm)
        pte_t *pte;
        int i;
 
-       down_write(&mm->mmap_sem);
+       mmap_write_lock(mm);
        pgd = pgd_offset(mm, 0xA0000);
        if (pgd_none_or_clear_bad(pgd))
                goto out;
@@ -197,7 +197,7 @@ static void mark_screen_rdonly(struct mm_struct *mm)
        }
        pte_unmap_unlock(pte, ptl);
 out:
-       up_write(&mm->mmap_sem);
+       mmap_write_unlock(mm);
        flush_tlb_mm_range(mm, 0xA0000, 0xA0000 + 32*PAGE_SIZE, PAGE_SHIFT, false);
 }
 
index c5437f2..8e7e4c2 100644 (file)
@@ -811,7 +811,7 @@ __bad_area(struct pt_regs *regs, unsigned long error_code,
         * Something tried to access memory that isn't in our memory map..
         * Fix it, but check if it's kernel or user first..
         */
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 
        __bad_area_nosemaphore(regs, error_code, address, pkey, si_code);
 }
@@ -1239,7 +1239,7 @@ void do_user_addr_fault(struct pt_regs *regs,
         * 1. Failed to acquire mmap_sem, and
         * 2. The access did not originate in userspace.
         */
-       if (unlikely(!down_read_trylock(&mm->mmap_sem))) {
+       if (unlikely(!mmap_read_trylock(mm))) {
                if (!user_mode(regs) && !search_exception_tables(regs->ip)) {
                        /*
                         * Fault from code in kernel from
@@ -1249,7 +1249,7 @@ void do_user_addr_fault(struct pt_regs *regs,
                        return;
                }
 retry:
-               down_read(&mm->mmap_sem);
+               mmap_read_lock(mm);
        } else {
                /*
                 * The above down_read_trylock() might have succeeded in
@@ -1320,7 +1320,7 @@ good_area:
                goto retry;
        }
 
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        if (unlikely(fault & VM_FAULT_ERROR)) {
                mm_fault_error(regs, hw_error_code, address, fault);
                return;
index 9e7c4ab..76d9f6c 100644 (file)
@@ -58,7 +58,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
        if (!vdso_enabled)
                return 0;
 
-       if (down_write_killable(&mm->mmap_sem))
+       if (mmap_write_lock_killable(mm))
                return -EINTR;
 
        err = install_special_mapping(mm, um_vdso_addr, PAGE_SIZE,
@@ -66,7 +66,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
                VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC,
                vdsop);
 
-       up_write(&mm->mmap_sem);
+       mmap_write_unlock(mm);
 
        return err;
 }
index e7172bd..1c8d22a 100644 (file)
@@ -74,7 +74,7 @@ void do_page_fault(struct pt_regs *regs)
        if (user_mode(regs))
                flags |= FAULT_FLAG_USER;
 retry:
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
        vma = find_vma(mm, address);
 
        if (!vma)
@@ -139,7 +139,7 @@ good_area:
                }
        }
 
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, address);
        if (flags & VM_FAULT_MAJOR)
                perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS_MAJ, 1, regs, address);
@@ -152,7 +152,7 @@ good_area:
         * Fix it, but check if it's kernel or user first..
         */
 bad_area:
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        if (user_mode(regs)) {
                current->thread.bad_vaddr = address;
                current->thread.error_code = is_write;
@@ -167,7 +167,7 @@ bad_area:
         * us unable to handle the page fault gracefully.
         */
 out_of_memory:
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        if (!user_mode(regs))
                bad_page_fault(regs, address, SIGKILL);
        else
@@ -175,7 +175,7 @@ out_of_memory:
        return;
 
 do_sigbus:
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 
        /* Send a sigbus, regardless of whether we were in kernel
         * or user mode.
index 2d8b9b9..cbdc43e 100644 (file)
@@ -212,7 +212,7 @@ static int binder_update_page_range(struct binder_alloc *alloc, int allocate,
                mm = alloc->vma_vm_mm;
 
        if (mm) {
-               down_read(&mm->mmap_sem);
+               mmap_read_lock(mm);
                vma = alloc->vma;
        }
 
@@ -270,7 +270,7 @@ static int binder_update_page_range(struct binder_alloc *alloc, int allocate,
                trace_binder_alloc_page_end(alloc, index);
        }
        if (mm) {
-               up_read(&mm->mmap_sem);
+               mmap_read_unlock(mm);
                mmput(mm);
        }
        return 0;
@@ -303,7 +303,7 @@ err_page_ptr_cleared:
        }
 err_no_vma:
        if (mm) {
-               up_read(&mm->mmap_sem);
+               mmap_read_unlock(mm);
                mmput(mm);
        }
        return vma ? -ENOMEM : -ESRCH;
@@ -932,7 +932,7 @@ enum lru_status binder_alloc_free_page(struct list_head *item,
        mm = alloc->vma_vm_mm;
        if (!mmget_not_zero(mm))
                goto err_mmget;
-       if (!down_read_trylock(&mm->mmap_sem))
+       if (!mmap_read_trylock(mm))
                goto err_down_read_mmap_sem_failed;
        vma = binder_alloc_get_vma(alloc);
 
@@ -946,7 +946,7 @@ enum lru_status binder_alloc_free_page(struct list_head *item,
 
                trace_binder_unmap_user_end(alloc, index);
        }
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        mmput(mm);
 
        trace_binder_unmap_kernel_start(alloc, index);
index 68e6e1b..b91b517 100644 (file)
@@ -1393,9 +1393,9 @@ int amdgpu_amdkfd_gpuvm_map_memory_to_gpu(
         * concurrently and the queues are actually stopped
         */
        if (amdgpu_ttm_tt_get_usermm(bo->tbo.ttm)) {
-               down_write(&current->mm->mmap_sem);
+               mmap_write_lock(current->mm);
                is_invalid_userptr = atomic_read(&mem->invalid);
-               up_write(&current->mm->mmap_sem);
+               mmap_write_unlock(current->mm);
        }
 
        mutex_lock(&mem->lock);
index 9cbecd5..e59c01a 100644 (file)
@@ -910,7 +910,7 @@ int amdgpu_ttm_tt_get_user_pages(struct amdgpu_bo *bo, struct page **pages)
                goto out_free_ranges;
        }
 
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
        vma = find_vma(mm, start);
        if (unlikely(!vma || start < vma->vm_start)) {
                r = -EFAULT;
@@ -921,15 +921,15 @@ int amdgpu_ttm_tt_get_user_pages(struct amdgpu_bo *bo, struct page **pages)
                r = -EPERM;
                goto out_unlock;
        }
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        timeout = jiffies + msecs_to_jiffies(HMM_RANGE_DEFAULT_TIMEOUT);
 
 retry:
        range->notifier_seq = mmu_interval_read_begin(&bo->notifier);
 
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
        r = hmm_range_fault(range);
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        if (unlikely(r)) {
                /*
                 * FIXME: This timeout should encompass the retry from
@@ -954,7 +954,7 @@ retry:
        return 0;
 
 out_unlock:
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 out_free_pfns:
        kvfree(range->hmm_pfns);
 out_free_ranges:
index 15476fc..a9583b9 100644 (file)
@@ -901,7 +901,7 @@ void kfd_signal_iommu_event(struct kfd_dev *dev, unsigned int pasid,
 
        memset(&memory_exception_data, 0, sizeof(memory_exception_data));
 
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
        vma = find_vma(mm, address);
 
        memory_exception_data.gpu_id = dev->id;
@@ -924,7 +924,7 @@ void kfd_signal_iommu_event(struct kfd_dev *dev, unsigned int pasid,
                        memory_exception_data.failure.NoExecute = 0;
        }
 
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        mmput(mm);
 
        pr_debug("notpresent %d, noexecute %d, readonly %d\n",
index 70f5f82..fe45bd4 100644 (file)
@@ -93,7 +93,7 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data,
                struct mm_struct *mm = current->mm;
                struct vm_area_struct *vma;
 
-               if (down_write_killable(&mm->mmap_sem)) {
+               if (mmap_write_lock_killable(mm)) {
                        addr = -EINTR;
                        goto err;
                }
@@ -103,7 +103,7 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data,
                                pgprot_writecombine(vm_get_page_prot(vma->vm_flags));
                else
                        addr = -ENOMEM;
-               up_write(&mm->mmap_sem);
+               mmap_write_unlock(mm);
                if (IS_ERR_VALUE(addr))
                        goto err;
        }
index 33776b3..81f7656 100644 (file)
@@ -200,7 +200,7 @@ i915_mmu_notifier_find(struct i915_mm_struct *mm)
        if (IS_ERR(mn))
                err = PTR_ERR(mn);
 
-       down_write(&mm->mm->mmap_sem);
+       mmap_write_lock(mm->mm);
        mutex_lock(&mm->i915->mm_lock);
        if (mm->mn == NULL && !err) {
                /* Protected by mmap_sem (write-lock) */
@@ -217,7 +217,7 @@ i915_mmu_notifier_find(struct i915_mm_struct *mm)
                err = 0;
        }
        mutex_unlock(&mm->i915->mm_lock);
-       up_write(&mm->mm->mmap_sem);
+       mmap_write_unlock(mm->mm);
 
        if (mn && !IS_ERR(mn))
                kfree(mn);
@@ -468,7 +468,7 @@ __i915_gem_userptr_get_pages_worker(struct work_struct *_work)
                if (mmget_not_zero(mm)) {
                        while (pinned < npages) {
                                if (!locked) {
-                                       down_read(&mm->mmap_sem);
+                                       mmap_read_lock(mm);
                                        locked = 1;
                                }
                                ret = pin_user_pages_remote
@@ -483,7 +483,7 @@ __i915_gem_userptr_get_pages_worker(struct work_struct *_work)
                                pinned += ret;
                        }
                        if (locked)
-                               up_read(&mm->mmap_sem);
+                               mmap_read_unlock(mm);
                        mmput(mm);
                }
        }
index 22f054f..ba9f935 100644 (file)
@@ -175,10 +175,10 @@ nouveau_svmm_bind(struct drm_device *dev, void *data,
         */
 
        mm = get_task_mm(current);
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
 
        if (!cli->svm.svmm) {
-               up_read(&mm->mmap_sem);
+               mmap_read_unlock(mm);
                return -EINVAL;
        }
 
@@ -205,7 +205,7 @@ nouveau_svmm_bind(struct drm_device *dev, void *data,
         */
        args->result = 0;
 
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        mmput(mm);
 
        return 0;
@@ -355,7 +355,7 @@ nouveau_svmm_init(struct drm_device *dev, void *data,
        if (ret)
                goto out_free;
 
-       down_write(&current->mm->mmap_sem);
+       mmap_write_lock(current->mm);
        svmm->notifier.ops = &nouveau_mn_ops;
        ret = __mmu_notifier_register(&svmm->notifier, current->mm);
        if (ret)
@@ -364,12 +364,12 @@ nouveau_svmm_init(struct drm_device *dev, void *data,
 
        cli->svm.svmm = svmm;
        cli->svm.cli = cli;
-       up_write(&current->mm->mmap_sem);
+       mmap_write_unlock(current->mm);
        mutex_unlock(&cli->mutex);
        return 0;
 
 out_mm_unlock:
-       up_write(&current->mm->mmap_sem);
+       mmap_write_unlock(current->mm);
 out_free:
        mutex_unlock(&cli->mutex);
        kfree(svmm);
@@ -571,9 +571,9 @@ static int nouveau_range_fault(struct nouveau_svmm *svmm,
                        return -EBUSY;
 
                range.notifier_seq = mmu_interval_read_begin(range.notifier);
-               down_read(&mm->mmap_sem);
+               mmap_read_lock(mm);
                ret = hmm_range_fault(&range);
-               up_read(&mm->mmap_sem);
+               mmap_read_unlock(mm);
                if (ret) {
                        /*
                         * FIXME: the input PFN_REQ flags are destroyed on
@@ -705,18 +705,18 @@ nouveau_svm_fault(struct nvif_notify *notify)
                /* Intersect fault window with the CPU VMA, cancelling
                 * the fault if the address is invalid.
                 */
-               down_read(&mm->mmap_sem);
+               mmap_read_lock(mm);
                vma = find_vma_intersection(mm, start, limit);
                if (!vma) {
                        SVMM_ERR(svmm, "wndw %016llx-%016llx", start, limit);
-                       up_read(&mm->mmap_sem);
+                       mmap_read_unlock(mm);
                        mmput(mm);
                        nouveau_svm_fault_cancel_fault(svm, buffer->fault[fi]);
                        continue;
                }
                start = max_t(u64, start, vma->vm_start);
                limit = min_t(u64, limit, vma->vm_end);
-               up_read(&mm->mmap_sem);
+               mmap_read_unlock(mm);
                SVMM_DBG(svmm, "wndw %016llx-%016llx", start, limit);
 
                if (buffer->fault[fi]->addr != start) {
index 0d0ab8e..cc31d18 100644 (file)
@@ -196,12 +196,12 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser *p)
                p->vm_bos = radeon_vm_get_bos(p->rdev, p->ib.vm,
                                              &p->validated);
        if (need_mmap_lock)
-               down_read(&current->mm->mmap_sem);
+               mmap_read_lock(current->mm);
 
        r = radeon_bo_list_validate(p->rdev, &p->ticket, &p->validated, p->ring);
 
        if (need_mmap_lock)
-               up_read(&current->mm->mmap_sem);
+               mmap_read_unlock(current->mm);
 
        return r;
 }
index 068c3e5..3c8f570 100644 (file)
@@ -342,17 +342,17 @@ int radeon_gem_userptr_ioctl(struct drm_device *dev, void *data,
        }
 
        if (args->flags & RADEON_GEM_USERPTR_VALIDATE) {
-               down_read(&current->mm->mmap_sem);
+               mmap_read_lock(current->mm);
                r = radeon_bo_reserve(bo, true);
                if (r) {
-                       up_read(&current->mm->mmap_sem);
+                       mmap_read_unlock(current->mm);
                        goto release_object;
                }
 
                radeon_ttm_placement_from_domain(bo, RADEON_GEM_DOMAIN_GTT);
                r = ttm_bo_validate(&bo->tbo, &bo->placement, &ctx);
                radeon_bo_unreserve(bo);
-               up_read(&current->mm->mmap_sem);
+               mmap_read_unlock(current->mm);
                if (r)
                        goto release_object;
        }
index 0ad30b1..63f5568 100644 (file)
@@ -68,7 +68,7 @@ static vm_fault_t ttm_bo_vm_fault_idle(struct ttm_buffer_object *bo,
                        goto out_unlock;
 
                ttm_bo_get(bo);
-               up_read(&vmf->vma->vm_mm->mmap_sem);
+               mmap_read_unlock(vmf->vma->vm_mm);
                (void) dma_fence_wait(bo->moving, true);
                dma_resv_unlock(bo->base.resv);
                ttm_bo_put(bo);
@@ -144,7 +144,7 @@ vm_fault_t ttm_bo_vm_reserve(struct ttm_buffer_object *bo,
                if (fault_flag_allow_retry_first(vmf->flags)) {
                        if (!(vmf->flags & FAULT_FLAG_RETRY_NOWAIT)) {
                                ttm_bo_get(bo);
-                               up_read(&vmf->vma->vm_mm->mmap_sem);
+                               mmap_read_unlock(vmf->vma->vm_mm);
                                if (!dma_resv_lock_interruptible(bo->base.resv,
                                                                 NULL))
                                        dma_resv_unlock(bo->base.resv);
index 3b1e627..ccd2840 100644 (file)
@@ -429,7 +429,7 @@ int ib_umem_odp_map_dma_pages(struct ib_umem_odp *umem_odp, u64 user_virt,
                                ALIGN(bcnt, PAGE_SIZE) / PAGE_SIZE,
                                PAGE_SIZE / sizeof(struct page *));
 
-               down_read(&owning_mm->mmap_sem);
+               mmap_read_lock(owning_mm);
                /*
                 * Note: this might result in redundent page getting. We can
                 * avoid this by checking dma_list to be 0 before calling
@@ -440,7 +440,7 @@ int ib_umem_odp_map_dma_pages(struct ib_umem_odp *umem_odp, u64 user_virt,
                npages = get_user_pages_remote(owning_process, owning_mm,
                                user_virt, gup_num_pages,
                                flags, local_page_list, NULL, NULL);
-               up_read(&owning_mm->mmap_sem);
+               mmap_read_unlock(owning_mm);
 
                if (npages < 0) {
                        if (npages != -EAGAIN)
index 47794c8..3c73673 100644 (file)
@@ -840,7 +840,7 @@ void uverbs_user_mmap_disassociate(struct ib_uverbs_file *ufile)
                 * at a time to get the lock ordering right. Typically there
                 * will only be one mm, so no big deal.
                 */
-               down_read(&mm->mmap_sem);
+               mmap_read_lock(mm);
                if (!mmget_still_valid(mm))
                        goto skip_mm;
                mutex_lock(&ufile->umap_lock);
@@ -862,7 +862,7 @@ void uverbs_user_mmap_disassociate(struct ib_uverbs_file *ufile)
                }
                mutex_unlock(&ufile->umap_lock);
        skip_mm:
-               up_read(&mm->mmap_sem);
+               mmap_read_unlock(mm);
                mmput(mm);
        }
 }
index e2fb71b..7e0b205 100644 (file)
@@ -380,7 +380,7 @@ static struct ib_umem *mlx4_get_umem_mr(struct ib_device *device, u64 start,
                unsigned long untagged_start = untagged_addr(start);
                struct vm_area_struct *vma;
 
-               down_read(&current->mm->mmap_sem);
+               mmap_read_lock(current->mm);
                /*
                 * FIXME: Ideally this would iterate over all the vmas that
                 * cover the memory, but for now it requires a single vma to
@@ -395,7 +395,7 @@ static struct ib_umem *mlx4_get_umem_mr(struct ib_device *device, u64 start,
                        access_flags |= IB_ACCESS_LOCAL_WRITE;
                }
 
-               up_read(&current->mm->mmap_sem);
+               mmap_read_unlock(current->mm);
        }
 
        return ib_umem_get(device, start, length, access_flags);
index 342e317..4c24e83 100644 (file)
@@ -106,18 +106,18 @@ int qib_get_user_pages(unsigned long start_page, size_t num_pages,
                goto bail;
        }
 
-       down_read(&current->mm->mmap_sem);
+       mmap_read_lock(current->mm);
        for (got = 0; got < num_pages; got += ret) {
                ret = pin_user_pages(start_page + got * PAGE_SIZE,
                                     num_pages - got,
                                     FOLL_LONGTERM | FOLL_WRITE | FOLL_FORCE,
                                     p + got, NULL);
                if (ret < 0) {
-                       up_read(&current->mm->mmap_sem);
+                       mmap_read_unlock(current->mm);
                        goto bail_release;
                }
        }
-       up_read(&current->mm->mmap_sem);
+       mmap_read_unlock(current->mm);
 
        return 0;
 bail_release:
index bd9f944..760b254 100644 (file)
@@ -123,7 +123,7 @@ static int usnic_uiom_get_pages(unsigned long addr, size_t size, int writable,
        npages = PAGE_ALIGN(size + (addr & ~PAGE_MASK)) >> PAGE_SHIFT;
 
        uiomr->owning_mm = mm = current->mm;
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
 
        locked = atomic64_add_return(npages, &current->mm->pinned_vm);
        lock_limit = rlimit(RLIMIT_MEMLOCK) >> PAGE_SHIFT;
@@ -187,7 +187,7 @@ out:
        } else
                mmgrab(uiomr->owning_mm);
 
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        free_page((unsigned long) page_list);
        return ret;
 }
index 8711778..34a910c 100644 (file)
@@ -394,7 +394,7 @@ struct siw_umem *siw_umem_get(u64 start, u64 len, bool writable)
        if (!writable)
                foll_flags |= FOLL_FORCE;
 
-       down_read(&mm_s->mmap_sem);
+       mmap_read_lock(mm_s);
 
        mlock_limit = rlimit(RLIMIT_MEMLOCK) >> PAGE_SHIFT;
 
@@ -438,7 +438,7 @@ struct siw_umem *siw_umem_get(u64 start, u64 len, bool writable)
                num_pages -= got;
        }
 out_sem_up:
-       up_read(&mm_s->mmap_sem);
+       mmap_read_unlock(mm_s);
 
        if (rv > 0)
                return umem;
index c8a7b6b..e4b025c 100644 (file)
@@ -485,7 +485,7 @@ static void do_fault(struct work_struct *work)
                flags |= FAULT_FLAG_WRITE;
        flags |= FAULT_FLAG_REMOTE;
 
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
        vma = find_extend_vma(mm, address);
        if (!vma || address < vma->vm_start)
                /* failed to get a vma in the right range */
@@ -497,7 +497,7 @@ static void do_fault(struct work_struct *work)
 
        ret = handle_mm_fault(vma, address, flags);
 out:
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 
        if (ret & VM_FAULT_ERROR)
                /* failed to service fault */
index a035ef9..6c87c80 100644 (file)
@@ -863,7 +863,7 @@ static irqreturn_t prq_event_thread(int irq, void *d)
                if (!mmget_not_zero(svm->mm))
                        goto bad_req;
 
-               down_read(&svm->mm->mmap_sem);
+               mmap_read_lock(svm->mm);
                vma = find_extend_vma(svm->mm, address);
                if (!vma || address < vma->vm_start)
                        goto invalid;
@@ -878,7 +878,7 @@ static irqreturn_t prq_event_thread(int irq, void *d)
 
                result = QI_RESP_SUCCESS;
        invalid:
-               up_read(&svm->mm->mmap_sem);
+               mmap_read_unlock(svm->mm);
                mmput(svm->mm);
        bad_req:
                /* Accounting for major/minor faults? */
index 2686f03..5c91fc3 100644 (file)
@@ -535,7 +535,7 @@ int videobuf_qbuf(struct videobuf_queue *q, struct v4l2_buffer *b)
        MAGIC_CHECK(q->int_ops->magic, MAGIC_QTYPE_OPS);
 
        if (b->memory == V4L2_MEMORY_MMAP)
-               down_read(&current->mm->mmap_sem);
+               mmap_read_lock(current->mm);
 
        videobuf_queue_lock(q);
        retval = -EBUSY;
@@ -622,7 +622,7 @@ done:
        videobuf_queue_unlock(q);
 
        if (b->memory == V4L2_MEMORY_MMAP)
-               up_read(&current->mm->mmap_sem);
+               mmap_read_unlock(current->mm);
 
        return retval;
 }
index aeb2f49..52312ce 100644 (file)
@@ -169,7 +169,7 @@ static int videobuf_dma_contig_user_get(struct videobuf_dma_contig_memory *mem,
        mem->size = PAGE_ALIGN(vb->size + offset);
        ret = -EINVAL;
 
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
 
        vma = find_vma(mm, untagged_baddr);
        if (!vma)
@@ -201,7 +201,7 @@ static int videobuf_dma_contig_user_get(struct videobuf_dma_contig_memory *mem,
        }
 
 out_up:
-       up_read(&current->mm->mmap_sem);
+       mmap_read_unlock(current->mm);
 
        return ret;
 }
index 5999aad..6729638 100644 (file)
@@ -200,9 +200,9 @@ static int videobuf_dma_init_user(struct videobuf_dmabuf *dma, int direction,
 {
        int ret;
 
-       down_read(&current->mm->mmap_sem);
+       mmap_read_lock(current->mm);
        ret = videobuf_dma_init_user_locked(dma, direction, data, size);
-       up_read(&current->mm->mmap_sem);
+       mmap_read_unlock(current->mm);
 
        return ret;
 }
index 258c43a..a2c0fbb 100644 (file)
@@ -207,7 +207,7 @@ static int get_vma_info(struct mm_struct *mm, u64 addr,
        struct vm_area_struct *vma = NULL;
        int rc = 0;
 
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
 
        vma = find_vma(mm, addr);
        if (!vma) {
@@ -218,7 +218,7 @@ static int get_vma_info(struct mm_struct *mm, u64 addr,
        *vma_start = vma->vm_start;
        *vma_end = vma->vm_end;
 out:
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        return rc;
 }
 
index 2297e6f..01153b7 100644 (file)
@@ -321,7 +321,7 @@ static void cxl_prefault_vma(struct cxl_context *ctx)
                return;
        }
 
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
        for (vma = mm->mmap; vma; vma = vma->vm_next) {
                for (ea = vma->vm_start; ea < vma->vm_end;
                                ea = next_segment(ea, slb.vsid)) {
@@ -336,7 +336,7 @@ static void cxl_prefault_vma(struct cxl_context *ctx)
                        last_esid = slb.esid;
                }
        }
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 
        mmput(mm);
 }
index ddd7312..8f4e289 100644 (file)
@@ -68,14 +68,14 @@ static struct gru_thread_state *gru_find_lock_gts(unsigned long vaddr)
        struct vm_area_struct *vma;
        struct gru_thread_state *gts = NULL;
 
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
        vma = gru_find_vma(vaddr);
        if (vma)
                gts = gru_find_thread_state(vma, TSID(vaddr, vma));
        if (gts)
                mutex_lock(&gts->ts_ctxlock);
        else
-               up_read(&mm->mmap_sem);
+               mmap_read_unlock(mm);
        return gts;
 }
 
@@ -85,7 +85,7 @@ static struct gru_thread_state *gru_alloc_locked_gts(unsigned long vaddr)
        struct vm_area_struct *vma;
        struct gru_thread_state *gts = ERR_PTR(-EINVAL);
 
-       down_write(&mm->mmap_sem);
+       mmap_write_lock(mm);
        vma = gru_find_vma(vaddr);
        if (!vma)
                goto err;
@@ -94,11 +94,11 @@ static struct gru_thread_state *gru_alloc_locked_gts(unsigned long vaddr)
        if (IS_ERR(gts))
                goto err;
        mutex_lock(&gts->ts_ctxlock);
-       downgrade_write(&mm->mmap_sem);
+       mmap_write_downgrade(mm);
        return gts;
 
 err:
-       up_write(&mm->mmap_sem);
+       mmap_write_unlock(mm);
        return gts;
 }
 
@@ -108,7 +108,7 @@ err:
 static void gru_unlock_gts(struct gru_thread_state *gts)
 {
        mutex_unlock(&gts->ts_ctxlock);
-       up_read(&current->mm->mmap_sem);
+       mmap_read_unlock(current->mm);
 }
 
 /*
@@ -574,9 +574,9 @@ static irqreturn_t gru_intr(int chiplet, int blade)
                 */
                gts->ustats.fmm_tlbmiss++;
                if (!gts->ts_force_cch_reload &&
-                                       down_read_trylock(&gts->ts_mm->mmap_sem)) {
+                                       mmap_read_trylock(gts->ts_mm)) {
                        gru_try_dropin(gru, gts, tfh, NULL);
-                       up_read(&gts->ts_mm->mmap_sem);
+                       mmap_read_unlock(gts->ts_mm);
                } else {
                        tfh_user_polling_mode(tfh);
                        STAT(intr_mm_lock_failed);
index 9d04231..93bb49d 100644 (file)
@@ -135,7 +135,7 @@ static int gru_create_new_context(unsigned long arg)
        if (!(req.options & GRU_OPT_MISS_MASK))
                req.options |= GRU_OPT_MISS_FMM_INTR;
 
-       down_write(&current->mm->mmap_sem);
+       mmap_write_lock(current->mm);
        vma = gru_find_vma(req.gseg);
        if (vma) {
                vdata = vma->vm_private_data;
@@ -146,7 +146,7 @@ static int gru_create_new_context(unsigned long arg)
                vdata->vd_tlb_preload_count = req.tlb_preload_count;
                ret = 0;
        }
-       up_write(&current->mm->mmap_sem);
+       mmap_write_unlock(current->mm);
 
        return ret;
 }
index ac27f3d..d3b017a 100644 (file)
@@ -91,11 +91,11 @@ munmap_notify(struct notifier_block *self, unsigned long val, void *data)
        struct mm_struct *mm = current->mm;
        struct vm_area_struct *mpnt;
 
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
 
        mpnt = find_vma(mm, addr);
        if (mpnt && mpnt->vm_file && (mpnt->vm_flags & VM_EXEC)) {
-               up_read(&mm->mmap_sem);
+               mmap_read_unlock(mm);
                /* To avoid latency problems, we only process the current CPU,
                 * hoping that most samples for the task are on this CPU
                 */
@@ -103,7 +103,7 @@ munmap_notify(struct notifier_block *self, unsigned long val, void *data)
                return 0;
        }
 
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        return 0;
 }
 
@@ -256,7 +256,7 @@ lookup_dcookie(struct mm_struct *mm, unsigned long addr, off_t *offset)
        unsigned long cookie = NO_COOKIE;
        struct vm_area_struct *vma;
 
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
        for (vma = find_vma(mm, addr); vma; vma = vma->vm_next) {
 
                if (addr < vma->vm_start || addr >= vma->vm_end)
@@ -276,7 +276,7 @@ lookup_dcookie(struct mm_struct *mm, unsigned long addr, off_t *offset)
 
        if (!vma)
                cookie = INVALID_COOKIE;
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 
        return cookie;
 }
index 7caabdd..8975346 100644 (file)
@@ -75,9 +75,9 @@ static int kpc_dma_transfer(struct dev_private_data *priv,
        }
 
        // Lock the user buffer pages in memory, and hold on to the page pointers (for the sglist)
-       down_read(&current->mm->mmap_sem);      /*  get memory map semaphore */
+       mmap_read_lock(current->mm);      /*  get memory map semaphore */
        rv = get_user_pages(iov_base, acd->page_count, FOLL_TOUCH | FOLL_WRITE | FOLL_GET, acd->user_pages, NULL);
-       up_read(&current->mm->mmap_sem);        /*  release the semaphore */
+       mmap_read_unlock(current->mm);        /*  release the semaphore */
        if (rv != acd->page_count) {
                dev_err(&priv->ldev->pldev->dev, "Couldn't get_user_pages (%ld)\n", rv);
                goto err_get_user_pages;
index dbed3f4..20b6fd7 100644 (file)
@@ -565,10 +565,10 @@ static int check_mem_type(unsigned long start, size_t num_pages)
        if (virt_addr_valid(start))
                return 0;
 
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
        rc = __check_mem_type(find_vma(mm, start),
                              start + num_pages * PAGE_SIZE);
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 
        return rc;
 }
index 391fafe..186acd8 100644 (file)
@@ -376,11 +376,11 @@ static int vfio_lock_acct(struct vfio_dma *dma, long npage, bool async)
        if (!mm)
                return -ESRCH; /* process exited */
 
-       ret = down_write_killable(&mm->mmap_sem);
+       ret = mmap_write_lock_killable(mm);
        if (!ret) {
                ret = __account_locked_vm(mm, abs(npage), npage > 0, dma->task,
                                          dma->lock_cap);
-               up_write(&mm->mmap_sem);
+               mmap_write_unlock(mm);
        }
 
        if (async)
@@ -452,7 +452,7 @@ static int vaddr_get_pfn(struct mm_struct *mm, unsigned long vaddr,
        if (prot & IOMMU_WRITE)
                flags |= FOLL_WRITE;
 
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
        ret = pin_user_pages_remote(NULL, mm, vaddr, 1, flags | FOLL_LONGTERM,
                                    page, NULL, NULL);
        if (ret == 1) {
@@ -475,7 +475,7 @@ retry:
                        ret = -EFAULT;
        }
 done:
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        return ret;
 }
 
index 0968361..40e2a57 100644 (file)
@@ -527,7 +527,7 @@ static int vhost_vdpa_process_iotlb_update(struct vhost_vdpa *v,
        if (!npages)
                return -EINVAL;
 
-       down_read(&dev->mm->mmap_sem);
+       mmap_read_lock(dev->mm);
 
        locked = atomic64_add_return(npages, &dev->mm->pinned_vm);
        lock_limit = rlimit(RLIMIT_MEMLOCK) >> PAGE_SHIFT;
@@ -580,7 +580,7 @@ out:
                vhost_vdpa_unmap(v, msg->iova, msg->size);
                atomic64_sub(npages, &dev->mm->pinned_vm);
        }
-       up_read(&dev->mm->mmap_sem);
+       mmap_read_unlock(dev->mm);
        free_page((unsigned long)page_list);
        return ret;
 }
index 50651e5..3a939e3 100644 (file)
@@ -625,7 +625,7 @@ static long gntdev_ioctl_get_offset_for_vaddr(struct gntdev_priv *priv,
                return -EFAULT;
        pr_debug("priv %p, offset for vaddr %lx\n", priv, (unsigned long)op.vaddr);
 
-       down_read(&current->mm->mmap_sem);
+       mmap_read_lock(current->mm);
        vma = find_vma(current->mm, op.vaddr);
        if (!vma || vma->vm_ops != &gntdev_vmops)
                goto out_unlock;
@@ -639,7 +639,7 @@ static long gntdev_ioctl_get_offset_for_vaddr(struct gntdev_priv *priv,
        rv = 0;
 
  out_unlock:
-       up_read(&current->mm->mmap_sem);
+       mmap_read_unlock(current->mm);
 
        if (rv == 0 && copy_to_user(u, &op, sizeof(op)) != 0)
                return -EFAULT;
index 989ae9b..a250d11 100644 (file)
@@ -276,7 +276,7 @@ static long privcmd_ioctl_mmap(struct file *file, void __user *udata)
        if (rc || list_empty(&pagelist))
                goto out;
 
-       down_write(&mm->mmap_sem);
+       mmap_write_lock(mm);
 
        {
                struct page *page = list_first_entry(&pagelist,
@@ -301,7 +301,7 @@ static long privcmd_ioctl_mmap(struct file *file, void __user *udata)
 
 
 out_up:
-       up_write(&mm->mmap_sem);
+       mmap_write_unlock(mm);
 
 out:
        free_page_list(&pagelist);
@@ -497,7 +497,7 @@ static long privcmd_ioctl_mmap_batch(
                }
        }
 
-       down_write(&mm->mmap_sem);
+       mmap_write_lock(mm);
 
        vma = find_vma(mm, m.addr);
        if (!vma ||
@@ -553,7 +553,7 @@ static long privcmd_ioctl_mmap_batch(
        BUG_ON(traverse_pages_block(m.num, sizeof(xen_pfn_t),
                                    &pagelist, mmap_batch_fn, &state));
 
-       up_write(&mm->mmap_sem);
+       mmap_write_unlock(mm);
 
        if (state.global_error) {
                /* Write back errors in second pass. */
@@ -574,7 +574,7 @@ out:
        return ret;
 
 out_unlock:
-       up_write(&mm->mmap_sem);
+       mmap_write_unlock(mm);
        goto out;
 }
 
@@ -739,7 +739,7 @@ static long privcmd_ioctl_mmap_resource(struct file *file, void __user *udata)
        if (data->domid != DOMID_INVALID && data->domid != kdata.dom)
                return -EPERM;
 
-       down_write(&mm->mmap_sem);
+       mmap_write_lock(mm);
 
        vma = find_vma(mm, kdata.addr);
        if (!vma || vma->vm_ops != &privcmd_vm_ops) {
@@ -818,7 +818,7 @@ static long privcmd_ioctl_mmap_resource(struct file *file, void __user *udata)
        }
 
 out:
-       up_write(&mm->mmap_sem);
+       mmap_write_unlock(mm);
        kfree(pfns);
 
        return rc;
index 6483f92..7e07913 100644 (file)
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -520,7 +520,7 @@ static int aio_setup_ring(struct kioctx *ctx, unsigned int nr_events)
        ctx->mmap_size = nr_pages * PAGE_SIZE;
        pr_debug("attempting mmap of %lu bytes\n", ctx->mmap_size);
 
-       if (down_write_killable(&mm->mmap_sem)) {
+       if (mmap_write_lock_killable(mm)) {
                ctx->mmap_size = 0;
                aio_free_ring(ctx);
                return -EINTR;
@@ -529,7 +529,7 @@ static int aio_setup_ring(struct kioctx *ctx, unsigned int nr_events)
        ctx->mmap_base = do_mmap_pgoff(ctx->aio_ring_file, 0, ctx->mmap_size,
                                       PROT_READ | PROT_WRITE,
                                       MAP_SHARED, 0, &unused, NULL);
-       up_write(&mm->mmap_sem);
+       mmap_write_unlock(mm);
        if (IS_ERR((void *)ctx->mmap_base)) {
                ctx->mmap_size = 0;
                aio_free_ring(ctx);
index 478a0d8..9fde263 100644 (file)
@@ -445,12 +445,12 @@ static int coredump_wait(int exit_code, struct core_state *core_state)
        core_state->dumper.task = tsk;
        core_state->dumper.next = NULL;
 
-       if (down_write_killable(&mm->mmap_sem))
+       if (mmap_write_lock_killable(mm))
                return -EINTR;
 
        if (!mm->core_state)
                core_waiters = zap_threads(tsk, mm, core_state, exit_code);
-       up_write(&mm->mmap_sem);
+       mmap_write_unlock(mm);
 
        if (core_waiters > 0) {
                struct core_thread *ptr;
index 02d0c5d..105b91d 100644 (file)
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -252,7 +252,7 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
                return -ENOMEM;
        vma_set_anonymous(vma);
 
-       if (down_write_killable(&mm->mmap_sem)) {
+       if (mmap_write_lock_killable(mm)) {
                err = -EINTR;
                goto err_free;
        }
@@ -274,11 +274,11 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
                goto err;
 
        mm->stack_vm = mm->total_vm = 1;
-       up_write(&mm->mmap_sem);
+       mmap_write_unlock(mm);
        bprm->p = vma->vm_end - sizeof(void *);
        return 0;
 err:
-       up_write(&mm->mmap_sem);
+       mmap_write_unlock(mm);
 err_free:
        bprm->vma = NULL;
        vm_area_free(vma);
@@ -763,7 +763,7 @@ int setup_arg_pages(struct linux_binprm *bprm,
                bprm->loader -= stack_shift;
        bprm->exec -= stack_shift;
 
-       if (down_write_killable(&mm->mmap_sem))
+       if (mmap_write_lock_killable(mm))
                return -EINTR;
 
        vm_flags = VM_STACK_FLAGS;
@@ -825,7 +825,7 @@ int setup_arg_pages(struct linux_binprm *bprm,
                ret = -EFAULT;
 
 out_unlock:
-       up_write(&mm->mmap_sem);
+       mmap_write_unlock(mm);
        return ret;
 }
 EXPORT_SYMBOL(setup_arg_pages);
@@ -1094,9 +1094,9 @@ static int exec_mmap(struct mm_struct *mm)
                 * through with the exec.  We must hold mmap_sem around
                 * checking core_state and changing tsk->mm.
                 */
-               down_read(&old_mm->mmap_sem);
+               mmap_read_lock(old_mm);
                if (unlikely(old_mm->core_state)) {
-                       up_read(&old_mm->mmap_sem);
+                       mmap_read_unlock(old_mm);
                        mutex_unlock(&tsk->signal->exec_update_mutex);
                        return -EINTR;
                }
@@ -1112,7 +1112,7 @@ static int exec_mmap(struct mm_struct *mm)
        vmacache_flush(tsk);
        task_unlock(tsk);
        if (old_mm) {
-               up_read(&old_mm->mmap_sem);
+               mmap_read_unlock(old_mm);
                BUG_ON(active_mm != old_mm);
                setmax_mm_hiwater_rss(&tsk->signal->maxrss, old_mm);
                mm_update_next_owner(old_mm);
index 9d4bd0d..9fb0dc6 100644 (file)
@@ -7186,7 +7186,7 @@ static int io_sqe_buffer_register(struct io_ring_ctx *ctx, void __user *arg,
                }
 
                ret = 0;
-               down_read(&current->mm->mmap_sem);
+               mmap_read_lock(current->mm);
                pret = pin_user_pages(ubuf, nr_pages,
                                      FOLL_WRITE | FOLL_LONGTERM,
                                      pages, vmas);
@@ -7204,7 +7204,7 @@ static int io_sqe_buffer_register(struct io_ring_ctx *ctx, void __user *arg,
                } else {
                        ret = pret < 0 ? pret : -EFAULT;
                }
-               up_read(&current->mm->mmap_sem);
+               mmap_read_unlock(current->mm);
                if (ret) {
                        /*
                         * if we did partial map, or found file backed vmas,
index 066d9c0..f9c88e4 100644 (file)
@@ -2112,11 +2112,11 @@ static int map_files_d_revalidate(struct dentry *dentry, unsigned int flags)
                goto out;
 
        if (!dname_to_vma_addr(dentry, &vm_start, &vm_end)) {
-               status = down_read_killable(&mm->mmap_sem);
+               status = mmap_read_lock_killable(mm);
                if (!status) {
                        exact_vma_exists = !!find_exact_vma(mm, vm_start,
                                                            vm_end);
-                       up_read(&mm->mmap_sem);
+                       mmap_read_unlock(mm);
                }
        }
 
@@ -2163,7 +2163,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path)
        if (rc)
                goto out_mmput;
 
-       rc = down_read_killable(&mm->mmap_sem);
+       rc = mmap_read_lock_killable(mm);
        if (rc)
                goto out_mmput;
 
@@ -2174,7 +2174,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path)
                path_get(path);
                rc = 0;
        }
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 
 out_mmput:
        mmput(mm);
@@ -2264,7 +2264,7 @@ static struct dentry *proc_map_files_lookup(struct inode *dir,
                goto out_put_task;
 
        result = ERR_PTR(-EINTR);
-       if (down_read_killable(&mm->mmap_sem))
+       if (mmap_read_lock_killable(mm))
                goto out_put_mm;
 
        result = ERR_PTR(-ENOENT);
@@ -2277,7 +2277,7 @@ static struct dentry *proc_map_files_lookup(struct inode *dir,
                                (void *)(unsigned long)vma->vm_file->f_mode);
 
 out_no_vma:
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 out_put_mm:
        mmput(mm);
 out_put_task:
index 6ad407d..81b9854 100644 (file)
@@ -145,7 +145,7 @@ static void *m_start(struct seq_file *m, loff_t *ppos)
                return NULL;
        }
 
-       if (down_read_killable(&mm->mmap_sem)) {
+       if (mmap_read_lock_killable(mm)) {
                mmput(mm);
                put_task_struct(priv->task);
                priv->task = NULL;
@@ -188,7 +188,7 @@ static void m_stop(struct seq_file *m, void *v)
                return;
 
        release_task_mempolicy(priv);
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        mmput(mm);
        put_task_struct(priv->task);
        priv->task = NULL;
@@ -847,7 +847,7 @@ static int show_smaps_rollup(struct seq_file *m, void *v)
 
        memset(&mss, 0, sizeof(mss));
 
-       ret = down_read_killable(&mm->mmap_sem);
+       ret = mmap_read_lock_killable(mm);
        if (ret)
                goto out_put_mm;
 
@@ -866,7 +866,7 @@ static int show_smaps_rollup(struct seq_file *m, void *v)
        __show_smap(m, &mss, true);
 
        release_task_mempolicy(priv);
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 
 out_put_mm:
        mmput(mm);
@@ -1140,7 +1140,7 @@ static ssize_t clear_refs_write(struct file *file, const char __user *buf,
                };
 
                if (type == CLEAR_REFS_MM_HIWATER_RSS) {
-                       if (down_write_killable(&mm->mmap_sem)) {
+                       if (mmap_write_lock_killable(mm)) {
                                count = -EINTR;
                                goto out_mm;
                        }
@@ -1150,11 +1150,11 @@ static ssize_t clear_refs_write(struct file *file, const char __user *buf,
                         * resident set size to this mm's current rss value.
                         */
                        reset_mm_hiwater_rss(mm);
-                       up_write(&mm->mmap_sem);
+                       mmap_write_unlock(mm);
                        goto out_mm;
                }
 
-               if (down_read_killable(&mm->mmap_sem)) {
+               if (mmap_read_lock_killable(mm)) {
                        count = -EINTR;
                        goto out_mm;
                }
@@ -1163,8 +1163,8 @@ static ssize_t clear_refs_write(struct file *file, const char __user *buf,
                        for (vma = mm->mmap; vma; vma = vma->vm_next) {
                                if (!(vma->vm_flags & VM_SOFTDIRTY))
                                        continue;
-                               up_read(&mm->mmap_sem);
-                               if (down_write_killable(&mm->mmap_sem)) {
+                               mmap_read_unlock(mm);
+                               if (mmap_write_lock_killable(mm)) {
                                        count = -EINTR;
                                        goto out_mm;
                                }
@@ -1183,14 +1183,14 @@ static ssize_t clear_refs_write(struct file *file, const char __user *buf,
                                         * failed like if
                                         * get_proc_task() fails?
                                         */
-                                       up_write(&mm->mmap_sem);
+                                       mmap_write_unlock(mm);
                                        goto out_mm;
                                }
                                for (vma = mm->mmap; vma; vma = vma->vm_next) {
                                        vma->vm_flags &= ~VM_SOFTDIRTY;
                                        vma_set_page_prot(vma);
                                }
-                               downgrade_write(&mm->mmap_sem);
+                               mmap_write_downgrade(mm);
                                break;
                        }
 
@@ -1203,7 +1203,7 @@ static ssize_t clear_refs_write(struct file *file, const char __user *buf,
                if (type == CLEAR_REFS_SOFT_DIRTY)
                        mmu_notifier_invalidate_range_end(&range);
                tlb_finish_mmu(&tlb, 0, -1);
-               up_read(&mm->mmap_sem);
+               mmap_read_unlock(mm);
 out_mm:
                mmput(mm);
        }
@@ -1564,11 +1564,11 @@ static ssize_t pagemap_read(struct file *file, char __user *buf,
                /* overflow ? */
                if (end < start_vaddr || end > end_vaddr)
                        end = end_vaddr;
-               ret = down_read_killable(&mm->mmap_sem);
+               ret = mmap_read_lock_killable(mm);
                if (ret)
                        goto out_free;
                ret = walk_page_range(mm, start_vaddr, end, &pagemap_ops, &pm);
-               up_read(&mm->mmap_sem);
+               mmap_read_unlock(mm);
                start_vaddr = end;
 
                len = min(count, PM_ENTRY_BYTES * pm.pos);
index 7907e64..a6d21fc 100644 (file)
@@ -25,7 +25,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
        struct rb_node *p;
        unsigned long bytes = 0, sbytes = 0, slack = 0, size;
         
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
        for (p = rb_first(&mm->mm_rb); p; p = rb_next(p)) {
                vma = rb_entry(p, struct vm_area_struct, vm_rb);
 
@@ -77,7 +77,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
                "Shared:\t%8lu bytes\n",
                bytes, slack, sbytes);
 
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 }
 
 unsigned long task_vsize(struct mm_struct *mm)
@@ -86,12 +86,12 @@ unsigned long task_vsize(struct mm_struct *mm)
        struct rb_node *p;
        unsigned long vsize = 0;
 
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
        for (p = rb_first(&mm->mm_rb); p; p = rb_next(p)) {
                vma = rb_entry(p, struct vm_area_struct, vm_rb);
                vsize += vma->vm_end - vma->vm_start;
        }
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        return vsize;
 }
 
@@ -104,7 +104,7 @@ unsigned long task_statm(struct mm_struct *mm,
        struct rb_node *p;
        unsigned long size = kobjsize(mm);
 
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
        for (p = rb_first(&mm->mm_rb); p; p = rb_next(p)) {
                vma = rb_entry(p, struct vm_area_struct, vm_rb);
                size += kobjsize(vma);
@@ -119,7 +119,7 @@ unsigned long task_statm(struct mm_struct *mm,
                >> PAGE_SHIFT;
        *data = (PAGE_ALIGN(mm->start_stack) - (mm->start_data & PAGE_MASK))
                >> PAGE_SHIFT;
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        size >>= PAGE_SHIFT;
        size += *text + *data;
        *resident = size;
@@ -211,7 +211,7 @@ static void *m_start(struct seq_file *m, loff_t *pos)
        if (!mm || !mmget_not_zero(mm))
                return NULL;
 
-       if (down_read_killable(&mm->mmap_sem)) {
+       if (mmap_read_lock_killable(mm)) {
                mmput(mm);
                return ERR_PTR(-EINTR);
        }
@@ -221,7 +221,7 @@ static void *m_start(struct seq_file *m, loff_t *pos)
                if (n-- == 0)
                        return p;
 
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        mmput(mm);
        return NULL;
 }
@@ -231,7 +231,7 @@ static void m_stop(struct seq_file *m, void *_vml)
        struct proc_maps_private *priv = m->private;
 
        if (!IS_ERR_OR_NULL(_vml)) {
-               up_read(&priv->mm->mmap_sem);
+               mmap_read_unlock(priv->mm);
                mmput(priv->mm);
        }
        if (priv->task) {
index e39fdec..9c645ee 100644 (file)
@@ -514,7 +514,7 @@ vm_fault_t handle_userfault(struct vm_fault *vmf, unsigned long reason)
                must_wait = userfaultfd_huge_must_wait(ctx, vmf->vma,
                                                       vmf->address,
                                                       vmf->flags, reason);
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 
        if (likely(must_wait && !READ_ONCE(ctx->released) &&
                   !userfaultfd_signal_pending(vmf->flags))) {
@@ -637,7 +637,7 @@ static void userfaultfd_event_wait_completion(struct userfaultfd_ctx *ctx,
                struct mm_struct *mm = release_new_ctx->mm;
 
                /* the various vma->vm_userfaultfd_ctx still points to it */
-               down_write(&mm->mmap_sem);
+               mmap_write_lock(mm);
                /* no task can run (and in turn coredump) yet */
                VM_WARN_ON(!mmget_still_valid(mm));
                for (vma = mm->mmap; vma; vma = vma->vm_next)
@@ -645,7 +645,7 @@ static void userfaultfd_event_wait_completion(struct userfaultfd_ctx *ctx,
                                vma->vm_userfaultfd_ctx = NULL_VM_UFFD_CTX;
                                vma->vm_flags &= ~(VM_UFFD_WP | VM_UFFD_MISSING);
                        }
-               up_write(&mm->mmap_sem);
+               mmap_write_unlock(mm);
 
                userfaultfd_ctx_put(release_new_ctx);
        }
@@ -799,7 +799,7 @@ bool userfaultfd_remove(struct vm_area_struct *vma,
 
        userfaultfd_ctx_get(ctx);
        WRITE_ONCE(ctx->mmap_changing, true);
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 
        msg_init(&ewq.msg);
 
@@ -894,7 +894,7 @@ static int userfaultfd_release(struct inode *inode, struct file *file)
         * it's critical that released is set to true (above), before
         * taking the mmap_sem for writing.
         */
-       down_write(&mm->mmap_sem);
+       mmap_write_lock(mm);
        still_valid = mmget_still_valid(mm);
        prev = NULL;
        for (vma = mm->mmap; vma; vma = vma->vm_next) {
@@ -920,7 +920,7 @@ static int userfaultfd_release(struct inode *inode, struct file *file)
                vma->vm_flags = new_flags;
                vma->vm_userfaultfd_ctx = NULL_VM_UFFD_CTX;
        }
-       up_write(&mm->mmap_sem);
+       mmap_write_unlock(mm);
        mmput(mm);
 wakeup:
        /*
@@ -1345,7 +1345,7 @@ static int userfaultfd_register(struct userfaultfd_ctx *ctx,
        if (!mmget_not_zero(mm))
                goto out;
 
-       down_write(&mm->mmap_sem);
+       mmap_write_lock(mm);
        if (!mmget_still_valid(mm))
                goto out_unlock;
        vma = find_vma_prev(mm, start, &prev);
@@ -1492,7 +1492,7 @@ static int userfaultfd_register(struct userfaultfd_ctx *ctx,
                vma = vma->vm_next;
        } while (vma && vma->vm_start < end);
 out_unlock:
-       up_write(&mm->mmap_sem);
+       mmap_write_unlock(mm);
        mmput(mm);
        if (!ret) {
                __u64 ioctls_out;
@@ -1547,7 +1547,7 @@ static int userfaultfd_unregister(struct userfaultfd_ctx *ctx,
        if (!mmget_not_zero(mm))
                goto out;
 
-       down_write(&mm->mmap_sem);
+       mmap_write_lock(mm);
        if (!mmget_still_valid(mm))
                goto out_unlock;
        vma = find_vma_prev(mm, start, &prev);
@@ -1664,7 +1664,7 @@ static int userfaultfd_unregister(struct userfaultfd_ctx *ctx,
                vma = vma->vm_next;
        } while (vma && vma->vm_start < end);
 out_unlock:
-       up_write(&mm->mmap_sem);
+       mmap_write_unlock(mm);
        mmput(mm);
 out:
        return ret;
index 0ba6add..0a6dd94 100644 (file)
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -1544,7 +1544,7 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg,
        if (err)
                goto out_fput;
 
-       if (down_write_killable(&current->mm->mmap_sem)) {
+       if (mmap_write_lock_killable(current->mm)) {
                err = -EINTR;
                goto out_fput;
        }
@@ -1564,7 +1564,7 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg,
        if (IS_ERR_VALUE(addr))
                err = (long)addr;
 invalid:
-       up_write(&current->mm->mmap_sem);
+       mmap_write_unlock(current->mm);
        if (populate)
                mm_populate(addr, populate);
 
@@ -1638,7 +1638,7 @@ long ksys_shmdt(char __user *shmaddr)
        if (addr & ~PAGE_MASK)
                return retval;
 
-       if (down_write_killable(&mm->mmap_sem))
+       if (mmap_write_lock_killable(mm))
                return -EINTR;
 
        /*
@@ -1726,7 +1726,7 @@ long ksys_shmdt(char __user *shmaddr)
 
 #endif
 
-       up_write(&mm->mmap_sem);
+       mmap_write_unlock(mm);
        return retval;
 }
 
index 11ff4a5..c530568 100644 (file)
@@ -541,13 +541,13 @@ void acct_collect(long exitcode, int group_dead)
        if (group_dead && current->mm) {
                struct vm_area_struct *vma;
 
-               down_read(&current->mm->mmap_sem);
+               mmap_read_lock(current->mm);
                vma = current->mm->mmap;
                while (vma) {
                        vsize += vma->vm_end - vma->vm_start;
                        vma = vma->vm_next;
                }
-               up_read(&current->mm->mmap_sem);
+               mmap_read_unlock(current->mm);
        }
 
        spin_lock_irq(&current->sighand->siglock);
index 7b8381c..a13b7e2 100644 (file)
@@ -317,7 +317,7 @@ static void stack_map_get_build_id_offset(struct bpf_stack_build_id *id_offs,
         * with build_id.
         */
        if (!user || !current || !current->mm || irq_work_busy ||
-           down_read_trylock(&current->mm->mmap_sem) == 0) {
+           mmap_read_trylock(current->mm) == 0) {
                /* cannot access current->mm, fall back to ips */
                for (i = 0; i < trace_nr; i++) {
                        id_offs[i].status = BPF_STACK_BUILD_ID_IP;
@@ -342,7 +342,7 @@ static void stack_map_get_build_id_offset(struct bpf_stack_build_id *id_offs,
        }
 
        if (!work) {
-               up_read(&current->mm->mmap_sem);
+               mmap_read_unlock(current->mm);
        } else {
                work->sem = &current->mm->mmap_sem;
                irq_work_queue(&work->irq_work);
index 63d66bb..2861add 100644 (file)
@@ -9784,7 +9784,7 @@ static void perf_event_addr_filters_apply(struct perf_event *event)
                if (!mm)
                        goto restart;
 
-               down_read(&mm->mmap_sem);
+               mmap_read_lock(mm);
        }
 
        raw_spin_lock_irqsave(&ifh->lock, flags);
@@ -9810,7 +9810,7 @@ static void perf_event_addr_filters_apply(struct perf_event *event)
        raw_spin_unlock_irqrestore(&ifh->lock, flags);
 
        if (ifh->nr_file_filters) {
-               up_read(&mm->mmap_sem);
+               mmap_read_unlock(mm);
 
                mmput(mm);
        }
index e51ec84..cd82e1b 100644 (file)
@@ -1058,7 +1058,7 @@ register_for_each_vma(struct uprobe *uprobe, struct uprobe_consumer *new)
                if (err && is_register)
                        goto free;
 
-               down_write(&mm->mmap_sem);
+               mmap_write_lock(mm);
                vma = find_vma(mm, info->vaddr);
                if (!vma || !valid_vma(vma, is_register) ||
                    file_inode(vma->vm_file) != uprobe->inode)
@@ -1080,7 +1080,7 @@ register_for_each_vma(struct uprobe *uprobe, struct uprobe_consumer *new)
                }
 
  unlock:
-               up_write(&mm->mmap_sem);
+               mmap_write_unlock(mm);
  free:
                mmput(mm);
                info = free_map_info(info);
@@ -1235,7 +1235,7 @@ static int unapply_uprobe(struct uprobe *uprobe, struct mm_struct *mm)
        struct vm_area_struct *vma;
        int err = 0;
 
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
        for (vma = mm->mmap; vma; vma = vma->vm_next) {
                unsigned long vaddr;
                loff_t offset;
@@ -1252,7 +1252,7 @@ static int unapply_uprobe(struct uprobe *uprobe, struct mm_struct *mm)
                vaddr = offset_to_vaddr(vma, uprobe->offset);
                err |= remove_breakpoint(uprobe, mm, vaddr);
        }
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 
        return err;
 }
@@ -1439,7 +1439,7 @@ static int xol_add_vma(struct mm_struct *mm, struct xol_area *area)
        struct vm_area_struct *vma;
        int ret;
 
-       if (down_write_killable(&mm->mmap_sem))
+       if (mmap_write_lock_killable(mm))
                return -EINTR;
 
        if (mm->uprobes_state.xol_area) {
@@ -1469,7 +1469,7 @@ static int xol_add_vma(struct mm_struct *mm, struct xol_area *area)
        /* pairs with get_xol_area() */
        smp_store_release(&mm->uprobes_state.xol_area, area); /* ^^^ */
  fail:
-       up_write(&mm->mmap_sem);
+       mmap_write_unlock(mm);
 
        return ret;
 }
@@ -2039,7 +2039,7 @@ static struct uprobe *find_active_uprobe(unsigned long bp_vaddr, int *is_swbp)
        struct uprobe *uprobe = NULL;
        struct vm_area_struct *vma;
 
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
        vma = find_vma(mm, bp_vaddr);
        if (vma && vma->vm_start <= bp_vaddr) {
                if (valid_vma(vma, false)) {
@@ -2057,7 +2057,7 @@ static struct uprobe *find_active_uprobe(unsigned long bp_vaddr, int *is_swbp)
 
        if (!uprobe && test_and_clear_bit(MMF_RECALC_UPROBES, &mm->flags))
                mmf_recalc_uprobes(mm);
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 
        return uprobe;
 }
index 1aecef9..36cbaa4 100644 (file)
@@ -445,12 +445,12 @@ static void exit_mm(void)
         * will increment ->nr_threads for each thread in the
         * group with ->mm != NULL.
         */
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
        core_state = mm->core_state;
        if (core_state) {
                struct core_thread self;
 
-               up_read(&mm->mmap_sem);
+               mmap_read_unlock(mm);
 
                self.task = current;
                self.next = xchg(&core_state->dumper.next, &self);
@@ -468,14 +468,14 @@ static void exit_mm(void)
                        freezable_schedule();
                }
                __set_current_state(TASK_RUNNING);
-               down_read(&mm->mmap_sem);
+               mmap_read_lock(mm);
        }
        mmgrab(mm);
        BUG_ON(mm != current->active_mm);
        /* more a memory barrier than a real lock */
        task_lock(current);
        current->mm = NULL;
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        enter_lazy_tlb(mm, current);
        task_unlock(current);
        mm_update_next_owner(mm);
index 3603e14..d61751b 100644 (file)
@@ -492,7 +492,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
        LIST_HEAD(uf);
 
        uprobe_start_dup_mmap();
-       if (down_write_killable(&oldmm->mmap_sem)) {
+       if (mmap_write_lock_killable(oldmm)) {
                retval = -EINTR;
                goto fail_uprobe_end;
        }
@@ -617,9 +617,9 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
        /* a new mm has just been created */
        retval = arch_dup_mmap(oldmm, mm);
 out:
-       up_write(&mm->mmap_sem);
+       mmap_write_unlock(mm);
        flush_tlb_mm(oldmm);
-       up_write(&oldmm->mmap_sem);
+       mmap_write_unlock(oldmm);
        dup_userfaultfd_complete(&uf);
 fail_uprobe_end:
        uprobe_end_dup_mmap();
@@ -649,9 +649,9 @@ static inline void mm_free_pgd(struct mm_struct *mm)
 #else
 static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
 {
-       down_write(&oldmm->mmap_sem);
+       mmap_write_lock(oldmm);
        RCU_INIT_POINTER(mm->exe_file, get_mm_exe_file(oldmm));
-       up_write(&oldmm->mmap_sem);
+       mmap_write_unlock(oldmm);
        return 0;
 }
 #define mm_alloc_pgd(mm)       (0)
@@ -1022,7 +1022,7 @@ static struct mm_struct *mm_init(struct mm_struct *mm, struct task_struct *p,
        mm->vmacache_seqnum = 0;
        atomic_set(&mm->mm_users, 1);
        atomic_set(&mm->mm_count, 1);
-       init_rwsem(&mm->mmap_sem);
+       mmap_init_lock(mm);
        INIT_LIST_HEAD(&mm->mmlist);
        mm->core_state = NULL;
        mm_pgtables_bytes_init(mm);
index b4b9f96..e646661 100644 (file)
@@ -698,10 +698,10 @@ static int fault_in_user_writeable(u32 __user *uaddr)
        struct mm_struct *mm = current->mm;
        int ret;
 
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
        ret = fixup_user_fault(current, mm, (unsigned long)uaddr,
                               FAULT_FLAG_WRITE, NULL);
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 
        return ret < 0 ? ret : 0;
 }
index 35f4cc0..cbcb2f7 100644 (file)
@@ -2770,7 +2770,7 @@ static void task_numa_work(struct callback_head *work)
                return;
 
 
-       if (!down_read_trylock(&mm->mmap_sem))
+       if (!mmap_read_trylock(mm))
                return;
        vma = find_vma(mm, start);
        if (!vma) {
@@ -2838,7 +2838,7 @@ out:
                mm->numa_scan_offset = start;
        else
                reset_ptenuma_scan(p);
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 
        /*
         * Make sure tasks use at least 32x as much time to run other code
index 891667a..1280575 100644 (file)
@@ -1846,7 +1846,7 @@ static int prctl_set_mm_exe_file(struct mm_struct *mm, unsigned int fd)
        if (exe_file) {
                struct vm_area_struct *vma;
 
-               down_read(&mm->mmap_sem);
+               mmap_read_lock(mm);
                for (vma = mm->mmap; vma; vma = vma->vm_next) {
                        if (!vma->vm_file)
                                continue;
@@ -1855,7 +1855,7 @@ static int prctl_set_mm_exe_file(struct mm_struct *mm, unsigned int fd)
                                goto exit_err;
                }
 
-               up_read(&mm->mmap_sem);
+               mmap_read_unlock(mm);
                fput(exe_file);
        }
 
@@ -1869,7 +1869,7 @@ exit:
        fdput(exe);
        return err;
 exit_err:
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        fput(exe_file);
        goto exit;
 }
@@ -2010,7 +2010,7 @@ static int prctl_set_mm_map(int opt, const void __user *addr, unsigned long data
         * arg_lock protects concurent updates but we still need mmap_sem for
         * read to exclude races with sys_brk.
         */
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
 
        /*
         * We don't validate if these members are pointing to
@@ -2049,7 +2049,7 @@ static int prctl_set_mm_map(int opt, const void __user *addr, unsigned long data
        if (prctl_map.auxv_size)
                memcpy(mm->saved_auxv, user_auxv, sizeof(user_auxv));
 
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        return 0;
 }
 #endif /* CONFIG_CHECKPOINT_RESTORE */
@@ -2125,7 +2125,7 @@ static int prctl_set_mm(int opt, unsigned long addr,
         * mmap_sem for a) concurrent sys_brk, b) finding VMA for addr
         * validation.
         */
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
        vma = find_vma(mm, addr);
 
        spin_lock(&mm->arg_lock);
@@ -2217,7 +2217,7 @@ static int prctl_set_mm(int opt, unsigned long addr,
        error = 0;
 out:
        spin_unlock(&mm->arg_lock);
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        return error;
 }
 
@@ -2442,13 +2442,13 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3,
        case PR_SET_THP_DISABLE:
                if (arg3 || arg4 || arg5)
                        return -EINVAL;
-               if (down_write_killable(&me->mm->mmap_sem))
+               if (mmap_write_lock_killable(me->mm))
                        return -EINTR;
                if (arg2)
                        set_bit(MMF_DISABLE_THP, &me->mm->flags);
                else
                        clear_bit(MMF_DISABLE_THP, &me->mm->flags);
-               up_write(&me->mm->mmap_sem);
+               mmap_write_unlock(me->mm);
                break;
        case PR_MPX_ENABLE_MANAGEMENT:
        case PR_MPX_DISABLE_MANAGEMENT:
index 9a121e1..73976de 100644 (file)
@@ -393,7 +393,7 @@ static int seq_print_user_ip(struct trace_seq *s, struct mm_struct *mm,
        if (mm) {
                const struct vm_area_struct *vma;
 
-               down_read(&mm->mmap_sem);
+               mmap_read_lock(mm);
                vma = find_vma(mm, ip);
                if (vma) {
                        file = vma->vm_file;
@@ -405,7 +405,7 @@ static int seq_print_user_ip(struct trace_seq *s, struct mm_struct *mm,
                                trace_seq_printf(s, "[+0x%lx]",
                                                 ip - vmstart);
                }
-               up_read(&mm->mmap_sem);
+               mmap_read_unlock(mm);
        }
        if (ret && ((sym_flags & TRACE_ITER_SYM_ADDR) || !file))
                trace_seq_printf(s, " <" IP_FMT ">", ip);
index 419fbac..fffb2a6 100644 (file)
@@ -193,9 +193,9 @@ static void test_lock(bool master, bool verbose)
                if (verbose)
                        pr_notice("lock mmap_sem pid=%d\n", main_task->pid);
                if (lock_read)
-                       down_read(&main_task->mm->mmap_sem);
+                       mmap_read_lock(main_task->mm);
                else
-                       down_write(&main_task->mm->mmap_sem);
+                       mmap_write_lock(main_task->mm);
        }
 
        if (test_disable_irq)
@@ -276,9 +276,9 @@ static void test_unlock(bool master, bool verbose)
 
        if (lock_mmap_sem && master) {
                if (lock_read)
-                       up_read(&main_task->mm->mmap_sem);
+                       mmap_read_unlock(main_task->mm);
                else
-                       up_write(&main_task->mm->mmap_sem);
+                       mmap_write_unlock(main_task->mm);
                if (verbose)
                        pr_notice("unlock mmap_sem pid=%d\n", main_task->pid);
        }
index b1a4189..b1442c4 100644 (file)
@@ -1391,7 +1391,7 @@ int __lock_page_or_retry(struct page *page, struct mm_struct *mm,
                if (flags & FAULT_FLAG_RETRY_NOWAIT)
                        return 0;
 
-               up_read(&mm->mmap_sem);
+               mmap_read_unlock(mm);
                if (flags & FAULT_FLAG_KILLABLE)
                        wait_on_page_locked_killable(page);
                else
@@ -1403,7 +1403,7 @@ int __lock_page_or_retry(struct page *page, struct mm_struct *mm,
 
                        ret = __lock_page_killable(page);
                        if (ret) {
-                               up_read(&mm->mmap_sem);
+                               mmap_read_unlock(mm);
                                return 0;
                        }
                } else
@@ -2347,7 +2347,7 @@ static int lock_page_maybe_drop_mmap(struct vm_fault *vmf, struct page *page,
                         * mmap_sem here and return 0 if we don't have a fpin.
                         */
                        if (*fpin == NULL)
-                               up_read(&vmf->vma->vm_mm->mmap_sem);
+                               mmap_read_unlock(vmf->vma->vm_mm);
                        return 0;
                }
        } else
index 4107dbc..c2578e1 100644 (file)
@@ -48,7 +48,7 @@ int get_vaddr_frames(unsigned long start, unsigned int nr_frames,
 
        start = untagged_addr(start);
 
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
        locked = 1;
        vma = find_vma_intersection(mm, start, start + 1);
        if (!vma) {
@@ -102,7 +102,7 @@ int get_vaddr_frames(unsigned long start, unsigned int nr_frames,
        } while (vma && vma->vm_flags & (VM_IO | VM_PFNMAP));
 out:
        if (locked)
-               up_read(&mm->mmap_sem);
+               mmap_read_unlock(mm);
        if (!ret)
                ret = -EFAULT;
        if (ret > 0)
index 89b98c8..41c6489 100644 (file)
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -1249,7 +1249,7 @@ retry:
        }
 
        if (ret & VM_FAULT_RETRY) {
-               down_read(&mm->mmap_sem);
+               mmap_read_lock(mm);
                *unlocked = true;
                fault_flags |= FAULT_FLAG_TRIED;
                goto retry;
@@ -1354,7 +1354,7 @@ retry:
                        break;
                }
 
-               ret = down_read_killable(&mm->mmap_sem);
+               ret = mmap_read_lock_killable(mm);
                if (ret) {
                        BUG_ON(ret > 0);
                        if (!pages_done)
@@ -1389,7 +1389,7 @@ retry:
                 * We must let the caller know we temporarily dropped the lock
                 * and so the critical section protected by it was lost.
                 */
-               up_read(&mm->mmap_sem);
+               mmap_read_unlock(mm);
                *locked = 0;
        }
        return pages_done;
@@ -1477,7 +1477,7 @@ int __mm_populate(unsigned long start, unsigned long len, int ignore_errors)
                 */
                if (!locked) {
                        locked = 1;
-                       down_read(&mm->mmap_sem);
+                       mmap_read_lock(mm);
                        vma = find_vma(mm, nstart);
                } else if (nstart >= vma->vm_end)
                        vma = vma->vm_next;
@@ -1509,7 +1509,7 @@ int __mm_populate(unsigned long start, unsigned long len, int ignore_errors)
                ret = 0;
        }
        if (locked)
-               up_read(&mm->mmap_sem);
+               mmap_read_unlock(mm);
        return ret;     /* 0 or negative error code */
 }
 
@@ -2078,11 +2078,11 @@ long get_user_pages_unlocked(unsigned long start, unsigned long nr_pages,
        if (WARN_ON_ONCE(gup_flags & FOLL_LONGTERM))
                return -EINVAL;
 
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
        ret = __get_user_pages_locked(current, mm, start, nr_pages, pages, NULL,
                                      &locked, gup_flags | FOLL_TOUCH);
        if (locked)
-               up_read(&mm->mmap_sem);
+               mmap_read_unlock(mm);
        return ret;
 }
 EXPORT_SYMBOL(get_user_pages_unlocked);
@@ -2723,11 +2723,11 @@ static int __gup_longterm_unlocked(unsigned long start, int nr_pages,
         * get_user_pages_unlocked() (see comments in that function)
         */
        if (gup_flags & FOLL_LONGTERM) {
-               down_read(&current->mm->mmap_sem);
+               mmap_read_lock(current->mm);
                ret = __gup_longterm_locked(current, current->mm,
                                            start, nr_pages,
                                            pages, NULL, gup_flags);
-               up_read(&current->mm->mmap_sem);
+               mmap_read_unlock(current->mm);
        } else {
                ret = get_user_pages_unlocked(start, nr_pages,
                                              pages, gup_flags);
index 791e4b5..3d3eb86 100644 (file)
@@ -419,7 +419,7 @@ static inline struct file *maybe_unlock_mmap_for_io(struct vm_fault *vmf,
        if (fault_flag_allow_retry_first(flags) &&
            !(flags & FAULT_FLAG_RETRY_NOWAIT)) {
                fpin = get_file(vmf->vma->vm_file);
-               up_read(&vmf->vma->vm_mm->mmap_sem);
+               mmap_read_unlock(vmf->vma->vm_mm);
        }
        return fpin;
 }
index 3f03248..19f3401 100644 (file)
@@ -536,8 +536,8 @@ void __khugepaged_exit(struct mm_struct *mm)
                 * khugepaged has finished working on the pagetables
                 * under the mmap_sem.
                 */
-               down_write(&mm->mmap_sem);
-               up_write(&mm->mmap_sem);
+               mmap_write_lock(mm);
+               mmap_write_unlock(mm);
        }
 }
 
@@ -995,7 +995,7 @@ static bool __collapse_huge_page_swapin(struct mm_struct *mm,
 
                /* do_swap_page returns VM_FAULT_RETRY with released mmap_sem */
                if (ret & VM_FAULT_RETRY) {
-                       down_read(&mm->mmap_sem);
+                       mmap_read_lock(mm);
                        if (hugepage_vma_revalidate(mm, address, &vmf.vma)) {
                                /* vma is no longer available, don't continue to swapin */
                                trace_mm_collapse_huge_page_swapin(mm, swapped_in, referenced, 0);
@@ -1052,7 +1052,7 @@ static void collapse_huge_page(struct mm_struct *mm,
         * sync compaction, and we do not need to hold the mmap_sem during
         * that. We will recheck the vma after taking it again in write mode.
         */
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        new_page = khugepaged_alloc_page(hpage, gfp, node);
        if (!new_page) {
                result = SCAN_ALLOC_HUGE_PAGE_FAIL;
@@ -1065,17 +1065,17 @@ static void collapse_huge_page(struct mm_struct *mm,
        }
        count_memcg_page_event(new_page, THP_COLLAPSE_ALLOC);
 
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
        result = hugepage_vma_revalidate(mm, address, &vma);
        if (result) {
-               up_read(&mm->mmap_sem);
+               mmap_read_unlock(mm);
                goto out_nolock;
        }
 
        pmd = mm_find_pmd(mm, address);
        if (!pmd) {
                result = SCAN_PMD_NULL;
-               up_read(&mm->mmap_sem);
+               mmap_read_unlock(mm);
                goto out_nolock;
        }
 
@@ -1086,17 +1086,17 @@ static void collapse_huge_page(struct mm_struct *mm,
         */
        if (unmapped && !__collapse_huge_page_swapin(mm, vma, address,
                                                     pmd, referenced)) {
-               up_read(&mm->mmap_sem);
+               mmap_read_unlock(mm);
                goto out_nolock;
        }
 
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        /*
         * Prevent all access to pagetables with the exception of
         * gup_fast later handled by the ptep_clear_flush and the VM
         * handled by the anon_vma lock + PG_lock.
         */
-       down_write(&mm->mmap_sem);
+       mmap_write_lock(mm);
        result = SCAN_ANY_PROCESS;
        if (!mmget_still_valid(mm))
                goto out;
@@ -1184,7 +1184,7 @@ static void collapse_huge_page(struct mm_struct *mm,
        khugepaged_pages_collapsed++;
        result = SCAN_SUCCEED;
 out_up_write:
-       up_write(&mm->mmap_sem);
+       mmap_write_unlock(mm);
 out_nolock:
        if (!IS_ERR_OR_NULL(*hpage))
                mem_cgroup_uncharge(*hpage);
@@ -1517,7 +1517,7 @@ static int khugepaged_collapse_pte_mapped_thps(struct mm_slot *mm_slot)
        if (likely(mm_slot->nr_pte_mapped_thp == 0))
                return 0;
 
-       if (!down_write_trylock(&mm->mmap_sem))
+       if (!mmap_write_trylock(mm))
                return -EBUSY;
 
        if (unlikely(khugepaged_test_exit(mm)))
@@ -1528,7 +1528,7 @@ static int khugepaged_collapse_pte_mapped_thps(struct mm_slot *mm_slot)
 
 out:
        mm_slot->nr_pte_mapped_thp = 0;
-       up_write(&mm->mmap_sem);
+       mmap_write_unlock(mm);
        return 0;
 }
 
@@ -1573,12 +1573,12 @@ static void retract_page_tables(struct address_space *mapping, pgoff_t pgoff)
                 * mmap_sem while holding page lock. Fault path does it in
                 * reverse order. Trylock is a way to avoid deadlock.
                 */
-               if (down_write_trylock(&vma->vm_mm->mmap_sem)) {
+               if (mmap_write_trylock(vma->vm_mm)) {
                        spinlock_t *ptl = pmd_lock(vma->vm_mm, pmd);
                        /* assume page table is clear */
                        _pmd = pmdp_collapse_flush(vma, addr, pmd);
                        spin_unlock(ptl);
-                       up_write(&vma->vm_mm->mmap_sem);
+                       mmap_write_unlock(vma->vm_mm);
                        mm_dec_nr_ptes(vma->vm_mm);
                        pte_free(vma->vm_mm, pmd_pgtable(_pmd));
                } else {
@@ -2057,7 +2057,7 @@ static unsigned int khugepaged_scan_mm_slot(unsigned int pages,
         * the next mm on the list.
         */
        vma = NULL;
-       if (unlikely(!down_read_trylock(&mm->mmap_sem)))
+       if (unlikely(!mmap_read_trylock(mm)))
                goto breakouterloop_mmap_sem;
        if (likely(!khugepaged_test_exit(mm)))
                vma = find_vma(mm, khugepaged_scan.address);
@@ -2102,7 +2102,7 @@ skip:
                                pgoff_t pgoff = linear_page_index(vma,
                                                khugepaged_scan.address);
 
-                               up_read(&mm->mmap_sem);
+                               mmap_read_unlock(mm);
                                ret = 1;
                                khugepaged_scan_file(mm, file, pgoff, hpage);
                                fput(file);
@@ -2122,7 +2122,7 @@ skip:
                }
        }
 breakouterloop:
-       up_read(&mm->mmap_sem); /* exit_mmap will destroy ptes after this */
+       mmap_read_unlock(mm); /* exit_mmap will destroy ptes after this */
 breakouterloop_mmap_sem:
 
        spin_lock(&khugepaged_mm_lock);
index 18c5d00..098b580 100644 (file)
--- a/mm/ksm.c
+++ b/mm/ksm.c
@@ -542,11 +542,11 @@ static void break_cow(struct rmap_item *rmap_item)
         */
        put_anon_vma(rmap_item->anon_vma);
 
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
        vma = find_mergeable_vma(mm, addr);
        if (vma)
                break_ksm(vma, addr);
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 }
 
 static struct page *get_mergeable_page(struct rmap_item *rmap_item)
@@ -556,7 +556,7 @@ static struct page *get_mergeable_page(struct rmap_item *rmap_item)
        struct vm_area_struct *vma;
        struct page *page;
 
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
        vma = find_mergeable_vma(mm, addr);
        if (!vma)
                goto out;
@@ -572,7 +572,7 @@ static struct page *get_mergeable_page(struct rmap_item *rmap_item)
 out:
                page = NULL;
        }
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        return page;
 }
 
@@ -976,7 +976,7 @@ static int unmerge_and_remove_all_rmap_items(void)
        for (mm_slot = ksm_scan.mm_slot;
                        mm_slot != &ksm_mm_head; mm_slot = ksm_scan.mm_slot) {
                mm = mm_slot->mm;
-               down_read(&mm->mmap_sem);
+               mmap_read_lock(mm);
                for (vma = mm->mmap; vma; vma = vma->vm_next) {
                        if (ksm_test_exit(mm))
                                break;
@@ -989,7 +989,7 @@ static int unmerge_and_remove_all_rmap_items(void)
                }
 
                remove_trailing_rmap_items(mm_slot, &mm_slot->rmap_list);
-               up_read(&mm->mmap_sem);
+               mmap_read_unlock(mm);
 
                spin_lock(&ksm_mmlist_lock);
                ksm_scan.mm_slot = list_entry(mm_slot->mm_list.next,
@@ -1012,7 +1012,7 @@ static int unmerge_and_remove_all_rmap_items(void)
        return 0;
 
 error:
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        spin_lock(&ksm_mmlist_lock);
        ksm_scan.mm_slot = &ksm_mm_head;
        spin_unlock(&ksm_mmlist_lock);
@@ -1280,7 +1280,7 @@ static int try_to_merge_with_ksm_page(struct rmap_item *rmap_item,
        struct vm_area_struct *vma;
        int err = -EFAULT;
 
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
        vma = find_mergeable_vma(mm, rmap_item->address);
        if (!vma)
                goto out;
@@ -1296,7 +1296,7 @@ static int try_to_merge_with_ksm_page(struct rmap_item *rmap_item,
        rmap_item->anon_vma = vma->anon_vma;
        get_anon_vma(vma->anon_vma);
 out:
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        return err;
 }
 
@@ -2110,7 +2110,7 @@ static void cmp_and_merge_page(struct page *page, struct rmap_item *rmap_item)
        if (ksm_use_zero_pages && (checksum == zero_checksum)) {
                struct vm_area_struct *vma;
 
-               down_read(&mm->mmap_sem);
+               mmap_read_lock(mm);
                vma = find_mergeable_vma(mm, rmap_item->address);
                if (vma) {
                        err = try_to_merge_one_page(vma, page,
@@ -2122,7 +2122,7 @@ static void cmp_and_merge_page(struct page *page, struct rmap_item *rmap_item)
                         */
                        err = 0;
                }
-               up_read(&mm->mmap_sem);
+               mmap_read_unlock(mm);
                /*
                 * In case of failure, the page was not really empty, so we
                 * need to continue. Otherwise we're done.
@@ -2285,7 +2285,7 @@ next_mm:
        }
 
        mm = slot->mm;
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
        if (ksm_test_exit(mm))
                vma = NULL;
        else
@@ -2319,7 +2319,7 @@ next_mm:
                                        ksm_scan.address += PAGE_SIZE;
                                } else
                                        put_page(*page);
-                               up_read(&mm->mmap_sem);
+                               mmap_read_unlock(mm);
                                return rmap_item;
                        }
                        put_page(*page);
@@ -2357,10 +2357,10 @@ next_mm:
 
                free_mm_slot(slot);
                clear_bit(MMF_VM_MERGEABLE, &mm->flags);
-               up_read(&mm->mmap_sem);
+               mmap_read_unlock(mm);
                mmdrop(mm);
        } else {
-               up_read(&mm->mmap_sem);
+               mmap_read_unlock(mm);
                /*
                 * up_read(&mm->mmap_sem) first because after
                 * spin_unlock(&ksm_mmlist_lock) run, the "mm" may
@@ -2560,8 +2560,8 @@ void __ksm_exit(struct mm_struct *mm)
                clear_bit(MMF_VM_MERGEABLE, &mm->flags);
                mmdrop(mm);
        } else if (mm_slot) {
-               down_write(&mm->mmap_sem);
-               up_write(&mm->mmap_sem);
+               mmap_write_lock(mm);
+               mmap_write_unlock(mm);
        }
 }
 
index 8cbd8c1..d9b0f66 100644 (file)
@@ -289,12 +289,12 @@ static long madvise_willneed(struct vm_area_struct *vma,
         */
        *prev = NULL;   /* tell sys_madvise we drop mmap_sem */
        get_file(file);
-       up_read(&current->mm->mmap_sem);
+       mmap_read_unlock(current->mm);
        offset = (loff_t)(start - vma->vm_start)
                        + ((loff_t)vma->vm_pgoff << PAGE_SHIFT);
        vfs_fadvise(file, offset, end - start, POSIX_FADV_WILLNEED);
        fput(file);
-       down_read(&current->mm->mmap_sem);
+       mmap_read_lock(current->mm);
        return 0;
 }
 
@@ -770,7 +770,7 @@ static long madvise_dontneed_free(struct vm_area_struct *vma,
        if (!userfaultfd_remove(vma, start, end)) {
                *prev = NULL; /* mmap_sem has been dropped, prev is stale */
 
-               down_read(&current->mm->mmap_sem);
+               mmap_read_lock(current->mm);
                vma = find_vma(current->mm, start);
                if (!vma)
                        return -ENOMEM;
@@ -852,13 +852,13 @@ static long madvise_remove(struct vm_area_struct *vma,
        get_file(f);
        if (userfaultfd_remove(vma, start, end)) {
                /* mmap_sem was not released by userfaultfd_remove() */
-               up_read(&current->mm->mmap_sem);
+               mmap_read_unlock(current->mm);
        }
        error = vfs_fallocate(f,
                                FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE,
                                offset, end - start);
        fput(f);
-       down_read(&current->mm->mmap_sem);
+       mmap_read_lock(current->mm);
        return error;
 }
 
@@ -1089,7 +1089,7 @@ int do_madvise(unsigned long start, size_t len_in, int behavior)
 
        write = madvise_need_mmap_write(behavior);
        if (write) {
-               if (down_write_killable(&current->mm->mmap_sem))
+               if (mmap_write_lock_killable(current->mm))
                        return -EINTR;
 
                /*
@@ -1105,11 +1105,11 @@ int do_madvise(unsigned long start, size_t len_in, int behavior)
                 * model.
                 */
                if (!mmget_still_valid(current->mm)) {
-                       up_write(&current->mm->mmap_sem);
+                       mmap_write_unlock(current->mm);
                        return -EINTR;
                }
        } else {
-               down_read(&current->mm->mmap_sem);
+               mmap_read_lock(current->mm);
        }
 
        /*
@@ -1159,9 +1159,9 @@ int do_madvise(unsigned long start, size_t len_in, int behavior)
 out:
        blk_finish_plug(&plug);
        if (write)
-               up_write(&current->mm->mmap_sem);
+               mmap_write_unlock(current->mm);
        else
-               up_read(&current->mm->mmap_sem);
+               mmap_read_unlock(current->mm);
 
        return error;
 }
index 3dde78f..ffae92d 100644 (file)
@@ -5614,9 +5614,9 @@ static unsigned long mem_cgroup_count_precharge(struct mm_struct *mm)
 {
        unsigned long precharge;
 
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
        walk_page_range(mm, 0, mm->highest_vm_end, &precharge_walk_ops, NULL);
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 
        precharge = mc.precharge;
        mc.precharge = 0;
@@ -5899,7 +5899,7 @@ static void mem_cgroup_move_charge(void)
        atomic_inc(&mc.from->moving_account);
        synchronize_rcu();
 retry:
-       if (unlikely(!down_read_trylock(&mc.mm->mmap_sem))) {
+       if (unlikely(!mmap_read_trylock(mc.mm))) {
                /*
                 * Someone who are holding the mmap_sem might be waiting in
                 * waitq. So we cancel all extra charges, wake up all waiters,
@@ -5918,7 +5918,7 @@ retry:
        walk_page_range(mc.mm, 0, mc.mm->highest_vm_end, &charge_walk_ops,
                        NULL);
 
-       up_read(&mc.mm->mmap_sem);
+       mmap_read_unlock(mc.mm);
        atomic_dec(&mc.from->moving_account);
 }
 
index 436c1d4..4615d32 100644 (file)
@@ -1592,7 +1592,7 @@ int vm_insert_pages(struct vm_area_struct *vma, unsigned long addr,
        if (addr < vma->vm_start || end_addr >= vma->vm_end)
                return -EFAULT;
        if (!(vma->vm_flags & VM_MIXEDMAP)) {
-               BUG_ON(down_read_trylock(&vma->vm_mm->mmap_sem));
+               BUG_ON(mmap_read_trylock(vma->vm_mm));
                BUG_ON(vma->vm_flags & VM_PFNMAP);
                vma->vm_flags |= VM_MIXEDMAP;
        }
@@ -1650,7 +1650,7 @@ int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
        if (!page_count(page))
                return -EINVAL;
        if (!(vma->vm_flags & VM_MIXEDMAP)) {
-               BUG_ON(down_read_trylock(&vma->vm_mm->mmap_sem));
+               BUG_ON(mmap_read_trylock(vma->vm_mm));
                BUG_ON(vma->vm_flags & VM_PFNMAP);
                vma->vm_flags |= VM_MIXEDMAP;
        }
@@ -4658,7 +4658,7 @@ int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
        void *old_buf = buf;
        int write = gup_flags & FOLL_WRITE;
 
-       if (down_read_killable(&mm->mmap_sem))
+       if (mmap_read_lock_killable(mm))
                return 0;
 
        /* ignore errors, just check how much was successfully transferred */
@@ -4709,7 +4709,7 @@ int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
                buf += bytes;
                addr += bytes;
        }
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 
        return buf - old_buf;
 }
@@ -4766,7 +4766,7 @@ void print_vma_addr(char *prefix, unsigned long ip)
        /*
         * we might be running from an atomic context so we cannot sleep
         */
-       if (!down_read_trylock(&mm->mmap_sem))
+       if (!mmap_read_trylock(mm))
                return;
 
        vma = find_vma(mm, ip);
@@ -4785,7 +4785,7 @@ void print_vma_addr(char *prefix, unsigned long ip)
                        free_page((unsigned long)buf);
                }
        }
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 }
 
 #if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_DEBUG_ATOMIC_SLEEP)
index 1965e26..4930a92 100644 (file)
@@ -405,10 +405,10 @@ void mpol_rebind_mm(struct mm_struct *mm, nodemask_t *new)
 {
        struct vm_area_struct *vma;
 
-       down_write(&mm->mmap_sem);
+       mmap_write_lock(mm);
        for (vma = mm->mmap; vma; vma = vma->vm_next)
                mpol_rebind_policy(vma->vm_policy, new);
-       up_write(&mm->mmap_sem);
+       mmap_write_unlock(mm);
 }
 
 static const struct mempolicy_operations mpol_ops[MPOL_MAX] = {
@@ -932,7 +932,7 @@ static int lookup_node(struct mm_struct *mm, unsigned long addr)
                put_page(p);
        }
        if (locked)
-               up_read(&mm->mmap_sem);
+               mmap_read_unlock(mm);
        return err;
 }
 
@@ -965,10 +965,10 @@ static long do_get_mempolicy(int *policy, nodemask_t *nmask,
                 * vma/shared policy at addr is NULL.  We
                 * want to return MPOL_DEFAULT in this case.
                 */
-               down_read(&mm->mmap_sem);
+               mmap_read_lock(mm);
                vma = find_vma_intersection(mm, addr, addr+1);
                if (!vma) {
-                       up_read(&mm->mmap_sem);
+                       mmap_read_unlock(mm);
                        return -EFAULT;
                }
                if (vma->vm_ops && vma->vm_ops->get_policy)
@@ -1027,7 +1027,7 @@ static long do_get_mempolicy(int *policy, nodemask_t *nmask,
  out:
        mpol_cond_put(pol);
        if (vma)
-               up_read(&mm->mmap_sem);
+               mmap_read_unlock(mm);
        if (pol_refcount)
                mpol_put(pol_refcount);
        return err;
@@ -1136,7 +1136,7 @@ int do_migrate_pages(struct mm_struct *mm, const nodemask_t *from,
        if (err)
                return err;
 
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
 
        /*
         * Find a 'source' bit set in 'tmp' whose corresponding 'dest'
@@ -1217,7 +1217,7 @@ int do_migrate_pages(struct mm_struct *mm, const nodemask_t *from,
                if (err < 0)
                        break;
        }
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        if (err < 0)
                return err;
        return busy;
@@ -1340,12 +1340,12 @@ static long do_mbind(unsigned long start, unsigned long len,
        {
                NODEMASK_SCRATCH(scratch);
                if (scratch) {
-                       down_write(&mm->mmap_sem);
+                       mmap_write_lock(mm);
                        task_lock(current);
                        err = mpol_set_nodemask(new, nmask, scratch);
                        task_unlock(current);
                        if (err)
-                               up_write(&mm->mmap_sem);
+                               mmap_write_unlock(mm);
                } else
                        err = -ENOMEM;
                NODEMASK_SCRATCH_FREE(scratch);
@@ -1382,7 +1382,7 @@ up_out:
                        putback_movable_pages(&pagelist);
        }
 
-       up_write(&mm->mmap_sem);
+       mmap_write_unlock(mm);
 mpol_out:
        mpol_put(new);
        return err;
index 7bfd096..0aa8f83 100644 (file)
@@ -1555,7 +1555,7 @@ static int add_page_for_migration(struct mm_struct *mm, unsigned long addr,
        unsigned int follflags;
        int err;
 
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
        err = -EFAULT;
        vma = find_vma(mm, addr);
        if (!vma || addr < vma->vm_start || !vma_migratable(vma))
@@ -1608,7 +1608,7 @@ out_putpage:
         */
        put_page(page);
 out:
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        return err;
 }
 
@@ -1733,7 +1733,7 @@ static void do_pages_stat_array(struct mm_struct *mm, unsigned long nr_pages,
 {
        unsigned long i;
 
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
 
        for (i = 0; i < nr_pages; i++) {
                unsigned long addr = (unsigned long)(*pages);
@@ -1760,7 +1760,7 @@ set_status:
                status++;
        }
 
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 }
 
 /*
index de3e9fa..453ff11 100644 (file)
@@ -284,9 +284,9 @@ SYSCALL_DEFINE3(mincore, unsigned long, start, size_t, len,
                 * Do at most PAGE_SIZE entries per iteration, due to
                 * the temporary buffer size.
                 */
-               down_read(&current->mm->mmap_sem);
+               mmap_read_lock(current->mm);
                retval = do_mincore(start, min(pages, PAGE_SIZE), tmp);
-               up_read(&current->mm->mmap_sem);
+               mmap_read_unlock(current->mm);
 
                if (retval <= 0)
                        break;
index a72c1ee..c5d8069 100644 (file)
@@ -686,7 +686,7 @@ static __must_check int do_mlock(unsigned long start, size_t len, vm_flags_t fla
        lock_limit >>= PAGE_SHIFT;
        locked = len >> PAGE_SHIFT;
 
-       if (down_write_killable(&current->mm->mmap_sem))
+       if (mmap_write_lock_killable(current->mm))
                return -EINTR;
 
        locked += current->mm->locked_vm;
@@ -705,7 +705,7 @@ static __must_check int do_mlock(unsigned long start, size_t len, vm_flags_t fla
        if ((locked <= lock_limit) || capable(CAP_IPC_LOCK))
                error = apply_vma_lock_flags(start, len, flags);
 
-       up_write(&current->mm->mmap_sem);
+       mmap_write_unlock(current->mm);
        if (error)
                return error;
 
@@ -742,10 +742,10 @@ SYSCALL_DEFINE2(munlock, unsigned long, start, size_t, len)
        len = PAGE_ALIGN(len + (offset_in_page(start)));
        start &= PAGE_MASK;
 
-       if (down_write_killable(&current->mm->mmap_sem))
+       if (mmap_write_lock_killable(current->mm))
                return -EINTR;
        ret = apply_vma_lock_flags(start, len, 0);
-       up_write(&current->mm->mmap_sem);
+       mmap_write_unlock(current->mm);
 
        return ret;
 }
@@ -811,14 +811,14 @@ SYSCALL_DEFINE1(mlockall, int, flags)
        lock_limit = rlimit(RLIMIT_MEMLOCK);
        lock_limit >>= PAGE_SHIFT;
 
-       if (down_write_killable(&current->mm->mmap_sem))
+       if (mmap_write_lock_killable(current->mm))
                return -EINTR;
 
        ret = -ENOMEM;
        if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
            capable(CAP_IPC_LOCK))
                ret = apply_mlockall_flags(flags);
-       up_write(&current->mm->mmap_sem);
+       mmap_write_unlock(current->mm);
        if (!ret && (flags & MCL_CURRENT))
                mm_populate(0, TASK_SIZE);
 
@@ -829,10 +829,10 @@ SYSCALL_DEFINE0(munlockall)
 {
        int ret;
 
-       if (down_write_killable(&current->mm->mmap_sem))
+       if (mmap_write_lock_killable(current->mm))
                return -EINTR;
        ret = apply_mlockall_flags(0);
-       up_write(&current->mm->mmap_sem);
+       mmap_write_unlock(current->mm);
        return ret;
 }
 
index 39bd60c..7ed7cfc 100644 (file)
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -198,7 +198,7 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
        bool downgraded = false;
        LIST_HEAD(uf);
 
-       if (down_write_killable(&mm->mmap_sem))
+       if (mmap_write_lock_killable(mm))
                return -EINTR;
 
        origbrk = mm->brk;
@@ -272,9 +272,9 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
 success:
        populate = newbrk > oldbrk && (mm->def_flags & VM_LOCKED) != 0;
        if (downgraded)
-               up_read(&mm->mmap_sem);
+               mmap_read_unlock(mm);
        else
-               up_write(&mm->mmap_sem);
+               mmap_write_unlock(mm);
        userfaultfd_unmap_complete(mm, &uf);
        if (populate)
                mm_populate(oldbrk, newbrk - oldbrk);
@@ -282,7 +282,7 @@ success:
 
 out:
        retval = origbrk;
-       up_write(&mm->mmap_sem);
+       mmap_write_unlock(mm);
        return retval;
 }
 
@@ -2828,7 +2828,7 @@ int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len,
        detach_vmas_to_be_unmapped(mm, vma, prev, end);
 
        if (downgrade)
-               downgrade_write(&mm->mmap_sem);
+               mmap_write_downgrade(mm);
 
        unmap_region(mm, vma, prev, start, end);
 
@@ -2850,7 +2850,7 @@ static int __vm_munmap(unsigned long start, size_t len, bool downgrade)
        struct mm_struct *mm = current->mm;
        LIST_HEAD(uf);
 
-       if (down_write_killable(&mm->mmap_sem))
+       if (mmap_write_lock_killable(mm))
                return -EINTR;
 
        ret = __do_munmap(mm, start, len, &uf, downgrade);
@@ -2860,10 +2860,10 @@ static int __vm_munmap(unsigned long start, size_t len, bool downgrade)
         * it to 0 before return.
         */
        if (ret == 1) {
-               up_read(&mm->mmap_sem);
+               mmap_read_unlock(mm);
                ret = 0;
        } else
-               up_write(&mm->mmap_sem);
+               mmap_write_unlock(mm);
 
        userfaultfd_unmap_complete(mm, &uf);
        return ret;
@@ -2911,7 +2911,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
        if (pgoff + (size >> PAGE_SHIFT) < pgoff)
                return ret;
 
-       if (down_write_killable(&mm->mmap_sem))
+       if (mmap_write_lock_killable(mm))
                return -EINTR;
 
        vma = find_vma(mm, start);
@@ -2974,7 +2974,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
                        prot, flags, pgoff, &populate, NULL);
        fput(file);
 out:
-       up_write(&mm->mmap_sem);
+       mmap_write_unlock(mm);
        if (populate)
                mm_populate(ret, populate);
        if (!IS_ERR_VALUE(ret))
@@ -3074,12 +3074,12 @@ int vm_brk_flags(unsigned long addr, unsigned long request, unsigned long flags)
        if (!len)
                return 0;
 
-       if (down_write_killable(&mm->mmap_sem))
+       if (mmap_write_lock_killable(mm))
                return -EINTR;
 
        ret = do_brk_flags(addr, len, flags, &uf);
        populate = ((mm->def_flags & VM_LOCKED) != 0);
-       up_write(&mm->mmap_sem);
+       mmap_write_unlock(mm);
        userfaultfd_unmap_complete(mm, &uf);
        if (populate && !ret)
                mm_populate(addr, len);
@@ -3123,8 +3123,8 @@ void exit_mmap(struct mm_struct *mm)
                (void)__oom_reap_task_mm(mm);
 
                set_bit(MMF_OOM_SKIP, &mm->flags);
-               down_write(&mm->mmap_sem);
-               up_write(&mm->mmap_sem);
+               mmap_write_lock(mm);
+               mmap_write_unlock(mm);
        }
 
        if (mm->locked_vm) {
@@ -3550,7 +3550,7 @@ int mm_take_all_locks(struct mm_struct *mm)
        struct vm_area_struct *vma;
        struct anon_vma_chain *avc;
 
-       BUG_ON(down_read_trylock(&mm->mmap_sem));
+       BUG_ON(mmap_read_trylock(mm));
 
        mutex_lock(&mm_all_locks_mutex);
 
@@ -3630,7 +3630,7 @@ void mm_drop_all_locks(struct mm_struct *mm)
        struct vm_area_struct *vma;
        struct anon_vma_chain *avc;
 
-       BUG_ON(down_read_trylock(&mm->mmap_sem));
+       BUG_ON(mmap_read_trylock(mm));
        BUG_ON(!mutex_is_locked(&mm_all_locks_mutex));
 
        for (vma = mm->mmap; vma; vma = vma->vm_next) {
index 06852b8..cfd0a03 100644 (file)
@@ -708,9 +708,9 @@ int mmu_notifier_register(struct mmu_notifier *subscription,
 {
        int ret;
 
-       down_write(&mm->mmap_sem);
+       mmap_write_lock(mm);
        ret = __mmu_notifier_register(subscription, mm);
-       up_write(&mm->mmap_sem);
+       mmap_write_unlock(mm);
        return ret;
 }
 EXPORT_SYMBOL_GPL(mmu_notifier_register);
index 1eeb7b3..ee27e44 100644 (file)
@@ -538,7 +538,7 @@ static int do_mprotect_pkey(unsigned long start, size_t len,
 
        reqprot = prot;
 
-       if (down_write_killable(&current->mm->mmap_sem))
+       if (mmap_write_lock_killable(current->mm))
                return -EINTR;
 
        /*
@@ -628,7 +628,7 @@ static int do_mprotect_pkey(unsigned long start, size_t len,
                prot = reqprot;
        }
 out:
-       up_write(&current->mm->mmap_sem);
+       mmap_write_unlock(current->mm);
        return error;
 }
 
@@ -658,7 +658,7 @@ SYSCALL_DEFINE2(pkey_alloc, unsigned long, flags, unsigned long, init_val)
        if (init_val & ~PKEY_ACCESS_MASK)
                return -EINVAL;
 
-       down_write(&current->mm->mmap_sem);
+       mmap_write_lock(current->mm);
        pkey = mm_pkey_alloc(current->mm);
 
        ret = -ENOSPC;
@@ -672,7 +672,7 @@ SYSCALL_DEFINE2(pkey_alloc, unsigned long, flags, unsigned long, init_val)
        }
        ret = pkey;
 out:
-       up_write(&current->mm->mmap_sem);
+       mmap_write_unlock(current->mm);
        return ret;
 }
 
@@ -680,9 +680,9 @@ SYSCALL_DEFINE1(pkey_free, int, pkey)
 {
        int ret;
 
-       down_write(&current->mm->mmap_sem);
+       mmap_write_lock(current->mm);
        ret = mm_pkey_free(current->mm, pkey);
-       up_write(&current->mm->mmap_sem);
+       mmap_write_unlock(current->mm);
 
        /*
         * We could provie warnings or errors if any VMA still
index 7d69e3f..0a2f0ef 100644 (file)
@@ -696,7 +696,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
        if (!new_len)
                return ret;
 
-       if (down_write_killable(&current->mm->mmap_sem))
+       if (mmap_write_lock_killable(current->mm))
                return -EINTR;
 
        if (flags & (MREMAP_FIXED | MREMAP_DONTUNMAP)) {
@@ -788,9 +788,9 @@ out:
                locked = false;
        }
        if (downgraded)
-               up_read(&current->mm->mmap_sem);
+               mmap_read_unlock(current->mm);
        else
-               up_write(&current->mm->mmap_sem);
+               mmap_write_unlock(current->mm);
        if (locked && new_len > old_len)
                mm_populate(new_addr + old_len, new_len - old_len);
        userfaultfd_unmap_complete(mm, &uf_unmap_early);
index c3bd3e7..69c6d20 100644 (file)
@@ -57,7 +57,7 @@ SYSCALL_DEFINE3(msync, unsigned long, start, size_t, len, int, flags)
         * If the interval [start,end) covers some unmapped address ranges,
         * just ignore them, but return -ENOMEM at the end.
         */
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
        vma = find_vma(mm, start);
        for (;;) {
                struct file *file;
@@ -88,12 +88,12 @@ SYSCALL_DEFINE3(msync, unsigned long, start, size_t, len, int, flags)
                if ((flags & MS_SYNC) && file &&
                                (vma->vm_flags & VM_SHARED)) {
                        get_file(file);
-                       up_read(&mm->mmap_sem);
+                       mmap_read_unlock(mm);
                        error = vfs_fsync_range(file, fstart, fend, 1);
                        fput(file);
                        if (error || start >= end)
                                goto out;
-                       down_read(&mm->mmap_sem);
+                       mmap_read_lock(mm);
                        vma = find_vma(mm, start);
                } else {
                        if (start >= end) {
@@ -104,7 +104,7 @@ SYSCALL_DEFINE3(msync, unsigned long, start, size_t, len, int, flags)
                }
        }
 out_unlock:
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 out:
        return error ? : unmapped_error;
 }
index 062dc1c..8c3a047 100644 (file)
@@ -172,11 +172,11 @@ static void *__vmalloc_user_flags(unsigned long size, gfp_t flags)
        if (ret) {
                struct vm_area_struct *vma;
 
-               down_write(&current->mm->mmap_sem);
+               mmap_write_lock(current->mm);
                vma = find_vma(current->mm, (unsigned long)ret);
                if (vma)
                        vma->vm_flags |= VM_USERMAP;
-               up_write(&current->mm->mmap_sem);
+               mmap_write_unlock(current->mm);
        }
 
        return ret;
@@ -1542,9 +1542,9 @@ int vm_munmap(unsigned long addr, size_t len)
        struct mm_struct *mm = current->mm;
        int ret;
 
-       down_write(&mm->mmap_sem);
+       mmap_write_lock(mm);
        ret = do_munmap(mm, addr, len, NULL);
-       up_write(&mm->mmap_sem);
+       mmap_write_unlock(mm);
        return ret;
 }
 EXPORT_SYMBOL(vm_munmap);
@@ -1631,9 +1631,9 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
 {
        unsigned long ret;
 
-       down_write(&current->mm->mmap_sem);
+       mmap_write_lock(current->mm);
        ret = do_mremap(addr, old_len, new_len, flags, new_addr);
-       up_write(&current->mm->mmap_sem);
+       mmap_write_unlock(current->mm);
        return ret;
 }
 
@@ -1705,7 +1705,7 @@ int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
        struct vm_area_struct *vma;
        int write = gup_flags & FOLL_WRITE;
 
-       if (down_read_killable(&mm->mmap_sem))
+       if (mmap_read_lock_killable(mm))
                return 0;
 
        /* the access must start within one of the target process's mappings */
@@ -1728,7 +1728,7 @@ int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
                len = 0;
        }
 
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 
        return len;
 }
index 4daedf7..af3de7a 100644 (file)
@@ -569,7 +569,7 @@ static bool oom_reap_task_mm(struct task_struct *tsk, struct mm_struct *mm)
 {
        bool ret = true;
 
-       if (!down_read_trylock(&mm->mmap_sem)) {
+       if (!mmap_read_trylock(mm)) {
                trace_skip_task_reaping(tsk->pid);
                return false;
        }
@@ -600,7 +600,7 @@ static bool oom_reap_task_mm(struct task_struct *tsk, struct mm_struct *mm)
 out_finish:
        trace_finish_task_reaping(tsk->pid);
 out_unlock:
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 
        return ret;
 }
index 74e957e..cc85ce8 100644 (file)
@@ -104,12 +104,12 @@ static int process_vm_rw_single_vec(unsigned long addr,
                 * access remotely because task/mm might not
                 * current/current->mm
                 */
-               down_read(&mm->mmap_sem);
+               mmap_read_lock(mm);
                pinned_pages = pin_user_pages_remote(task, mm, pa, pinned_pages,
                                                     flags, process_pages,
                                                     NULL, &locked);
                if (locked)
-                       up_read(&mm->mmap_sem);
+                       mmap_read_unlock(mm);
                if (pinned_pages <= 0)
                        return -EFAULT;
 
index f4ce916..ba88ec4 100644 (file)
@@ -141,13 +141,13 @@ void ptdump_walk_pgd(struct ptdump_state *st, struct mm_struct *mm, pgd_t *pgd)
 {
        const struct ptdump_range *range = st->range;
 
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
        while (range->start != range->end) {
                walk_page_range_novma(mm, range->start, range->end,
                                      &ptdump_ops, pgd, st);
                range++;
        }
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
 
        /* Flush out the last page */
        st->note_page(st, 0, -1, 0);
index ba95857..987276c 100644 (file)
@@ -2100,7 +2100,7 @@ static int unuse_mm(struct mm_struct *mm, unsigned int type,
        struct vm_area_struct *vma;
        int ret = 0;
 
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
        for (vma = mm->mmap; vma; vma = vma->vm_next) {
                if (vma->anon_vma) {
                        ret = unuse_vma(vma, type, frontswap,
@@ -2110,7 +2110,7 @@ static int unuse_mm(struct mm_struct *mm, unsigned int type,
                }
                cond_resched();
        }
-       up_read(&mm->mmap_sem);
+       mmap_read_unlock(mm);
        return ret;
 }
 
index 7f51940..691613c 100644 (file)
@@ -228,7 +228,7 @@ static __always_inline ssize_t __mcopy_atomic_hugetlb(struct mm_struct *dst_mm,
         * feature is not supported.
         */
        if (zeropage) {
-               up_read(&dst_mm->mmap_sem);
+               mmap_read_unlock(dst_mm);
                return -EINVAL;
        }
 
@@ -315,7 +315,7 @@ retry:
                cond_resched();
 
                if (unlikely(err == -ENOENT)) {
-                       up_read(&dst_mm->mmap_sem);
+                       mmap_read_unlock(dst_mm);
                        BUG_ON(!page);
 
                        err = copy_huge_page_from_user(page,
@@ -326,7 +326,7 @@ retry:
                                err = -EFAULT;
                                goto out;
                        }
-                       down_read(&dst_mm->mmap_sem);
+                       mmap_read_lock(dst_mm);
 
                        dst_vma = NULL;
                        goto retry;
@@ -346,7 +346,7 @@ retry:
        }
 
 out_unlock:
-       up_read(&dst_mm->mmap_sem);
+       mmap_read_unlock(dst_mm);
 out:
        if (page) {
                /*
@@ -485,7 +485,7 @@ static __always_inline ssize_t __mcopy_atomic(struct mm_struct *dst_mm,
        copied = 0;
        page = NULL;
 retry:
-       down_read(&dst_mm->mmap_sem);
+       mmap_read_lock(dst_mm);
 
        /*
         * If memory mappings are changing because of non-cooperative
@@ -583,7 +583,7 @@ retry:
                if (unlikely(err == -ENOENT)) {
                        void *page_kaddr;
 
-                       up_read(&dst_mm->mmap_sem);
+                       mmap_read_unlock(dst_mm);
                        BUG_ON(!page);
 
                        page_kaddr = kmap(page);
@@ -612,7 +612,7 @@ retry:
        }
 
 out_unlock:
-       up_read(&dst_mm->mmap_sem);
+       mmap_read_unlock(dst_mm);
 out:
        if (page)
                put_page(page);
@@ -652,7 +652,7 @@ int mwriteprotect_range(struct mm_struct *dst_mm, unsigned long start,
        /* Does the address range wrap, or is the span zero-sized? */
        BUG_ON(start + len <= start);
 
-       down_read(&dst_mm->mmap_sem);
+       mmap_read_lock(dst_mm);
 
        /*
         * If memory mappings are changing because of non-cooperative
@@ -686,6 +686,6 @@ int mwriteprotect_range(struct mm_struct *dst_mm, unsigned long start,
 
        err = 0;
 out_unlock:
-       up_read(&dst_mm->mmap_sem);
+       mmap_read_unlock(dst_mm);
        return err;
 }
index cd62e6f..e7e8647 100644 (file)
--- a/mm/util.c
+++ b/mm/util.c
@@ -481,10 +481,10 @@ int account_locked_vm(struct mm_struct *mm, unsigned long pages, bool inc)
        if (pages == 0 || !mm)
                return 0;
 
-       down_write(&mm->mmap_sem);
+       mmap_write_lock(mm);
        ret = __account_locked_vm(mm, pages, inc, current,
                                  capable(CAP_IPC_LOCK));
-       up_write(&mm->mmap_sem);
+       mmap_write_unlock(mm);
 
        return ret;
 }
@@ -501,11 +501,11 @@ unsigned long vm_mmap_pgoff(struct file *file, unsigned long addr,
 
        ret = security_mmap_file(file, prot, flag);
        if (!ret) {
-               if (down_write_killable(&mm->mmap_sem))
+               if (mmap_write_lock_killable(mm))
                        return -EINTR;
                ret = do_mmap_pgoff(file, addr, len, prot, flag, pgoff,
                                    &populate, &uf);
-               up_write(&mm->mmap_sem);
+               mmap_write_unlock(mm);
                userfaultfd_unmap_complete(mm, &uf);
                if (populate)
                        mm_populate(ret, populate);
index 15d47d5..1714fe2 100644 (file)
@@ -1762,11 +1762,11 @@ static int tcp_zerocopy_receive(struct sock *sk,
 
        sock_rps_record_flow(sk);
 
-       down_read(&current->mm->mmap_sem);
+       mmap_read_lock(current->mm);
 
        vma = find_vma(current->mm, address);
        if (!vma || vma->vm_start > address || vma->vm_ops != &tcp_vm_ops) {
-               up_read(&current->mm->mmap_sem);
+               mmap_read_unlock(current->mm);
                return -EINVAL;
        }
        zc->length = min_t(unsigned long, zc->length, vma->vm_end - address);
@@ -1827,7 +1827,7 @@ static int tcp_zerocopy_receive(struct sock *sk,
                frags++;
        }
 out:
-       up_read(&current->mm->mmap_sem);
+       mmap_read_unlock(current->mm);
        if (length) {
                WRITE_ONCE(tp->copied_seq, seq);
                tcp_rcv_space_adjust(sk);
index a0d2b75..e97db37 100644 (file)
@@ -254,10 +254,10 @@ static int xdp_umem_pin_pages(struct xdp_umem *umem, unsigned long address)
        if (!umem->pgs)
                return -ENOMEM;
 
-       down_read(&current->mm->mmap_sem);
+       mmap_read_lock(current->mm);
        npgs = pin_user_pages(address, umem->npgs,
                              gup_flags | FOLL_LONGTERM, &umem->pgs[0], NULL);
-       up_read(&current->mm->mmap_sem);
+       mmap_read_unlock(current->mm);
 
        if (npgs != umem->npgs) {
                if (npgs >= 0) {
index f1e07fa..5f8f3e8 100644 (file)
@@ -60,11 +60,11 @@ static void async_pf_execute(struct work_struct *work)
         * mm and might be done in another context, so we must
         * access remotely.
         */
-       down_read(&mm->mmap_sem);
+       mmap_read_lock(mm);
        get_user_pages_remote(NULL, mm, addr, 1, FOLL_WRITE, NULL, NULL,
                        &locked);
        if (locked)
-               up_read(&mm->mmap_sem);
+               mmap_read_unlock(mm);
 
        if (IS_ENABLED(CONFIG_KVM_ASYNC_PF_SYNC))
                kvm_arch_async_page_present(vcpu, apf);
index abdfb01..0dfee75 100644 (file)
@@ -1631,7 +1631,7 @@ unsigned long kvm_host_page_size(struct kvm_vcpu *vcpu, gfn_t gfn)
        if (kvm_is_error_hva(addr))
                return PAGE_SIZE;
 
-       down_read(&current->mm->mmap_sem);
+       mmap_read_lock(current->mm);
        vma = find_vma(current->mm, addr);
        if (!vma)
                goto out;
@@ -1639,7 +1639,7 @@ unsigned long kvm_host_page_size(struct kvm_vcpu *vcpu, gfn_t gfn)
        size = vma_kernel_pagesize(vma);
 
 out:
-       up_read(&current->mm->mmap_sem);
+       mmap_read_unlock(current->mm);
 
        return size;
 }
@@ -1892,7 +1892,7 @@ static kvm_pfn_t hva_to_pfn(unsigned long addr, bool atomic, bool *async,
        if (npages == 1)
                return pfn;
 
-       down_read(&current->mm->mmap_sem);
+       mmap_read_lock(current->mm);
        if (npages == -EHWPOISON ||
              (!async && check_user_page_hwpoison(addr))) {
                pfn = KVM_PFN_ERR_HWPOISON;
@@ -1916,7 +1916,7 @@ retry:
                pfn = KVM_PFN_ERR_FAULT;
        }
 exit:
-       up_read(&current->mm->mmap_sem);
+       mmap_read_unlock(current->mm);
        return pfn;
 }