Attachment 224611 Details for Bug 221612 – combined patch against 2.6.18-52

[patch] combined patch against 2.6.18-52

show_mem.patch (text/plain), 5.91 KB, created by George Beshers on 2007-10-11 18:25:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: George Beshers

Created: 2007-10-11 18:25:28 UTC

Size: 5.91 KB

patch

obsolete

>diff -purN linux.a/arch/ia64/mm/contig.c linux.b/arch/ia64/mm/contig.c
>--- linux.a/arch/ia64/mm/contig.c	2006-09-19 23:42:06.000000000 -0400
>+++ linux.b/arch/ia64/mm/contig.c	2007-10-11 12:48:14.000000000 -0400
>@@ -17,6 +17,7 @@
> #include <linux/bootmem.h>
> #include <linux/efi.h>
> #include <linux/mm.h>
>+#include <linux/nmi.h>
> #include <linux/swap.h>
> 
> #include <asm/meminit.h>
>@@ -31,46 +32,71 @@ static unsigned long max_gap;
> #endif
> 
> /**
>- * show_mem - display a memory statistics summary
>+ * show_mem - give short summary of memory stats
>  *
>- * Just walks the pages in the system and describes where they're allocated.
>+ * Shows a simple page count of reserved and used pages in the system.
>+ * For discontig machines, it does this on a per-pgdat basis.
>  */
>-void
>-show_mem (void)
>+void show_mem(void)
> {
>-	int i, total = 0, 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");
>+	printk(KERN_INFO "Mem-info:\n");
> 	show_free_areas();
>-
>-	printk("Free swap:       %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10));
>-	i = max_mapnr;
>-	for (i = 0; i < max_mapnr; i++) {
>-		if (!pfn_valid(i)) {
>+	printk(KERN_INFO "Free swap:       %6ldkB\n",
>+	       nr_swap_pages<<(PAGE_SHIFT-10));
>+	printk(KERN_INFO "Node memory in pages:\n");
>+	for_each_online_pgdat(pgdat) {
>+		unsigned long present;
>+		unsigned long flags;
>+		int shared = 0, cached = 0, reserved = 0;
>+
>+		pgdat_resize_lock(pgdat, &flags);
>+		present = pgdat->node_present_pages;
>+		for(i = 0; i < pgdat->node_spanned_pages; i++) {
>+			struct page *page;
>+			if (unlikely(i % MAX_ORDER_NR_PAGES == 0))
>+				touch_nmi_watchdog();
>+			if (pfn_valid(pgdat->node_start_pfn + i))
>+				page = pfn_to_page(pgdat->node_start_pfn + i);
>+			else {
> #ifdef CONFIG_VIRTUAL_MEM_MAP
>-			if (max_gap < LARGE_GAP)
>-				continue;
>-			i = vmemmap_find_next_valid_pfn(0, i) - 1;
>+				if (max_gap < LARGE_GAP)
>+					continue;
> #endif
>-			continue;
>+				i = vmemmap_find_next_valid_pfn(pgdat->node_id,
>+					 i) - 1;
>+				continue;
>+			}
>+			if (PageReserved(page))
>+				reserved++;
>+			else if (PageSwapCache(page))
>+				cached++;
>+			else if (page_count(page))
>+				shared += page_count(page)-1;
> 		}
>-		total++;
>-		if (PageReserved(mem_map+i))
>-			reserved++;
>-		else if (PageSwapCache(mem_map+i))
>-			cached++;
>-		else if (page_count(mem_map + i))
>-			shared += page_count(mem_map + i) - 1;
>+		pgdat_resize_unlock(pgdat, &flags);
>+		total_present += present;
>+		total_reserved += reserved;
>+		total_cached += cached;
>+		total_shared += shared;
>+		printk(KERN_INFO "Node %4d:  RAM: %11ld, rsvd: %8d, "
>+		       "shrd: %10d, swpd: %10d\n", pgdat->node_id,
>+		       present, reserved, shared, cached);
> 	}
>-	printk("%d pages of RAM\n", total);
>-	printk("%d reserved pages\n", reserved);
>-	printk("%d pages shared\n", shared);
>-	printk("%d pages swap cached\n", cached);
>-	printk("%ld pages in page table cache\n",
>-		pgtable_quicklist_total_size());
>+	printk(KERN_INFO "%ld pages of RAM\n", total_present);
>+	printk(KERN_INFO "%d reserved pages\n", total_reserved);
>+	printk(KERN_INFO "%d pages shared\n", total_shared);
>+	printk(KERN_INFO "%d pages swap cached\n", total_cached);
>+	printk(KERN_INFO "Total of %ld pages in page table cache\n",
>+	       pgtable_quicklist_total_size());
>+	printk(KERN_INFO "%d free buffer pages\n", nr_free_buffer_pages());
> }
> 
>+
> /* physical address where the bootmem map is located */
> unsigned long bootmap_start;
> 
>diff -purN linux.a/arch/ia64/mm/discontig.c linux.b/arch/ia64/mm/discontig.c
>--- linux.a/arch/ia64/mm/discontig.c	2006-09-19 23:42:06.000000000 -0400
>+++ linux.b/arch/ia64/mm/discontig.c	2007-10-11 12:48:14.000000000 -0400
>@@ -16,6 +16,7 @@
> 
> #include <linux/kernel.h>
> #include <linux/mm.h>
>+#include <linux/nmi.h>
> #include <linux/swap.h>
> #include <linux/bootmem.h>
> #include <linux/acpi.h>
>@@ -547,19 +548,22 @@ void show_mem(void)
> 	unsigned long total_present = 0;
> 	pg_data_t *pgdat;
> 
>-	printk("Mem-info:\n");
>+	printk(KERN_INFO "Mem-info:\n");
> 	show_free_areas();
>-	printk("Free swap:       %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10));
>+	printk(KERN_INFO "Free swap:       %6ldkB\n",
>+	       nr_swap_pages<<(PAGE_SHIFT-10));
>+	printk(KERN_INFO "Node memory in pages:\n");
> 	for_each_online_pgdat(pgdat) {
> 		unsigned long present;
> 		unsigned long flags;
> 		int shared = 0, cached = 0, reserved = 0;
> 
>-		printk("Node ID: %d\n", pgdat->node_id);
> 		pgdat_resize_lock(pgdat, &flags);
> 		present = pgdat->node_present_pages;
> 		for(i = 0; i < pgdat->node_spanned_pages; i++) {
> 			struct page *page;
>+			if (unlikely(i % MAX_ORDER_NR_PAGES == 0))
>+				touch_nmi_watchdog();
> 			if (pfn_valid(pgdat->node_start_pfn + i))
> 				page = pfn_to_page(pgdat->node_start_pfn + i);
> 			else {
>@@ -579,18 +583,17 @@ void show_mem(void)
> 		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_quicklist_total_size());
>-	printk("%d free buffer pages\n", nr_free_buffer_pages());
>+		printk(KERN_INFO "Node %4d:  RAM: %11ld, rsvd: %8d, "
>+		       "shrd: %10d, swpd: %10d\n", pgdat->node_id,
>+		       present, reserved, shared, cached);
>+	}
>+	printk(KERN_INFO "%ld pages of RAM\n", total_present);
>+	printk(KERN_INFO "%d reserved pages\n", total_reserved);
>+	printk(KERN_INFO "%d pages shared\n", total_shared);
>+	printk(KERN_INFO "%d pages swap cached\n", total_cached);
>+	printk(KERN_INFO "Total of %ld pages in page table cache\n",
>+	       pgtable_quicklist_total_size());
>+	printk(KERN_INFO "%d free buffer pages\n", nr_free_buffer_pages());
> }
> 
> /**

Actions: View | Diff

Attachments on bug 221612: 144914 | 216391 | 216401 | 216411 | 216421 | 216431 | 224591 | 224601 | 224611