public inbox for linux-arch@vger.kernel.org
 help / color / mirror / Atom feed
* [patch] mm: vmalloc fix lazy unmapping cache aliasing
@ 2008-11-19  4:53 Nick Piggin
  2008-11-19  4:54 ` Nick Piggin
  2008-11-19 20:17 ` Russell King
  0 siblings, 2 replies; 7+ messages in thread
From: Nick Piggin @ 2008-11-19  4:53 UTC (permalink / raw)
  To: linux-arch, linux-arm-kernel, rmk, Andrew Morton


Jim Radford has reported that the vmap subsystem rewrite was sometimes causing
his VIVT ARM system to behave strangely (seemed like going into infinite loops
trying to fault in pages to userspace).

We determined that the problem was most likely due to a cache aliasing issue.
flush_cache_vunmap was only being called at the moment the page tables were
to be taken down, however with lazy unmapping, this can happen after the page
has subsequently been freed and allocated for something else. The dangling
alias may still have dirty data attached to it.

The fix for this problem is to do the cache flushing when the caller has
called vunmap -- it would be a bug for them to write anything else to the
mapping at that point.

That appeared to solve Jim's problems.

Reported-by: Jim Radford <radford@blackbean.org>
Signed-off-by: Nick Piggin <npiggin@suse.de>
---
Index: linux-2.6/mm/vmalloc.c
===================================================================
--- linux-2.6.orig/mm/vmalloc.c
+++ linux-2.6/mm/vmalloc.c
@@ -77,7 +77,6 @@ static void vunmap_page_range(unsigned l
 
 	BUG_ON(addr >= end);
 	pgd = pgd_offset_k(addr);
-	flush_cache_vunmap(addr, end);
 	do {
 		next = pgd_addr_end(addr, end);
 		if (pgd_none_or_clear_bad(pgd))
@@ -543,9 +542,10 @@ static void purge_vmap_area_lazy(void)
 }
 
 /*
- * Free and unmap a vmap area
+ * Free and unmap a vmap area, caller ensuring flush_cache_vunmap had been
+ * called for the correct range previously.
  */
-static void free_unmap_vmap_area(struct vmap_area *va)
+static void free_unmap_vmap_area_noflush(struct vmap_area *va)
 {
 	va->flags |= VM_LAZY_FREE;
 	atomic_add((va->va_end - va->va_start) >> PAGE_SHIFT, &vmap_lazy_nr);
@@ -553,6 +553,15 @@ static void free_unmap_vmap_area(struct 
 		try_purge_vmap_area_lazy();
 }
 
+/*
+ * Free and unmap a vmap area
+ */
+static void free_unmap_vmap_area(struct vmap_area *va)
+{
+	flush_cache_vunmap(va->va_start, va->va_end);
+	free_unmap_vmap_area_noflush(va);
+}
+
 static struct vmap_area *find_vmap_area(unsigned long addr)
 {
 	struct vmap_area *va;
@@ -734,7 +743,7 @@ static void free_vmap_block(struct vmap_
 	spin_unlock(&vmap_block_tree_lock);
 	BUG_ON(tmp != vb);
 
-	free_unmap_vmap_area(vb->va);
+	free_unmap_vmap_area_noflush(vb->va);
 	call_rcu(&vb->rcu_head, rcu_free_vb);
 }
 
@@ -820,6 +829,8 @@ static void vb_free(const void *addr, un
 		free_vmap_block(vb);
 	} else
 		spin_unlock(&vb->lock);
+
+	flush_cache_vunmap((unsigned long)addr, (unsigned long)addr + size);
 }
 
 /**

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

end of thread, other threads:[~2008-11-20 18:58 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-11-19  4:53 [patch] mm: vmalloc fix lazy unmapping cache aliasing Nick Piggin
2008-11-19  4:54 ` Nick Piggin
2008-11-19 18:58   ` Jim Radford
2008-11-19 20:17 ` Russell King
2008-11-20  2:17   ` Nick Piggin
2008-11-20 18:43   ` Catalin Marinas
2008-11-20 18:43     ` Catalin Marinas

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox