Reading /proc/meminfo is really slow, as it requires recomputing the vmalloc data every time, which is a lot of work, when most (all?) consumers of meminfo don't even care about those statistics.
Linus mentioned[*] that he wanted to just remove these fields from this file, and just break the ABI if no-one complains (and if someone does, do some caching here instead, or just printing the vmalloc fields as zero). For people wanting the vmalloc stats, /proc/vmallocinfo should be more interesting anyway. As it turns out, Facebook also has workloads that were negatively impacted by this, (while also not caring about the vmalloc info either). The patch below removes all this unnecessary work. [*] https://www.mail-archive.com/[email protected]/msg961636.html Signed-off-by: Dave Jones <[email protected]> diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c index d3ebf2e61853..63b990811ef3 100644 --- a/fs/proc/meminfo.c +++ b/fs/proc/meminfo.c @@ -11,7 +11,6 @@ #include <linux/swap.h> #include <linux/vmstat.h> #include <linux/atomic.h> -#include <linux/vmalloc.h> #ifdef CONFIG_CMA #include <linux/cma.h> #endif @@ -27,7 +26,6 @@ static int meminfo_proc_show(struct seq_file *m, void *v) { struct sysinfo i; unsigned long committed; - struct vmalloc_info vmi; long cached; long available; unsigned long pagecache; @@ -49,8 +47,6 @@ static int meminfo_proc_show(struct seq_file *m, void *v) if (cached < 0) cached = 0; - get_vmalloc_info(&vmi); - for (lru = LRU_BASE; lru < NR_LRU_LISTS; lru++) pages[lru] = global_page_state(NR_LRU_BASE + lru); @@ -132,9 +128,6 @@ static int meminfo_proc_show(struct seq_file *m, void *v) "WritebackTmp: %8lu kB\n" "CommitLimit: %8lu kB\n" "Committed_AS: %8lu kB\n" - "VmallocTotal: %8lu kB\n" - "VmallocUsed: %8lu kB\n" - "VmallocChunk: %8lu kB\n" #ifdef CONFIG_MEMORY_FAILURE "HardwareCorrupted: %5lu kB\n" #endif @@ -189,10 +182,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v) K(global_page_state(NR_BOUNCE)), K(global_page_state(NR_WRITEBACK_TEMP)), K(vm_commit_limit()), - K(committed), - (unsigned long)VMALLOC_TOTAL >> 10, - vmi.used >> 10, - vmi.largest_chunk >> 10 + K(committed) #ifdef CONFIG_MEMORY_FAILURE , atomic_long_read(&num_poisoned_pages) << (PAGE_SHIFT - 10) #endif -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
