瀏覽代碼

[PATCH] fix impossible VmallocChunk

VmallocTotal: 34359738367 kB
VmallocUsed:    266288 kB
VmallocChunk: 18014366299193295 kB
is unsettling - x86_64 and some other architectures keep a separate address
range for modules in vmalloc's vmlist, which /proc/meminfo should pass over.

Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Hugh Dickins 20 年之前
父節點
當前提交
64d13c00cf
共有 1 個文件被更改,包括 12 次插入2 次删除
  1. 12 2
      fs/proc/mmu.c

+ 12 - 2
fs/proc/mmu.c

@@ -50,13 +50,23 @@ void get_vmalloc_info(struct vmalloc_info *vmi)
 		read_lock(&vmlist_lock);
 		read_lock(&vmlist_lock);
 
 
 		for (vma = vmlist; vma; vma = vma->next) {
 		for (vma = vmlist; vma; vma = vma->next) {
+			unsigned long addr = (unsigned long) vma->addr;
+
+			/*
+			 * Some archs keep another range for modules in vmlist
+			 */
+			if (addr < VMALLOC_START)
+				continue;
+			if (addr >= VMALLOC_END)
+				break;
+
 			vmi->used += vma->size;
 			vmi->used += vma->size;
 
 
-			free_area_size = (unsigned long) vma->addr - prev_end;
+			free_area_size = addr - prev_end;
 			if (vmi->largest_chunk < free_area_size)
 			if (vmi->largest_chunk < free_area_size)
 				vmi->largest_chunk = free_area_size;
 				vmi->largest_chunk = free_area_size;
 
 
-			prev_end = vma->size + (unsigned long) vma->addr;
+			prev_end = vma->size + addr;
 		}
 		}
 
 
 		if (VMALLOC_END - prev_end > vmi->largest_chunk)
 		if (VMALLOC_END - prev_end > vmi->largest_chunk)