diff options
| author | Joe Perches <joe@perches.com> | 2011-10-31 17:08:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-31 17:30:48 -0700 |
| commit | de7d2b567d040e3b67fe7121945982f14343213d (patch) | |
| tree | c834efc1b4117049b5da786417d9cc14c2b31076 /mm/vmalloc.c | |
| parent | f0dfcde099453aa4c0dc42473828d15a6d492936 (diff) | |
| download | lwn-de7d2b567d040e3b67fe7121945982f14343213d.tar.gz lwn-de7d2b567d040e3b67fe7121945982f14343213d.zip | |
mm/vmalloc.c: report more vmalloc failures
Some vmalloc failure paths do not report OOM conditions.
Add warn_alloc_failed, which also does a dump_stack, to those failure
paths.
This allows more site specific vmalloc failure logging message printks to
be removed.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/vmalloc.c')
| -rw-r--r-- | mm/vmalloc.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 08ab0aa1406c..b669aa6f6caf 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -1625,13 +1625,12 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align, size = PAGE_ALIGN(size); if (!size || (size >> PAGE_SHIFT) > totalram_pages) - return NULL; + goto fail; area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNLIST, start, end, node, gfp_mask, caller); - if (!area) - return NULL; + goto fail; addr = __vmalloc_area_node(area, gfp_mask, prot, node, caller); @@ -1649,6 +1648,12 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align, kmemleak_alloc(addr, real_size, 3, gfp_mask); return addr; + +fail: + warn_alloc_failed(gfp_mask, 0, + "vmalloc: allocation failure: %lu bytes\n", + real_size); + return NULL; } /** |