Below is a patch to /proc/meminfo to display free, used and total
memory per node on a NUMA machine. It works fine on an ia32
machine, but is not yet ready for submission until I make it generic.
Before I go to the effort of doing that, I thought I'd seek some feedback.
Comments?
Thanks,
Martin.
diff -urN virgin-2.4.18/arch/i386/mm/init.c linux-2.4.18-meminfo/arch/i386/mm/init.c
--- virgin-2.4.18/arch/i386/mm/init.c Fri Dec 21 09:41:53 2001
+++ linux-2.4.18-meminfo/arch/i386/mm/init.c Sun Apr 14 13:43:56 2002
@@ -598,6 +598,18 @@
return;
}
+#ifdef CONFIG_NUMA
+void si_meminfo_node(struct sysinfo *val, int nid)
+{
+ val->totalram = NODE_DATA(nid)->node_size;
+ val->freeram = nr_free_pages_node(nid);
+ val->totalhigh = NODE_DATA(nid)->node_zones[ZONE_HIGHMEM].size;
+ val->freehigh = nr_free_highpages_node(nid);
+ val->mem_unit = PAGE_SIZE;
+ return;
+}
+#endif
+
#if defined(CONFIG_X86_PAE)
struct kmem_cache_s *pae_pgd_cachep;
void __init pgtable_cache_init(void)
diff -urN virgin-2.4.18/fs/proc/proc_misc.c linux-2.4.18-meminfo/fs/proc/proc_misc.c
--- virgin-2.4.18/fs/proc/proc_misc.c Tue Nov 20 21:29:09 2001
+++ linux-2.4.18-meminfo/fs/proc/proc_misc.c Mon Apr 15 09:31:32 2002
@@ -132,7 +132,7 @@
int count, int *eof, void *data)
{
struct sysinfo i;
- int len;
+ int len, nid;
int pg_size ;
/*
@@ -185,6 +185,27 @@
K(i.freeram-i.freehigh),
K(i.totalswap),
K(i.freeswap));
+
+#ifdef CONFIG_NUMA
+ for (nid = 0; nid < numnodes; ++nid) {
+ si_meminfo_node(&i, nid);
+ len += sprintf(page+len, "\n"
+ "Node %d MemTotal: %8lu kB\n"
+ "Node %d MemFree: %8lu kB\n"
+ "Node %d MemUsed: %8lu kB\n"
+ "Node %d HighTotal: %8lu kB\n"
+ "Node %d HighFree: %8lu kB\n"
+ "Node %d LowTotal: %8lu kB\n"
+ "Node %d LowFree: %8lu kB\n",
+ nid, K(i.totalram),
+ nid, K(i.freeram),
+ nid, K(i.totalram-i.freeram),
+ nid, K(i.totalhigh),
+ nid, K(i.freehigh),
+ nid, K(i.totalram-i.totalhigh),
+ nid, K(i.freeram-i.freehigh));
+ }
+#endif
return proc_calc_metrics(page, start, off, count, eof, len);
#undef B
diff -urN virgin-2.4.18/include/linux/highmem.h linux-2.4.18-meminfo/include/linux/highmem.h
--- virgin-2.4.18/include/linux/highmem.h Mon Feb 25 11:38:13 2002
+++ linux-2.4.18-meminfo/include/linux/highmem.h Sun Apr 14 13:48:11 2002
@@ -12,6 +12,9 @@
/* declarations for linux/mm/highmem.c */
unsigned int nr_free_highpages(void);
+#ifdef CONFIG_NUMA
+unsigned int nr_free_highpages_node (int);
+#endif
extern struct buffer_head * create_bounce(int rw, struct buffer_head * bh_orig);
diff -urN virgin-2.4.18/include/linux/mm.h linux-2.4.18-meminfo/include/linux/mm.h
--- virgin-2.4.18/include/linux/mm.h Fri Dec 21 09:42:03 2001
+++ linux-2.4.18-meminfo/include/linux/mm.h Sun Apr 14 13:52:34 2002
@@ -447,6 +447,9 @@
extern void mem_init(void);
extern void show_mem(void);
extern void si_meminfo(struct sysinfo * val);
+#ifdef CONFIG_NUMA
+extern void si_meminfo_node(struct sysinfo *val, int nid);
+#endif
extern void swapin_readahead(swp_entry_t);
extern struct address_space swapper_space;
diff -urN virgin-2.4.18/include/linux/swap.h linux-2.4.18-meminfo/include/linux/swap.h
--- virgin-2.4.18/include/linux/swap.h Thu Nov 22 11:46:19 2001
+++ linux-2.4.18-meminfo/include/linux/swap.h Sun Apr 14 13:48:46 2002
@@ -84,6 +84,9 @@
#define vm_swap_full() (nr_swap_pages*2 < total_swap_pages)
extern unsigned int nr_free_pages(void);
+#ifdef CONFIG_NUMA
+extern unsigned int nr_free_pages_node (int);
+#endif
extern unsigned int nr_free_buffer_pages(void);
extern int nr_active_pages;
extern int nr_inactive_pages;
diff -urN virgin-2.4.18/mm/page_alloc.c linux-2.4.18-meminfo/mm/page_alloc.c
--- virgin-2.4.18/mm/page_alloc.c Mon Feb 25 11:38:14 2002
+++ linux-2.4.18-meminfo/mm/page_alloc.c Sun Apr 14 13:43:56 2002
@@ -462,6 +462,23 @@
return sum;
}
+#ifdef CONFIG_NUMA
+/*
+ * Total amount of free (allocatable) RAM for a given node:
+ */
+unsigned int nr_free_pages_node (int nid)
+{
+ unsigned int sum;
+ zone_t *zone;
+ pg_data_t *pgdat = NODE_DATA(nid);
+
+ sum = 0;
+ for (zone = pgdat->node_zones; zone < pgdat->node_zones + MAX_NR_ZONES; zone++)
+ sum += zone->free_pages;
+ return sum;
+}
+#endif
+
/*
* Amount of free RAM allocatable as buffer memory:
*/
@@ -500,7 +517,14 @@
}
return pages;
}
-#endif
+
+#ifdef CONFIG_NUMA
+unsigned int nr_free_highpages_node (int nid)
+{
+ return NODE_DATA(nid)->node_zones[ZONE_HIGHMEM].free_pages;
+}
+#endif /* CONFIG_NUMA */
+#endif /* CONFIG_HIGHMEM */
#define K(x) ((x) << (PAGE_SHIFT-10))
On Mon, Apr 22, 2002 at 10:05:19AM -0700, Martin J. Bligh wrote:
> Below is a patch to /proc/meminfo to display free, used and total
> memory per node on a NUMA machine. It works fine on an ia32
> machine, but is not yet ready for submission until I make it generic.
> Before I go to the effort of doing that, I thought I'd seek some feedback.
>
> Comments?
Sure. First I wonder whether it would be possible to kill nr_free_pages()
and nr_free_highpages() (or infact all of the nr_free*page() functions)
in favour of the per-node ones, externalizing the for loop. Or if there
are to many users at least make them use the per-node version.
Second I wonder whether nr_free_pages_node() and nr_free_highpages_node()
should take a pgdat instead of a node id as the caller has it around anyway.
Also I think the per-node info should be in /proc/meminfo even for UMA
machines, it doesn't hurt but makes it more consistant.
On Mon, 22 Apr 2002 10:05:19 -0700,
"Martin J. Bligh" <[email protected]> wrote:
>Below is a patch to /proc/meminfo to display free, used and total
>memory per node on a NUMA machine. It works fine on an ia32
>machine, but is not yet ready for submission until I make it generic.
>Before I go to the effort of doing that, I thought I'd seek some feedback.
>
>diff -urN virgin-2.4.18/fs/proc/proc_misc.c linux-2.4.18-meminfo/fs/proc/proc_misc.c
>--- virgin-2.4.18/fs/proc/proc_misc.c Tue Nov 20 21:29:09 2001
>+++ linux-2.4.18-meminfo/fs/proc/proc_misc.c Mon Apr 15 09:31:32 2002
>+#ifdef CONFIG_NUMA
>+ for (nid = 0; nid < numnodes; ++nid) {
>+ si_meminfo_node(&i, nid);
>+ len += sprintf(page+len, "\n"
>+ "Node %d MemTotal: %8lu kB\n"
>+ "Node %d MemFree: %8lu kB\n"
>+ "Node %d MemUsed: %8lu kB\n"
>+ "Node %d HighTotal: %8lu kB\n"
>+ "Node %d HighFree: %8lu kB\n"
>+ "Node %d LowTotal: %8lu kB\n"
>+ "Node %d LowFree: %8lu kB\n",
>+ nid, K(i.totalram),
>+ nid, K(i.freeram),
>+ nid, K(i.totalram-i.freeram),
>+ nid, K(i.totalhigh),
>+ nid, K(i.freehigh),
>+ nid, K(i.totalram-i.totalhigh),
>+ nid, K(i.freeram-i.freehigh));
>+ }
>+#endif
meminfo_read_proc() assumes that all its output will fit in one page.
Currently it does, ~520 bytes. You are adding ~120 bytes per node so
it will break at ~29 nodes using 4K pages. To make that scalable,
meminfo_read_proc() must be converted to seq_file format.
I implemented something kind of like this for the discontig project,
but I called it /proc/discontig. The patch just walked all the
pgdata_t structures and did its best to find out where the memory was
being used. See http://sourceforge.net/projects/discontig for the
patch. The first column of the output should probably be called
'region' or something, since it's not NUMA specific at all...
Jesse
On Tue, Apr 23, 2002 at 09:39:31AM +1000, Keith Owens wrote:
> On Mon, 22 Apr 2002 10:05:19 -0700,
> "Martin J. Bligh" <[email protected]> wrote:
> >Below is a patch to /proc/meminfo to display free, used and total
> >memory per node on a NUMA machine. It works fine on an ia32
> >machine, but is not yet ready for submission until I make it generic.
> >Before I go to the effort of doing that, I thought I'd seek some feedback.
> >
> >diff -urN virgin-2.4.18/fs/proc/proc_misc.c linux-2.4.18-meminfo/fs/proc/proc_misc.c
> >--- virgin-2.4.18/fs/proc/proc_misc.c Tue Nov 20 21:29:09 2001
> >+++ linux-2.4.18-meminfo/fs/proc/proc_misc.c Mon Apr 15 09:31:32 2002
> >+#ifdef CONFIG_NUMA
> >+ for (nid = 0; nid < numnodes; ++nid) {
> >+ si_meminfo_node(&i, nid);
> >+ len += sprintf(page+len, "\n"
> >+ "Node %d MemTotal: %8lu kB\n"
> >+ "Node %d MemFree: %8lu kB\n"
> >+ "Node %d MemUsed: %8lu kB\n"
> >+ "Node %d HighTotal: %8lu kB\n"
> >+ "Node %d HighFree: %8lu kB\n"
> >+ "Node %d LowTotal: %8lu kB\n"
> >+ "Node %d LowFree: %8lu kB\n",
> >+ nid, K(i.totalram),
> >+ nid, K(i.freeram),
> >+ nid, K(i.totalram-i.freeram),
> >+ nid, K(i.totalhigh),
> >+ nid, K(i.freehigh),
> >+ nid, K(i.totalram-i.totalhigh),
> >+ nid, K(i.freeram-i.freehigh));
> >+ }
> >+#endif
OK, here version 2
> Sure. First I wonder whether it would be possible to kill nr_free_pages()
> and nr_free_highpages() (or infact all of the nr_free*page() functions)
> in favour of the per-node ones, externalizing the for loop. Or if there
> are to many users at least make them use the per-node version.
> Second I wonder whether nr_free_pages_node() and nr_free_highpages_node()
> should take a pgdat instead of a node id as the caller has it around anyway.
OK, I've taken most of this - I made the nr_free_pages extensions into _pgdat
calls that operate on a pgdat, as you suggested. I still think we need a
nr_free_pages and friends to give global statistics, but I made those call
the pgdat functions (which I made inline to keep the speed up - they're small
with not many callers, so hopefully this isn't controversial).
> Also I think the per-node info should be in /proc/meminfo even for UMA
> machines, it doesn't hurt but makes it more consistant.
I'm slightly wary of doing this, as it'll break tools that parse /proc/meminfo
for everybody ... what I'm doing is fairly conservative, and having the global
section still there seems useful to me for the NUMA machines too.
I also shifted the si_meminfo_node into mm/numa.c to make it generic for
all machines, and made it loop through the node_next loop of pgdats to
make it work on machines that have discontig within a node.
What do people think of the attatched version?
M.
diff -urN virgin-2.4.18/fs/proc/proc_misc.c linux-2.4.18-meminfo/fs/proc/proc_misc.c
--- virgin-2.4.18/fs/proc/proc_misc.c Tue Nov 20 21:29:09 2001
+++ linux-2.4.18-meminfo/fs/proc/proc_misc.c Mon Apr 15 09:31:32 2002
@@ -132,7 +132,7 @@
int count, int *eof, void *data)
{
struct sysinfo i;
- int len;
+ int len, nid;
int pg_size ;
/*
@@ -185,6 +185,27 @@
K(i.freeram-i.freehigh),
K(i.totalswap),
K(i.freeswap));
+
+#ifdef CONFIG_NUMA
+ for (nid = 0; nid < numnodes; ++nid) {
+ si_meminfo_node(&i, nid);
+ len += sprintf(page+len, "\n"
+ "Node %d MemTotal: %8lu kB\n"
+ "Node %d MemFree: %8lu kB\n"
+ "Node %d MemUsed: %8lu kB\n"
+ "Node %d HighTotal: %8lu kB\n"
+ "Node %d HighFree: %8lu kB\n"
+ "Node %d LowTotal: %8lu kB\n"
+ "Node %d LowFree: %8lu kB\n",
+ nid, K(i.totalram),
+ nid, K(i.freeram),
+ nid, K(i.totalram-i.freeram),
+ nid, K(i.totalhigh),
+ nid, K(i.freehigh),
+ nid, K(i.totalram-i.totalhigh),
+ nid, K(i.freeram-i.freehigh));
+ }
+#endif
return proc_calc_metrics(page, start, off, count, eof, len);
#undef B
diff -urN virgin-2.4.18/include/linux/highmem.h linux-2.4.18-meminfo/include/linux/highmem.h
--- virgin-2.4.18/include/linux/highmem.h Mon Feb 25 11:38:13 2002
+++ linux-2.4.18-meminfo/include/linux/highmem.h Mon Apr 22 15:52:36 2002
@@ -12,6 +12,7 @@
/* declarations for linux/mm/highmem.c */
unsigned int nr_free_highpages(void);
+inline unsigned int nr_free_highpages_pgdat(pg_data_t *pgdat);
extern struct buffer_head * create_bounce(int rw, struct buffer_head * bh_orig);
diff -urN virgin-2.4.18/include/linux/mm.h linux-2.4.18-meminfo/include/linux/mm.h
--- virgin-2.4.18/include/linux/mm.h Fri Dec 21 09:42:03 2001
+++ linux-2.4.18-meminfo/include/linux/mm.h Sun Apr 14 13:52:34 2002
@@ -447,6 +447,9 @@
extern void mem_init(void);
extern void show_mem(void);
extern void si_meminfo(struct sysinfo * val);
+#ifdef CONFIG_NUMA
+extern void si_meminfo_node(struct sysinfo *val, int nid);
+#endif
extern void swapin_readahead(swp_entry_t);
extern struct address_space swapper_space;
diff -urN virgin-2.4.18/include/linux/swap.h linux-2.4.18-meminfo/include/linux/swap.h
--- virgin-2.4.18/include/linux/swap.h Thu Nov 22 11:46:19 2001
+++ linux-2.4.18-meminfo/include/linux/swap.h Mon Apr 22 15:53:55 2002
@@ -84,6 +84,7 @@
#define vm_swap_full() (nr_swap_pages*2 < total_swap_pages)
extern unsigned int nr_free_pages(void);
+extern inline unsigned int nr_free_pages_pgdat (pg_data_t *pgdat);
extern unsigned int nr_free_buffer_pages(void);
extern int nr_active_pages;
extern int nr_inactive_pages;
diff -urN virgin-2.4.18/mm/numa.c linux-2.4.18-meminfo/mm/numa.c
--- virgin-2.4.18/mm/numa.c Mon Sep 17 16:15:02 2001
+++ linux-2.4.18-meminfo/mm/numa.c Wed Apr 24 12:08:52 2002
@@ -128,3 +128,26 @@
}
#endif /* CONFIG_DISCONTIGMEM */
+
+void si_meminfo_node(struct sysinfo *val, int nid)
+{
+ pg_data_t *pgdat;
+
+ val->totalram = 0;
+ val->freeram = 0;
+ val->totalhigh = 0;
+ val->freehigh = 0;
+
+ pgdat = NODE_DATA(nid);
+ while (pgdat) {
+ val->totalram = pgdat->node_size;
+ val->freeram = nr_free_pages_pgdat(pgdat);
+ #ifdef CONFIG_HIGHMEM
+ val->totalhigh = pgdat->node_zones[ZONE_HIGHMEM].size;
+ val->freehigh = nr_free_highpages_pgdat(pgdat);
+ #endif
+ pgdat = pgdat->node_next;
+ }
+ val->mem_unit = PAGE_SIZE;
+ return;
+}
diff -urN virgin-2.4.18/mm/page_alloc.c linux-2.4.18-meminfo/mm/page_alloc.c
--- virgin-2.4.18/mm/page_alloc.c Mon Feb 25 11:38:14 2002
+++ linux-2.4.18-meminfo/mm/page_alloc.c Wed Apr 24 12:10:26 2002
@@ -450,19 +450,31 @@
unsigned int nr_free_pages (void)
{
unsigned int sum;
- zone_t *zone;
pg_data_t *pgdat = pgdat_list;
sum = 0;
while (pgdat) {
- for (zone = pgdat->node_zones; zone < pgdat->node_zones + MAX_NR_ZONES; zone++)
- sum += zone->free_pages;
+ sum += nr_free_pages_pgdat(pgdat);
pgdat = pgdat->node_next;
}
return sum;
}
/*
+ * Total amount of free (allocatable) RAM for a given pg_data_t:
+ */
+inline unsigned int nr_free_pages_pgdat (pg_data_t *pgdat)
+{
+ unsigned int sum;
+ zone_t *zone;
+
+ sum = 0;
+ for (zone = pgdat->node_zones; zone < pgdat->node_zones + MAX_NR_ZONES; zone++)
+ sum += zone->free_pages;
+ return sum;
+}
+
+/*
* Amount of free RAM allocatable as buffer memory:
*/
unsigned int nr_free_buffer_pages (void)
@@ -495,12 +507,17 @@
unsigned int pages = 0;
while (pgdat) {
- pages += pgdat->node_zones[ZONE_HIGHMEM].free_pages;
+ pages += nr_free_highpages_pgdat(pgdat);
pgdat = pgdat->node_next;
}
return pages;
}
-#endif
+
+inline unsigned int nr_free_highpages_pgdat (pg_data_t *pgdat)
+{
+ return pgdat->node_zones[ZONE_HIGHMEM].free_pages;
+}
+#endif /* CONFIG_HIGHMEM */
#define K(x) ((x) << (PAGE_SHIFT-10))
> I also shifted the si_meminfo_node into mm/numa.c to make it generic for
> all machines, and made it loop through the node_next loop of pgdats to
> make it work on machines that have discontig within a node.
Sigh ... of course si_meminfo_node should have done += to the elements
within the loop, not =. Sorry,
M.