vmallocinfo: add NUMA information

author Eric Dumazet <dada1@cosmosbay.com>

Thu, 24 Jul 2008 04:27:38 +0000 (21:27 -0700)

committer Linus Torvalds <torvalds@linux-foundation.org>

Thu, 24 Jul 2008 17:47:17 +0000 (10:47 -0700)
author Eric Dumazet <dada1@cosmosbay.com>
Thu, 24 Jul 2008 04:27:38 +0000 (21:27 -0700)
committer Linus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Jul 2008 17:47:17 +0000 (10:47 -0700)
diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt

index 7f268f327d750e725f1e5ca5ddfe99dcb8014cd5..8c6384bdfed451280c6a54580a9840ee6f78b3b5 100644 (file)
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
@@ -296,6 +296,7 @@ Table 1-4: Kernel info in /proc
   uptime      System uptime                                     
   version     Kernel version                                    
   video      bttv info of video resources                       (2.4)
+ vmallocinfo Show vmalloced areas
  ..............................................................................
  
  You can,  for  example,  check  which interrupts are currently in use and what
@@ -557,6 +558,49 @@ VmallocTotal: total size of vmalloc memory area
   VmallocUsed: amount of vmalloc area which is used
  VmallocChunk: largest contigious block of vmalloc area which is free
  
+..............................................................................
+
+vmallocinfo:
+
+Provides information about vmalloced/vmaped areas. One line per area,
+containing the virtual address range of the area, size in bytes,
+caller information of the creator, and optional information depending
+on the kind of area :
+
+ pages=nr    number of pages
+ phys=addr   if a physical address was specified
+ ioremap     I/O mapping (ioremap() and friends)
+ vmalloc     vmalloc() area
+ vmap        vmap()ed pages
+ user        VM_USERMAP area
+ vpages      buffer for pages pointers was vmalloced (huge area)
+ N<node>=nr  (Only on NUMA kernels)
+             Number of pages allocated on memory node <node>
+
+> cat /proc/vmallocinfo
+0xffffc20000000000-0xffffc20000201000 2101248 alloc_large_system_hash+0x204 ...
+  /0x2c0 pages=512 vmalloc N0=128 N1=128 N2=128 N3=128
+0xffffc20000201000-0xffffc20000302000 1052672 alloc_large_system_hash+0x204 ...
+  /0x2c0 pages=256 vmalloc N0=64 N1=64 N2=64 N3=64
+0xffffc20000302000-0xffffc20000304000    8192 acpi_tb_verify_table+0x21/0x4f...
+  phys=7fee8000 ioremap
+0xffffc20000304000-0xffffc20000307000   12288 acpi_tb_verify_table+0x21/0x4f...
+  phys=7fee7000 ioremap
+0xffffc2000031d000-0xffffc2000031f000    8192 init_vdso_vars+0x112/0x210
+0xffffc2000031f000-0xffffc2000032b000   49152 cramfs_uncompress_init+0x2e ...
+  /0x80 pages=11 vmalloc N0=3 N1=3 N2=2 N3=3
+0xffffc2000033a000-0xffffc2000033d000   12288 sys_swapon+0x640/0xac0      ...
+  pages=2 vmalloc N1=2
+0xffffc20000347000-0xffffc2000034c000   20480 xt_alloc_table_info+0xfe ...
+  /0x130 [x_tables] pages=4 vmalloc N0=4
+0xffffffffa0000000-0xffffffffa000f000   61440 sys_init_module+0xc27/0x1d00 ...
+   pages=14 vmalloc N2=14
+0xffffffffa000f000-0xffffffffa0014000   20480 sys_init_module+0xc27/0x1d00 ...
+   pages=4 vmalloc N1=4
+0xffffffffa0014000-0xffffffffa0017000   12288 sys_init_module+0xc27/0x1d00 ...
+   pages=2 vmalloc N1=2
+0xffffffffa0017000-0xffffffffa0022000   45056 sys_init_module+0xc27/0x1d00 ...
+   pages=10 vmalloc N0=10
  
  1.3 IDE devices in /proc/ide
  ----------------------------
diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c

index b14f43d25e9eeb5705d9dbc484c839f855481132..ded96986296099a036af1400a1ecdd7f3f71c058 100644 (file)
--- a/fs/proc/proc_misc.c
+++ b/fs/proc/proc_misc.c
@@ -464,14 +464,25 @@ static const struct file_operations proc_slabstats_operations = {
  #ifdef CONFIG_MMU
  static int vmalloc_open(struct inode *inode, struct file *file)
  {
-       return seq_open(file, &vmalloc_op);
+       unsigned int *ptr = NULL;
+       int ret;
+
+       if (NUMA_BUILD)
+               ptr = kmalloc(nr_node_ids * sizeof(unsigned int), GFP_KERNEL);
+       ret = seq_open(file, &vmalloc_op);
+       if (!ret) {
+               struct seq_file *m = file->private_data;
+               m->private = ptr;
+       } else
+               kfree(ptr);
+       return ret;
  }
  
  static const struct file_operations proc_vmalloc_operations = {
         .open           = vmalloc_open,
         .read           = seq_read,
         .llseek         = seq_lseek,
-       .release        = seq_release,
+       .release        = seq_release_private,
  };
  #endif
  
diff --git a/mm/vmalloc.c b/mm/vmalloc.c

index 6e45b0f3d1256e0bdc3a3caffa74597cf96a5138..35f2938162948b02003007c31686f1b58d7af542 100644 (file)
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -931,6 +931,25 @@ static void s_stop(struct seq_file *m, void *p)
         read_unlock(&vmlist_lock);
  }
  
+static void show_numa_info(struct seq_file *m, struct vm_struct *v)
+{
+       if (NUMA_BUILD) {
+               unsigned int nr, *counters = m->private;
+
+               if (!counters)
+                       return;
+
+               memset(counters, 0, nr_node_ids * sizeof(unsigned int));
+
+               for (nr = 0; nr < v->nr_pages; nr++)
+                       counters[page_to_nid(v->pages[nr])]++;
+
+               for_each_node_state(nr, N_HIGH_MEMORY)
+                       if (counters[nr])
+                               seq_printf(m, " N%u=%u", nr, counters[nr]);
+       }
+}
+
  static int s_show(struct seq_file *m, void *p)
  {
         struct vm_struct *v = p;
@@ -967,6 +986,7 @@ static int s_show(struct seq_file *m, void *p)
         if (v->flags & VM_VPAGES)
                 seq_printf(m, " vpages");
  
+       show_numa_info(m, v);
         seq_putc(m, '\n');
         return 0;
  }
author	Eric Dumazet <dada1@cosmosbay.com>
	Thu, 24 Jul 2008 04:27:38 +0000 (21:27 -0700)
committer	Linus Torvalds <torvalds@linux-foundation.org>
	Thu, 24 Jul 2008 17:47:17 +0000 (10:47 -0700)
Documentation/filesystems/proc.txt		patch \| blob \| history
fs/proc/proc_misc.c		patch \| blob \| history
mm/vmalloc.c		patch \| blob \| history