The patch titled vmalloc: always unmap in vb_free() has been added to the -mm tree. Its filename is vmalloc-eagerly-clear-ptes-on-vunmap-fix.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: vmalloc: always unmap in vb_free() From: Jeremy Fitzhardinge <jeremy@xxxxxxxx> free_vmap_block() doesn't unmap anything, so just unconditionally unmap the region. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx> Cc: Nick Piggin <npiggin@xxxxxxxxx> Cc: Bryan Schumaker <bjschuma@xxxxxxxxxx> Cc: Trond Myklebust <Trond.Myklebust@xxxxxxxxxx> Cc: Alex Elder <aelder@xxxxxxx> Cc: Dave Chinner <david@xxxxxxxxxxxxx> Cc: Christoph Hellwig <hch@xxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/vmalloc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff -puN mm/vmalloc.c~vmalloc-eagerly-clear-ptes-on-vunmap-fix mm/vmalloc.c --- a/mm/vmalloc.c~vmalloc-eagerly-clear-ptes-on-vunmap-fix +++ a/mm/vmalloc.c @@ -941,6 +941,8 @@ static void vb_free(const void *addr, un rcu_read_unlock(); BUG_ON(!vb); + vunmap_page_range((unsigned long)addr, (unsigned long)addr + size); + spin_lock(&vb->lock); BUG_ON(bitmap_allocate_region(vb->dirty_map, offset >> PAGE_SHIFT, order)); @@ -949,10 +951,8 @@ static void vb_free(const void *addr, un BUG_ON(vb->free); spin_unlock(&vb->lock); free_vmap_block(vb); - } else { + } else spin_unlock(&vb->lock); - vunmap_page_range((unsigned long)addr, (unsigned long)addr + size); - } } /** _ Patches currently in -mm which might be from jeremy@xxxxxxxx are linux-next.patch vmalloc-eagerly-clear-ptes-on-vunmap.patch vmalloc-eagerly-clear-ptes-on-vunmap-fix.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