Subject: [nacked] driverssgi-gru-grufaultc-call-find_vma-with-the-mmap_sem-held.patch removed from -mm tree To: zeus@xxxxxxx,davidlohr@xxxxxx,sivanich@xxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Mon, 21 Apr 2014 15:13:15 -0700 The patch titled Subject: drivers,sgi-gru/grufault.c: call find_vma with the mmap_sem held has been removed from the -mm tree. Its filename was driverssgi-gru-grufaultc-call-find_vma-with-the-mmap_sem-held.patch This patch was dropped because it was nacked ------------------------------------------------------ From: Jonathan Gonzalez V <zeus@xxxxxxx> Subject: drivers,sgi-gru/grufault.c: call find_vma with the mmap_sem held Performing vma lookups without taking the mm->mmap_sem is asking for trouble. While doing the search, the vma in question can be modified or even removed before returning to the caller. Take the lock in order to avoid races while iterating through the vmacache and/or rbtree. Signed-off-by: Jonathan Gonzalez V <zeus@xxxxxxx> Signed-off-by: Davidlohr Bueso <davidlohr@xxxxxx> Cc: Dimitri Sivanich <sivanich@xxxxxxx Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/misc/sgi-gru/grufault.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff -puN drivers/misc/sgi-gru/grufault.c~driverssgi-gru-grufaultc-call-find_vma-with-the-mmap_sem-held drivers/misc/sgi-gru/grufault.c --- a/drivers/misc/sgi-gru/grufault.c~driverssgi-gru-grufaultc-call-find_vma-with-the-mmap_sem-held +++ a/drivers/misc/sgi-gru/grufault.c @@ -266,6 +266,7 @@ static int gru_vtop(struct gru_thread_st unsigned long paddr; int ret, ps; + down_write(&mm->mmap_sem); vma = find_vma(mm, vaddr); if (!vma) goto inval; @@ -277,22 +278,26 @@ static int gru_vtop(struct gru_thread_st rmb(); /* Must/check ms_range_active before loading PTEs */ ret = atomic_pte_lookup(vma, vaddr, write, &paddr, &ps); if (ret) { - if (atomic) - goto upm; + if (atomic) { + up_write(&mm->mmap_sem); + return VTOP_RETRY; + } if (non_atomic_pte_lookup(vma, vaddr, write, &paddr, &ps)) goto inval; } if (is_gru_paddr(paddr)) goto inval; + + up_write(&mm->mmap_sem); + paddr = paddr & ~((1UL << ps) - 1); *gpa = uv_soc_phys_ram_to_gpa(paddr); *pageshift = ps; return VTOP_SUCCESS; inval: + up_write(&mm->mmap_sem); return VTOP_INVALID; -upm: - return VTOP_RETRY; } _ Patches currently in -mm which might be from zeus@xxxxxxx are drm-exynos-call-find_vma-with-the-mmap_sem-held.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html