Commit 89154dd5 authored by Michel Lespinasse's avatar Michel Lespinasse Committed by Linus Torvalds
Browse files

mmap locking API: convert mmap_sem call sites missed by coccinelle 



Convert the last few remaining mmap_sem rwsem calls to use the new mmap
locking API.  These were missed by coccinelle for some reason (I think
coccinelle does not support some of the preprocessor constructs in these
files ?)

[akpm@linux-foundation.org: convert linux-next leftovers]
[akpm@linux-foundation.org: more linux-next leftovers]
[akpm@linux-foundation.org: more linux-next leftovers]

Signed-off-by: default avatarMichel Lespinasse <walken@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Reviewed-by: default avatarDaniel Jordan <daniel.m.jordan@oracle.com>
Reviewed-by: default avatarLaurent Dufour <ldufour@linux.ibm.com>
Reviewed-by: default avatarVlastimil 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-6-walken@google.com


Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d8ed45c5

arch/arm64/kvm/mmu.c

+7 −7
Original line number Diff line number Diff line
@@ -1084,7 +1084,7 @@ void stage2_unmap_vm(struct kvm *kvm) 
	int idx;



	idx = srcu_read_lock(&kvm->srcu);

	down_read(&current->mm->mmap_sem);

	mmap_read_lock(current->mm);

	spin_lock(&kvm->mmu_lock);



	slots = kvm_memslots(kvm);
@@ -1092,7 +1092,7 @@ void stage2_unmap_vm(struct kvm *kvm) 
		stage2_unmap_memslot(kvm, memslot);



	spin_unlock(&kvm->mmu_lock);

	up_read(&current->mm->mmap_sem);

	mmap_read_unlock(current->mm);

	srcu_read_unlock(&kvm->srcu, idx);

}
@@ -1848,11 +1848,11 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, 
	}



	/* Let's check if we will get back a huge page backed by hugetlbfs */

	down_read(&current->mm->mmap_sem);

	mmap_read_lock(current->mm);

	vma = find_vma_intersection(current->mm, hva, hva + 1);

	if (unlikely(!vma)) {

		kvm_err("Failed to find VMA for hva 0x%lx\n", hva);

		up_read(&current->mm->mmap_sem);

		mmap_read_unlock(current->mm);

		return -EFAULT;

	}
@@ -1879,7 +1879,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, 
	if (vma_pagesize == PMD_SIZE ||

	    (vma_pagesize == PUD_SIZE && kvm_stage2_has_pmd(kvm)))

		gfn = (fault_ipa & huge_page_mask(hstate_vma(vma))) >> PAGE_SHIFT;

	up_read(&current->mm->mmap_sem);

	mmap_read_unlock(current->mm);



	/* We need minimum second+third level pages */

	ret = mmu_topup_memory_cache(memcache, kvm_mmu_cache_min_pages(kvm),
@@ -2456,7 +2456,7 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm, 
	    (kvm_phys_size(kvm) >> PAGE_SHIFT))

		return -EFAULT;



	down_read(&current->mm->mmap_sem);

	mmap_read_lock(current->mm);

	/*

	 * A memory region could potentially cover multiple VMAs, and any holes

	 * between them, so iterate over all of them to find out if we can map
@@ -2515,7 +2515,7 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm, 
		stage2_flush_memslot(kvm, memslot);

	spin_unlock(&kvm->mmu_lock);

out:

	up_read(&current->mm->mmap_sem);

	mmap_read_unlock(current->mm);

	return ret;

}

arch/mips/mm/fault.c

+5 −5
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static void __kprobes __do_page_fault(struct pt_regs *regs, unsigned long write, 
	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;
@@ -190,7 +190,7 @@ good_area: 
		}

	}



	up_read(&mm->mmap_sem);

	mmap_read_unlock(mm);

	return;



/*
@@ -198,7 +198,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 */
@@ -250,14 +250,14 @@ 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 (!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))

arch/riscv/mm/pageattr.c

+2 −2
Original line number Diff line number Diff line
@@ -117,10 +117,10 @@ static int __set_memory(unsigned long addr, int numpages, pgprot_t set_mask, 
	if (!numpages)

		return 0;



	down_read(&init_mm.mmap_sem);

	mmap_read_lock(&init_mm);

	ret =  walk_page_range_novma(&init_mm, start, end, &pageattr_ops, NULL,

				     &masks);

	up_read(&init_mm.mmap_sem);

	mmap_read_unlock(&init_mm);



	flush_tlb_kernel_range(start, end);

arch/x86/kvm/mmu/paging_tmpl.h

+4 −4
Original line number Diff line number Diff line
@@ -165,22 +165,22 @@ static int FNAME(cmpxchg_gpte)(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu, 
		unsigned long pfn;

		unsigned long paddr;



		down_read(&current->mm->mmap_sem);

		mmap_read_lock(current->mm);

		vma = find_vma_intersection(current->mm, vaddr, vaddr + PAGE_SIZE);

		if (!vma || !(vma->vm_flags & VM_PFNMAP)) {

			up_read(&current->mm->mmap_sem);

			mmap_read_unlock(current->mm);

			return -EFAULT;

		}

		pfn = ((vaddr - vma->vm_start) >> PAGE_SHIFT) + vma->vm_pgoff;

		paddr = pfn << PAGE_SHIFT;

		table = memremap(paddr, PAGE_SIZE, MEMREMAP_WB);

		if (!table) {

			up_read(&current->mm->mmap_sem);

			mmap_read_unlock(current->mm);

			return -EFAULT;

		}

		ret = CMPXCHG(&table[index], orig_pte, new_pte);

		memunmap(table);

		up_read(&current->mm->mmap_sem);

		mmap_read_unlock(current->mm);

	}



	return (ret != orig_pte);

drivers/staging/media/atomisp/pci/hmm/hmm_bo.c

+2 −2
Original line number Diff line number Diff line
@@ -982,9 +982,9 @@ static int alloc_user_pages(struct hmm_buffer_object *bo, 
	}



	mutex_unlock(&bo->mutex);

	down_read(&current->mm->mmap_sem);

	mmap_read_lock(current->mm);

	vma = find_vma(current->mm, (unsigned long)userptr);

	up_read(&current->mm->mmap_sem);

	mmap_read_unlock(current->mm);

	if (!vma) {

		dev_err(atomisp_dev, "find_vma failed\n");

		kfree(bo->page_obj);

CRA Git | Maintained and supported by SUSTech CRA and CCSE