Skip to contentSkip to conversation

e820: fix e820_get_reserved_pfns() to reserve page aligned area

PATCH In review Juergen Gross 2 participants 4 messages Jul 11, 2025 – Jul 14, 2025

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 e820: fix e820_get_reserved_pfns() to reserve page aligned area

e820_get_reserved_pfns() needs to make sure to reserve only page aligned memory areas.

Fixes a7d27a7332ba ("mini-os: add memory map service functions")
---
 e820.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
e820.c +1 -1
index d8cfb1f4..1ffeaf00 100644
@@ -365,7 +365,7 @@ unsigned long e820_get_reserved_pfns(int pages)
     unsigned long last = 0, needed = (long)pages << PAGE_SHIFT;
 
     for ( i = 0; i < e820_entries && e820_map[i].addr < last + needed; i++ )
-        last = e820_map[i].addr + e820_map[i].size;
+        last = round_pgup(e820_map[i].addr + e820_map[i].size);
 
     if ( i == 0 || e820_map[i - 1].type != E820_TYPE_SOFT_RESERVED )
         e820_insert_entry_at(i, last, needed, E820_TYPE_SOFT_RESERVED);
Signature · 1 line
2.43.0
#2 lore raw
In reply to Juergen Gross
Quoted 5 lines · Juergen Gross

e820_get_reserved_pfns() needs to make sure to reserve only page aligned memory areas.

Fixes a7d27a7332ba ("mini-os: add memory map service functions")

I've committed this, but ...

e820.c unsigned long e820_get_reserved_pfns(int pages) · line 371

Quoted 11 lines
e820.c +1 -1
@@ -365,7 +365,7 @@ unsigned long e820_get_reserved_pfns(int pages)
     unsigned long last = 0, needed = (long)pages << PAGE_SHIFT;
 
     for ( i = 0; i < e820_entries && e820_map[i].addr < last + needed; i++ )
-        last = e820_map[i].addr + e820_map[i].size;
+        last = round_pgup(e820_map[i].addr + e820_map[i].size);
 
     if ( i == 0 || e820_map[i - 1].type != E820_TYPE_SOFT_RESERVED )
         e820_insert_entry_at(i, last, needed, E820_TYPE_SOFT_RESERVED);

... I had to resolve fuzz here: There's no E820_TYPE_SOFT_RESERVED in the upstream tree, afaics. I just hope I didn't screw up ...

Jan

#3 lore raw
Quoted 18 lines · Jan Beulich
Quoted 5 lines · Juergen Gross

e820_get_reserved_pfns() needs to make sure to reserve only page aligned memory areas.

Fixes a7d27a7332ba ("mini-os: add memory map service functions")

I've committed this, but ...

Quoted 9 lines
e820.c +1 -1
@@ -365,7 +365,7 @@ unsigned long e820_get_reserved_pfns(int pages)
      unsigned long last = 0, needed = (long)pages << PAGE_SHIFT;
 
      for ( i = 0; i < e820_entries && e820_map[i].addr < last + needed; i++ )
-        last = e820_map[i].addr + e820_map[i].size;
+        last = round_pgup(e820_map[i].addr + e820_map[i].size);
 
Quoted 5 lines

e820.c unsigned long e820_get_reserved_pfns(int pages) · line 371

Quoted 2 lines
e820.c +0 -0
      if ( i == 0 || e820_map[i - 1].type != E820_TYPE_SOFT_RESERVED )
          e820_insert_entry_at(i, last, needed, E820_TYPE_SOFT_RESERVED);

... I had to resolve fuzz here: There's no E820_TYPE_SOFT_RESERVED in the upstream tree, afaics. I just hope I didn't screw up ...

Oh, I had this on top of my kexec() series. Your adaption is looking fine.

Juergen