The patch titled
mm: fix oom roll-back of __vmalloc_area_node
has been added to the -mm tree. Its filename is
mm-fix-oom-roll-back-of-__vmalloc_area_node.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: mm: fix oom roll-back of __vmalloc_area_node
From: Jan Kiszka <jan.kiszka@xxxxxx>
__vunmap must not rely on area->nr_pages when picking the release methode
for area->pages. It may be too small when __vmalloc_area_node failed early
due to lacking memory. Instead, use a flag in vmstruct to differentiate.
Signed-off-by: Jan Kiszka <jan.kiszka@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/linux/vmalloc.h | 1 +
mm/vmalloc.c | 7 ++++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff -puN include/linux/vmalloc.h~mm-fix-oom-roll-back-of-__vmalloc_area_node include/linux/vmalloc.h
--- a/include/linux/vmalloc.h~mm-fix-oom-roll-back-of-__vmalloc_area_node
+++ a/include/linux/vmalloc.h
@@ -11,6 +11,7 @@ struct vm_area_struct;
#define VM_ALLOC 0x00000002 /* vmalloc() */
#define VM_MAP 0x00000004 /* vmap()ed pages */
#define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */
+#define VM_VPAGES 0x00000010 /* buffer for pages was vmalloc'ed */
/* bits [20..32] reserved for arch specific ioremap internals */
/*
diff -puN mm/vmalloc.c~mm-fix-oom-roll-back-of-__vmalloc_area_node mm/vmalloc.c
--- a/mm/vmalloc.c~mm-fix-oom-roll-back-of-__vmalloc_area_node
+++ a/mm/vmalloc.c
@@ -340,7 +340,7 @@ void __vunmap(void *addr, int deallocate
__free_page(area->pages[i]);
}
- if (area->nr_pages > PAGE_SIZE/sizeof(struct page *))
+ if (area->flags & VM_VPAGES)
vfree(area->pages);
else
kfree(area->pages);
@@ -427,9 +427,10 @@ void *__vmalloc_area_node(struct vm_stru
area->nr_pages = nr_pages;
/* Please note that the recursion is strictly bounded. */
- if (array_size > PAGE_SIZE)
+ if (array_size > PAGE_SIZE) {
pages = __vmalloc_node(array_size, gfp_mask, PAGE_KERNEL, node);
- else
+ area->flags |= VM_VPAGES;
+ } else
pages = kmalloc_node(array_size, (gfp_mask & ~__GFP_HIGHMEM), node);
area->pages = pages;
if (!area->pages) {
_
Patches currently in -mm which might be from jan.kiszka@xxxxxx are
mm-fix-oom-roll-back-of-__vmalloc_area_node.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
