Skip to contentSkip to conversation

memblock: fix page count when preserving reserve_mem regions

PATCH In review Sang-Heon Jeon 2 participants 3 messages Sep 1 – Sep 2

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

PATCH 1/1 memblock: fix page count when preserving reserve_mem regions

When map->start or map->size is not page aligned, reserved_mem_preserve() does not preserve the last pages of the region from map->start to map->start + map->size.

After kexec the new kernel reserves only the preserved pages, so the last pages are released to the buddy allocator. But reserve_mem_find_by_name() still returns the whole region including the last pages, so they can be allocated while the subsystem is still using them.

Preserve every page the region spans so the new kernel reserves all of it.

Fixes 8375b76517cb ("kho: replace kho_preserve_phys() with kho_preserve_pages()")

---

QEMU-based test results

- Booted with "memblock=debug kho=on reserve_mem=5000:64:oops"

  # kexec -s -l /bzImage --initrd=/initramfs.gz --reuse-cmdline
  # kexec -e
  # dmesg | grep kho_preserved_memory_reserve

1) AS-IS (before fix)

[    0.188536] __memblock_reserve: [0x000000013ffee000-0x000000013ffeefff] nid=-1 flags=0 kho_preserved_memory_reserve+0x3d/0x70

2) TO-BE (after fix)

[    0.076935] __memblock_reserve: [0x000000013ffee000-0x000000013ffeffff] nid=-1 flags=0 kho_preserved_memory_reserve+0x3d/0x70
 mm/memblock.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
mm/memblock.c +4 -2
index 777c69f05400..a17b1cccaf3d 100644
@@ -2534,7 +2534,8 @@ static int __init reserved_mem_preserve(void)
 	for (unsigned int i = 0; i < reserved_mem_count; i++, nr_preserved++) {
 		struct reserve_mem_table *map = &reserved_mem_table[i];
 		struct page *page = phys_to_page(map->start);
-		unsigned int nr_pages = map->size >> PAGE_SHIFT;
+		unsigned int nr_pages = PFN_UP(map->start + map->size) -
+					PFN_DOWN(map->start);
 
 		err = kho_preserve_pages(page, nr_pages);
 		if (err)
@@ -2547,7 +2548,8 @@ static int __init reserved_mem_preserve(void)
 	for (unsigned int i = 0; i < nr_preserved; i++) {
 		struct reserve_mem_table *map = &reserved_mem_table[i];
 		struct page *page = phys_to_page(map->start);
-		unsigned int nr_pages = map->size >> PAGE_SHIFT;
+		unsigned int nr_pages = PFN_UP(map->start + map->size) -
+					PFN_DOWN(map->start);
 
 		kho_unpreserve_pages(page, nr_pages);
 	}

base-commit: dde94c26af59f5020adafafa08ece21ccd32590b

Signature · 1 line
2.43.0
maintainer
#1 lore raw

Hi,

Quoted 2 lines · Sang-Heon Jeon

When map->start or map->size is not page aligned, reserved_mem_preserve() does not preserve the last pages of the region

I believe it's the last page, not pages.

Quoted 10 lines

from map->start to map->start + map->size.

After kexec the new kernel reserves only the preserved pages, so the last pages are released to the buddy allocator. But reserve_mem_find_by_name() still returns the whole region including the last pages, so they can be allocated while the subsystem is still using them.

Preserve every page the region spans so the new kernel reserves all of it.

If there are two adjacent not page aligned reserve_mem regions, we'll preserve them twice, or worse unintentionally unpreserve one of them on error handling of another.

I think it's better to restrict the reserve_mem alignment to PAGE_SIZE.

Quoted 50 lines
Fixes 8375b76517cb ("kho: replace kho_preserve_phys() with kho_preserve_pages()")

---

QEMU-based test results

- Booted with "memblock=debug kho=on reserve_mem=5000:64:oops"

  # kexec -s -l /bzImage --initrd=/initramfs.gz --reuse-cmdline
  # kexec -e
  # dmesg | grep kho_preserved_memory_reserve

1) AS-IS (before fix)

[    0.188536] __memblock_reserve: [0x000000013ffee000-0x000000013ffeefff] nid=-1 flags=0 kho_preserved_memory_reserve+0x3d/0x70

2) TO-BE (after fix)

[    0.076935] __memblock_reserve: [0x000000013ffee000-0x000000013ffeffff] nid=-1 flags=0 kho_preserved_memory_reserve+0x3d/0x70
 mm/memblock.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
mm/memblock.c +4 -2
index 777c69f05400..a17b1cccaf3d 100644
@@ -2534,7 +2534,8 @@ static int __init reserved_mem_preserve(void)
 	for (unsigned int i = 0; i < reserved_mem_count; i++, nr_preserved++) {
 		struct reserve_mem_table *map = &reserved_mem_table[i];
 		struct page *page = phys_to_page(map->start);
-		unsigned int nr_pages = map->size >> PAGE_SHIFT;
+		unsigned int nr_pages = PFN_UP(map->start + map->size) -
+					PFN_DOWN(map->start);
 
 		err = kho_preserve_pages(page, nr_pages);
 		if (err)
@@ -2547,7 +2548,8 @@ static int __init reserved_mem_preserve(void)
 	for (unsigned int i = 0; i < nr_preserved; i++) {
 		struct reserve_mem_table *map = &reserved_mem_table[i];
 		struct page *page = phys_to_page(map->start);
-		unsigned int nr_pages = map->size >> PAGE_SHIFT;
+		unsigned int nr_pages = PFN_UP(map->start + map->size) -
+					PFN_DOWN(map->start);
 
 		kho_unpreserve_pages(page, nr_pages);
 	}

base-commit: dde94c26af59f5020adafafa08ece21ccd32590b

Signature · 1 line
2.43.0
Signature · 2 lines
Sincerely yours,
Mike.
#2 lore raw

Hi,

Quoted 8 lines · Mike Rapoport

Hi,

Quoted 2 lines · Sang-Heon Jeon

When map->start or map->size is not page aligned, reserved_mem_preserve() does not preserve the last pages of the region

I believe it's the last page, not pages.

If the reserve_mem region is [6KB..13KB] and PAGE_SIZE is 4KB, it spans three pages, but map->size >> PAGE_SHIFT is 1. Yeah, To be exact, the last one or two.

Quoted 8 lines
Quoted 8 lines

from map->start to map->start + map->size.

After kexec the new kernel reserves only the preserved pages, so the last pages are released to the buddy allocator. But reserve_mem_find_by_name() still returns the whole region including the last pages, so they can be allocated while the subsystem is still using them.

Quoted 6 lines
Quoted 2 lines

Preserve every page the region spans so the new kernel reserves all of it.

If there are two adjacent not page aligned reserve_mem regions, we'll preserve them twice, or worse unintentionally unpreserve one of them on error handling of another.

Right, unexpected overlap could occur with this patch. Luckily, overlap doesn't seem to break the system in the existing code..

Quoted 1 line

I think it's better to restrict the reserve_mem alignment to PAGE_SIZE.

I considered that direction as well. If it doesn't break existing users, I'm all for it. I'll send a v2 soon. Thanks for your review.

Quoted 46 lines
Quoted 46 lines
Fixes 8375b76517cb ("kho: replace kho_preserve_phys() with kho_preserve_pages()")

---

QEMU-based test results

- Booted with "memblock=debug kho=on reserve_mem=5000:64:oops"

  # kexec -s -l /bzImage --initrd=/initramfs.gz --reuse-cmdline
  # kexec -e
  # dmesg | grep kho_preserved_memory_reserve

1) AS-IS (before fix)

[    0.188536] __memblock_reserve: [0x000000013ffee000-0x000000013ffeefff] nid=-1 flags=0 kho_preserved_memory_reserve+0x3d/0x70

2) TO-BE (after fix)

[    0.076935] __memblock_reserve: [0x000000013ffee000-0x000000013ffeffff] nid=-1 flags=0 kho_preserved_memory_reserve+0x3d/0x70
 mm/memblock.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
mm/memblock.c +4 -2
index 777c69f05400..a17b1cccaf3d 100644
@@ -2534,7 +2534,8 @@ static int __init reserved_mem_preserve(void)
      for (unsigned int i = 0; i < reserved_mem_count; i++, nr_preserved++) {
              struct reserve_mem_table *map = &reserved_mem_table[i];
              struct page *page = phys_to_page(map->start);
-             unsigned int nr_pages = map->size >> PAGE_SHIFT;
+             unsigned int nr_pages = PFN_UP(map->start + map->size) -
+                                     PFN_DOWN(map->start);
 
              err = kho_preserve_pages(page, nr_pages);
              if (err)
@@ -2547,7 +2548,8 @@ static int __init reserved_mem_preserve(void)
      for (unsigned int i = 0; i < nr_preserved; i++) {
              struct reserve_mem_table *map = &reserved_mem_table[i];
              struct page *page = phys_to_page(map->start);
-             unsigned int nr_pages = map->size >> PAGE_SHIFT;
+             unsigned int nr_pages = PFN_UP(map->start + map->size) -
+                                     PFN_DOWN(map->start);
 
              kho_unpreserve_pages(page, nr_pages);
      }
Quoted 8 lines
Quoted 4 lines

base-commit: dde94c26af59f5020adafafa08ece21ccd32590b --
2.43.0

--
Sincerely yours,
Mike.

Best regards,
Sang-Heon Jeon