瀏覽代碼

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>
Joe Perches 13 年之前
父節點
當前提交
de7d2b567d
共有 1 個文件被更改,包括 8 次插入3 次删除
  1. 8 3
      mm/vmalloc.c

+ 8 - 3
mm/vmalloc.c

@@ -1625,13 +1625,12 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,
 
 
 	size = PAGE_ALIGN(size);
 	size = PAGE_ALIGN(size);
 	if (!size || (size >> PAGE_SHIFT) > totalram_pages)
 	if (!size || (size >> PAGE_SHIFT) > totalram_pages)
-		return NULL;
+		goto fail;
 
 
 	area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNLIST,
 	area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNLIST,
 				  start, end, node, gfp_mask, caller);
 				  start, end, node, gfp_mask, caller);
-
 	if (!area)
 	if (!area)
-		return NULL;
+		goto fail;
 
 
 	addr = __vmalloc_area_node(area, gfp_mask, prot, node, caller);
 	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);
 	kmemleak_alloc(addr, real_size, 3, gfp_mask);
 
 
 	return addr;
 	return addr;
+
+fail:
+	warn_alloc_failed(gfp_mask, 0,
+			  "vmalloc: allocation failure: %lu bytes\n",
+			  real_size);
+	return NULL;
 }
 }
 
 
 /**
 /**