linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ARM: mm: Regarding section when dealing with meminfo
@ 2011-01-20  9:45 KyongHo Cho
  2011-01-20 14:28 ` Minchan Kim
  2011-01-20 17:20 ` Dave Hansen
  0 siblings, 2 replies; 18+ messages in thread
From: KyongHo Cho @ 2011-01-20  9:45 UTC (permalink / raw)
  To: linux-arm-kernel

Sparsemem allows that a bank of memory spans over several adjacent
sections if the start address and the end address of the bank
belong to different sections.
When gathering statictics of physical memory in mem_init() and
show_mem(), this possiblity was not considered.

This patch guarantees that simple increasing the pointer to page
descriptors does not exceed the boundary of a section.

Signed-off-by: KyongHo Cho <pullip.cho@samsung.com>
---
 arch/arm/mm/init.c |   74 +++++++++++++++++++++++++++++++++++----------------
 1 files changed, 51 insertions(+), 23 deletions(-)

diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 57c4c5c..6ccecbe 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -93,24 +93,38 @@ void show_mem(void)
 
 		pfn1 = bank_pfn_start(bank);
 		pfn2 = bank_pfn_end(bank);
-
+#ifndef CONFIG_SPARSEMEM
 		page = pfn_to_page(pfn1);
 		end  = pfn_to_page(pfn2 - 1) + 1;
-
+#else
+		pfn2--;
 		do {
-			total++;
-			if (PageReserved(page))
-				reserved++;
-			else if (PageSwapCache(page))
-				cached++;
-			else if (PageSlab(page))
-				slab++;
-			else if (!page_count(page))
-				free++;
-			else
-				shared += page_count(page) - 1;
-			page++;
-		} while (page < end);
+			page = pfn_to_page(pfn1);
+			if (pfn_to_section_nr(pfn1) < pfn_to_section_nr(pfn2)) {
+				pfn1 += PAGES_PER_SECTION;
+				pfn1 &= PAGE_SECTION_MASK;
+			} else {
+				pfn1 = pfn2;
+			}
+			end = pfn_to_page(pfn1) + 1;
+#endif
+			do {
+				total++;
+				if (PageReserved(page))
+					reserved++;
+				else if (PageSwapCache(page))
+					cached++;
+				else if (PageSlab(page))
+					slab++;
+				else if (!page_count(page))
+					free++;
+				else
+					shared += page_count(page) - 1;
+				page++;
+			} while (page < end);
+#ifdef CONFIG_SPARSEMEM
+		} while (pfn1 < pfn2);
+#endif
 	}
 
 	printk("%d pages of RAM\n", total);
@@ -470,17 +484,31 @@ void __init mem_init(void)
 
 		pfn1 = bank_pfn_start(bank);
 		pfn2 = bank_pfn_end(bank);
-
+#ifndef CONFIG_SPARSEMEM
 		page = pfn_to_page(pfn1);
 		end  = pfn_to_page(pfn2 - 1) + 1;
-
+#else
+		pfn2--;
 		do {
-			if (PageReserved(page))
-				reserved_pages++;
-			else if (!page_count(page))
-				free_pages++;
-			page++;
-		} while (page < end);
+			page = pfn_to_page(pfn1);
+			if (pfn_to_section_nr(pfn1) < pfn_to_section_nr(pfn2)) {
+				pfn1 += PAGES_PER_SECTION;
+				pfn1 &= PAGE_SECTION_MASK;
+			} else {
+				pfn1 = pfn2;
+			}
+			end = pfn_to_page(pfn1) + 1;
+#endif
+			do {
+				if (PageReserved(page))
+					reserved_pages++;
+				else if (!page_count(page))
+					free_pages++;
+				page++;
+			} while (page < end);
+#ifdef CONFIG_SPARSEMEM
+		} while (pfn1 < pfn2);
+#endif
 	}
 
 	/*
-- 
1.6.2.5

^ permalink raw reply related	[flat|nested] 18+ messages in thread

end of thread, other threads:[~2011-01-25  0:33 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-20  9:45 [PATCH] ARM: mm: Regarding section when dealing with meminfo KyongHo Cho
2011-01-20 14:28 ` Minchan Kim
2011-01-20 17:25   ` Dave Hansen
     [not found]   ` <AANLkTinXAiShaf1f69ufVHg7KPaY5j=jmOTtK71GNNp5@mail.gmail.com>
     [not found]     ` <AANLkTikBbknwsLvN-b4HVqL_gAUHC-4VjQ=WQ=h_kLhW@mail.gmail.com>
2011-01-20 17:44       ` Minchan Kim
2011-01-20 17:52         ` KyongHo Cho
2011-01-20 17:20 ` Dave Hansen
     [not found]   ` <AANLkTi=nsAOtLPK75Wy5Rm8pfWob8xTP5259DyYuxR9J@mail.gmail.com>
2011-01-20 17:48     ` KyongHo Cho
2011-01-20 18:04     ` Dave Hansen
2011-01-20 18:01   ` Russell King - ARM Linux
2011-01-20 18:11     ` Dave Hansen
2011-01-23 18:05       ` Russell King - ARM Linux
2011-01-24 16:52         ` Dave Hansen
2011-01-24 17:58           ` Russell King - ARM Linux
2011-01-24 18:47             ` Dave Hansen
2011-01-25  0:33             ` KyongHo Cho
2011-01-21  2:12     ` KyongHo Cho
2011-01-21 10:38       ` Russell King - ARM Linux
2011-01-21 11:15         ` KyongHo Cho

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).