linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] mm: fix page_lock_anon_vma leaving mutex locked
@ 2011-05-28 20:20 Hugh Dickins
  2011-05-28 21:14 ` Peter Zijlstra
  0 siblings, 1 reply; 11+ messages in thread
From: Hugh Dickins @ 2011-05-28 20:20 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: Andrew Morton, Peter Zijlstra, linux-kernel, linux-mm

On one machine I've been getting hangs, a page fault's anon_vma_prepare()
waiting in anon_vma_lock(), other processes waiting for that page's lock.

This is a replay of last year's f18194275c39
"mm: fix hang on anon_vma->root->lock".

The new page_lock_anon_vma() places too much faith in its refcount: when
it has acquired the mutex_trylock(), it's possible that a racing task in
anon_vma_alloc() has just reallocated the struct anon_vma, set refcount
to 1, and is about to reset its anon_vma->root.

Fix this by saving anon_vma->root, and relying on the usual page_mapped()
check instead of a refcount check: if page is still mapped, the anon_vma
is still ours; if page is not still mapped, we're no longer interested.

Signed-off-by: Hugh Dickins <hughd@google.com>
---
 mm/rmap.c |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

--- linux.orig/mm/rmap.c	2011-05-27 20:07:44.000000000 -0700
+++ linux/mm/rmap.c	2011-05-27 20:31:04.596303434 -0700
@@ -405,6 +405,7 @@ out:
 struct anon_vma *page_lock_anon_vma(struct page *page)
 {
 	struct anon_vma *anon_vma = NULL;
+	struct anon_vma *root_anon_vma;
 	unsigned long anon_mapping;
 
 	rcu_read_lock();
@@ -415,13 +416,15 @@ struct anon_vma *page_lock_anon_vma(stru
 		goto out;
 
 	anon_vma = (struct anon_vma *) (anon_mapping - PAGE_MAPPING_ANON);
-	if (mutex_trylock(&anon_vma->root->mutex)) {
+	root_anon_vma = ACCESS_ONCE(anon_vma->root);
+	if (mutex_trylock(&root_anon_vma->mutex)) {
 		/*
-		 * If we observe a !0 refcount, then holding the lock ensures
-		 * the anon_vma will not go away, see __put_anon_vma().
+		 * If the page is still mapped, then this anon_vma is still
+		 * its anon_vma, and holding the mutex ensures that it will
+		 * not go away, see __put_anon_vma().
 		 */
-		if (!atomic_read(&anon_vma->refcount)) {
-			anon_vma_unlock(anon_vma);
+		if (!page_mapped(page)) {
+			mutex_unlock(&root_anon_vma->mutex);
 			anon_vma = NULL;
 		}
 		goto out;

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2011-05-29 20:53 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-28 20:20 [PATCH] mm: fix page_lock_anon_vma leaving mutex locked Hugh Dickins
2011-05-28 21:14 ` Peter Zijlstra
2011-05-28 22:02   ` Hugh Dickins
2011-05-28 23:24     ` Linus Torvalds
2011-05-28 23:56       ` Linus Torvalds
2011-05-29  0:12       ` Hugh Dickins
2011-05-29  0:23         ` Linus Torvalds
2011-05-29  0:43           ` Hugh Dickins
2011-05-29  8:35             ` Peter Zijlstra
2011-05-29  8:33         ` Peter Zijlstra
2011-05-29 20:53           ` Hugh Dickins

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).