2004-09-05 16:31:37

by Akinobu Mita

Subject: [PATCH] ia64: fix show_mem() for discontig machines

Hello,

On multi-node ia64 system, SysRq-M seems to dump wrong memory info.
(Since I don't have such a large machine, I don't confirm it)
It should reset counters every iteration each node in show_mem().

Signed-off-by: Akinobu Mita <[email protected]>

--- 2.6/arch/ia64/mm/discontig.c.orig 2004-09-01 13:31:09.000000000 +0900
+++ 2.6/arch/ia64/mm/discontig.c 2004-09-01 13:37:39.000000000 +0900
@@ -492,14 +492,17 @@ void *per_cpu_init(void)
*/
void show_mem(void)
{
- int i, reserved = 0;
- int shared = 0, cached = 0;
+ int i, total_reserved = 0;
+ int total_shared = 0, total_cached = 0;
+ unsigned long total_present = 0;
pg_data_t *pgdat;

printk("Mem-info:\n");
show_free_areas();
printk("Free swap: %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10));
for_each_pgdat(pgdat) {
+ unsigned long present = pgdat->node_present_pages;
+ int shared = 0, cached = 0, reserved = 0;
printk("Node ID: %d\n", pgdat->node_id);
for(i = 0; i < pgdat->node_spanned_pages; i++) {
if (!ia64_pfn_valid(pgdat->node_start_pfn+i))
@@ -511,11 +514,19 @@ void show_mem(void)
else if (page_count(pgdat->node_mem_map+i))
shared += page_count(pgdat->node_mem_map+i)-1;
}
- printk("\t%ld pages of RAM\n", pgdat->node_present_pages);
+ total_present += present;
+ total_reserved += reserved;
+ total_cached += cached;
+ total_shared += shared;
+ printk("\t%ld pages of RAM\n", present);
printk("\t%d reserved pages\n", reserved);
printk("\t%d pages shared\n", shared);
printk("\t%d pages swap cached\n", cached);
}
+ printk("%ld pages of RAM\n", total_present);
+ printk("%d reserved pages\n", total_reserved);
+ printk("%d pages shared\n", total_shared);
+ printk("%d pages swap cached\n", total_cached);
printk("Total of %ld pages in page table cache\n", pgtable_cache_size);
printk("%d free buffer pages\n", nr_free_buffer_pages());
}

2004-09-08 04:28:56

by Jesse Barnes

Subject: Re: [PATCH] ia64: fix show_mem() for discontig machines

On Sunday, September 5, 2004 9:32 am, mita akinobu wrote:
> Hello,
>
> On multi-node ia64 system, SysRq-M seems to dump wrong memory info.
> (Since I don't have such a large machine, I don't confirm it)
> It should reset counters every iteration each node in show_mem().

This looks good, though the bug sounds familiar. Tony, care to apply?

Thanks,
Jesse