Skip to contentSkip to conversation

ARM: 7409/1: Do not call flush_cache_user_range with mmap_sem held

PATCH New Will Deacon 3 participants 3 messages May 25, 2012 – May 27, 2012

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: 7409/1: Do not call flush_cache_user_range with mmap_sem held

From: Dima Zavin <[email protected]>

commit 435a7ef52db7d86e67a009b36cac1457f8972391 upstream

We can't be holding the mmap_sem while calling flush_cache_user_range because the flush can fault. If we fault on a user address, the page fault handler will try to take mmap_sem again. Since both places acquire the read lock, most of the time it succeeds. However, if another thread tries to acquire the write lock on the mmap_sem (e.g. mmap) in between the call to flush_cache_user_range and the fault, the down_read in do_page_fault will deadlock.

[will: removed drop of vma parameter as already queued by rmk (7365/1)]

---

Greg: This patch is a candidate for -stable, but its dependency (listed
above) wasn't marked as such, hence this retrospective submission.

 arch/arm/kernel/traps.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
arch/arm/kernel/traps.c +2 -0
index 55b2f3d..63d402f 100644
@@ -496,7 +496,9 @@ do_cache_op(unsigned long start, unsigned long end, int flags)
 		if (end > vma->vm_end)
 			end = vma->vm_end;
 
+		up_read(&mm->mmap_sem);
 		flush_cache_user_range(start, end);
+		return;
 	}
 	up_read(&mm->mmap_sem);
 }
Signature · 1 line
1.7.4.1
#1 lore raw

PATCH 1/1 ARM: 7409/1: Do not call flush_cache_user_range with mmap_sem held

Quoted 21 lines · Will Deacon

From: Dima Zavin <[email protected]>

commit 435a7ef52db7d86e67a009b36cac1457f8972391 upstream

We can't be holding the mmap_sem while calling flush_cache_user_range because the flush can fault. If we fault on a user address, the page fault handler will try to take mmap_sem again. Since both places acquire the read lock, most of the time it succeeds. However, if another thread tries to acquire the write lock on the mmap_sem (e.g. mmap) in between the call to flush_cache_user_range and the fault, the down_read in do_page_fault will deadlock.

[will: removed drop of vma parameter as already queued by rmk (7365/1)]

Quoted 4 lines

---

Greg: This patch is a candidate for -stable, but its dependency (listed
above) wasn't marked as such, hence this retrospective submission.

[...]

Both queued up for 3.2.y, thanks.

Ben.

Signature · 9 lines
Ben Hutchings
You can't have everything.  Where would you put it?
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 828 bytes
Desc: This is a digitally signed message part
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120526/98eb634a/attachment.sig>
#2 lore raw

PATCH 1/1 ARM: 7409/1: Do not call flush_cache_user_range with mmap_sem held

In reply to Will Deacon
Quoted 21 lines · Will Deacon

From: Dima Zavin <[email protected]>

commit 435a7ef52db7d86e67a009b36cac1457f8972391 upstream

We can't be holding the mmap_sem while calling flush_cache_user_range because the flush can fault. If we fault on a user address, the page fault handler will try to take mmap_sem again. Since both places acquire the read lock, most of the time it succeeds. However, if another thread tries to acquire the write lock on the mmap_sem (e.g. mmap) in between the call to flush_cache_user_range and the fault, the down_read in do_page_fault will deadlock.

[will: removed drop of vma parameter as already queued by rmk (7365/1)]

Quoted 4 lines

---

Greg: This patch is a candidate for -stable, but its dependency (listed
above) wasn't marked as such, hence this retrospective submission.

Both now queued up for 3.0, 3.3, and 3.4-stable trees

greg k-h