Skip to contentSkip to conversation

Possible partial miss in pages needed for zone's memory map?

PATCH Johannes Weiner 3 participants 3 messages May 17, 2008 – May 20, 2008

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Hi,

I stumbled over the following in the zone initialization code. Please let me know if I overlooked something here.

---

From: Johannes Weiner <[email protected]>
Subject: [PATCH] Don't drop a partial page in a zone's memory map size

In a zone's present pages number, account for all pages occupied by the memory map, including a partial.

---

mm/page_alloc.c +2 -1
@@ -3378,7 +3378,8 @@ static void __paginginit free_area_init_
 		 * is used by this zone for memmap. This affects the watermark
 		 * and per-cpu initialisations
 		 */
-		memmap_pages = (size * sizeof(struct page)) >> PAGE_SHIFT;
+		memmap_pages =
+			PAGE_ALIGN(size * sizeof(struct page)) >> PAGE_SHIFT;
 		if (realsize >= memmap_pages) {
 			realsize -= memmap_pages;
 			printk(KERN_DEBUG
maintainer
#1 lore raw
Quoted 5 lines · On Sat, 17 May 2008 14:19:15 +0200 Johannes Weiner <[email protected]> wrote:

Hi,

I stumbled over the following in the zone initialization code. Please let me know if I overlooked something here.

hm, no takers. Let's add linux-mm.

Quoted 13 lines

From: Johannes Weiner <[email protected]>
Subject: [PATCH] Don't drop a partial page in a zone's memory map size

In a zone's present pages number, account for all pages occupied by the memory map, including a partial.

---

mm/page_alloc.c static void __paginginit free_area_init_ · line 3385

Quoted 9 lines
mm/page_alloc.c +2 -1
@@ -3378,7 +3378,8 @@ static void __paginginit free_area_init_
 		 * is used by this zone for memmap. This affects the watermark
 		 * and per-cpu initialisations
 		 */
-		memmap_pages = (size * sizeof(struct page)) >> PAGE_SHIFT;
+		memmap_pages =
+			PAGE_ALIGN(size * sizeof(struct page)) >> PAGE_SHIFT;
 		if (realsize >= memmap_pages) {
 			realsize -= memmap_pages;
 			printk(KERN_DEBUG

I looked in there for 30 seconds and collapsed in confusion over which variables are in which units.

Hint: never ever name a variable or a /proc file or your cat or anything else anything dimensionless like "size". It can always be replaced with something which communicates its units. zones_nrbytes, zholes_nrpages, etc.

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>

#2 lore raw
Quoted 20 lines · On Mon, 19 May 2008 23:19:37 -0700 Andrew Morton <[email protected]>…
Quoted 5 lines · On Sat, 17 May 2008 14:19:15 +0200 Johannes Weiner <[email protected]> wrote:

Hi,

I stumbled over the following in the zone initialization code. Please let me know if I overlooked something here.

hm, no takers. Let's add linux-mm.

Quoted 10 lines

From: Johannes Weiner <[email protected]>
Subject: [PATCH] Don't drop a partial page in a zone's memory map size

In a zone's present pages number, account for all pages occupied by the memory map, including a partial.

---

Quoted 16 lines

mm/page_alloc.c static void __paginginit free_area_init_ · line 3385

Quoted 12 lines
mm/page_alloc.c +2 -1
@@ -3378,7 +3378,8 @@ static void __paginginit free_area_init_
 		 * is used by this zone for memmap. This affects the watermark
 		 * and per-cpu initialisations
 		 */
-		memmap_pages = (size * sizeof(struct page)) >> PAGE_SHIFT;
+		memmap_pages =
+			PAGE_ALIGN(size * sizeof(struct page)) >> PAGE_SHIFT;
 		if (realsize >= memmap_pages) {
 			realsize -= memmap_pages;
 			printk(KERN_DEBUG

I looked in there for 30 seconds and collapsed in confusion over which variables are in which units.

Hmm, size * sizeof(struct page) is multiple of PAGE_SIZE in many case. Becasue "size" is always alinged to (1 << MAX_ORDER -1) (I believe...).

ex.) In x86 case,
(1 << (MAX_ORDER(11) - 1)) * 4 (sizeof(long)) = (1 << 12) = PAGE_SIZE.

But not sure on other archs with various params.
I think above fix is correct.

Thanks,
-Kame