efi: Fixes for EFI_MEMORY_SP memory on RISC-V and ARM64
cover efi: Fixes for EFI_MEMORY_SP memory on RISC-V and ARM64
Two small fixes to enable the use soft-reserved/special-purpose memory (EFI_MEMORY_SP) with dax_kmem on RISC-V (and ARM64, I think, though I don't have a platform to test it on).
Patch 1 fixes a trivial integer narrowing bug. Patch 2 prevents adding memblocks for unusable memory (including soft-resreved memory) so that it can later be hotplugged by dax_kmem.
Tested on a RISC-V platform that presents a range of EFI_MEMORY_SP with Bjorn's MEMORY_HOTPLUG series[0] applied.
[0]: https://lore.kernel.org/lkml/[email protected]/
Andrew Bresticker (2):
efi: runtime: Fix potential overflow of soft-reserved region size
efi: Don't add memblocks for unusable memory
drivers/firmware/efi/arm-runtime.c | 2 +- drivers/firmware/efi/efi-init.c | 12 +----------- drivers/firmware/efi/riscv-runtime.c | 2 +- 3 files changed, 3 insertions(+), 13 deletions(-)
Signature · 1 line
2.34.1
PATCH 1/2 efi: runtime: Fix potential overflow of soft-reserved region size
md_size will have been narrowed if we have >= 4GB worth of pages in a soft-reserved region.
--- drivers/firmware/efi/arm-runtime.c | 2 +- drivers/firmware/efi/riscv-runtime.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/firmware/efi/arm-runtime.c +1 -1
@@ -107,7 +107,7 @@ static int __init arm_enable_runtime_services(void)efi_memory_desc_t *md;for_each_efi_memory_desc (md) { -int md_size = md->num_pages <<EFI_PAGE_SHIFT ; +unsigned long md_size = md->num_pages <<EFI_PAGE_SHIFT ;struct resource *res;if (!(md->attribute &EFI_MEMORY_SP ))
drivers/firmware/efi/riscv-runtime.c +1 -1
@@ -85,7 +85,7 @@ static int __init riscv_enable_runtime_services(void)efi_memory_desc_t *md;for_each_efi_memory_desc (md) { -int md_size = md->num_pages <<EFI_PAGE_SHIFT ; +unsigned long md_size = md->num_pages <<EFI_PAGE_SHIFT ;struct resource *res;if (!(md->attribute &EFI_MEMORY_SP ))
Signature · 1 line
2.34.1
Ard Biesheuvel
maintainerRe: [PATCH 1/2] efi: runtime: Fix potential overflow of soft-reserved region size
Hi Andrew,
Quoted 15 lines · Andrew Bresticker
md_sizewill have been narrowed if we have >= 4GB worth of pages in a soft-reserved region.Signed-off-by Andrew Bresticker <[email protected]>--- drivers/firmware/efi/arm-runtime.c | 2 +- drivers/firmware/efi/riscv-runtime.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)drivers/firmware/efi/arm-runtime.c +0
-0
drivers/firmware/efi/arm-runtime.c static int __init arm_enable_runtime_services(void) · line 110
Quoted 5 lines
drivers/firmware/efi/arm-runtime.c +1
-1@@ -107,7 +107,7 @@ static int __init arm_enable_runtime_services(void)efi_memory_desc_t *md;for_each_efi_memory_desc (md) { -int md_size = md->num_pages <<EFI_PAGE_SHIFT ; +unsigned long md_size = md->num_pages <<EFI_PAGE_SHIFT ;
Better use u64 here, and below as well.
Quoted 20 lines
drivers/firmware/efi/arm-runtime.c +0
-0struct resource *res;if (!(md->attribute &EFI_MEMORY_SP ))drivers/firmware/efi/riscv-runtime.c +1
-2@@ -85,7 +85,7 @@ static int __init riscv_enable_runtime_services(void)efi_memory_desc_t *md;for_each_efi_memory_desc (md) { -int md_size = md->num_pages <<EFI_PAGE_SHIFT ; +unsigned long md_size = md->num_pages <<EFI_PAGE_SHIFT ;struct resource *res;if (!(md->attribute &EFI_MEMORY_SP )) --2.34.1
PATCH 2/2 efi: Don't add memblocks for unusable memory
In reply to Andrew BrestickerAdding memblocks (even if nomap) for such regions unnecessarily consumes resources by creating struct pages for memory that may never be used or, in the case of soft-reserved regions, prevents the memory from later being hotplugged in by dax_kmem. This is also consistent with how x86 handles unusable memory found in the EFI memory map.
--- drivers/firmware/efi/efi-init.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-)
drivers/firmware/efi/efi-init.c +1 -11
@@ -24,13 +24,6 @@unsigned long __initdata screen_info_table =EFI_INVALID_TABLE_ADDR ; -static int __init is_memory (efi_memory_desc_t *md) -{ -if (md->attribute & (EFI_MEMORY_WB |EFI_MEMORY_WT |EFI_MEMORY_WC )) -return 1 ; -return 0 ; -} -/* * Translate a EFI virtual address into a physical address: this is necessary, * as some data members of the EFI system table are virtually remapped after
@@ -195,12 +188,9 @@ static __init void reserve_regions(void)memrange_efi_to_native (&paddr, &npages); size = npages <<PAGE_SHIFT ; -if (is_memory (md)) { +if (is_usable_memory (md)) {early_init_dt_add_memory_arch (paddr, size); -if (!is_usable_memory (md)) -memblock_mark_nomap (paddr, size); -/* keep ACPI reclaim memory intact for kexec etc. */ if (md->type ==EFI_ACPI_RECLAIM_MEMORY )memblock_reserve (paddr, size);
Signature · 1 line
2.34.1
Ard Biesheuvel
maintainerRe: [PATCH 2/2] efi: Don't add memblocks for unusable memory
Quoted 7 lines · Andrew Bresticker
Adding memblocks (even if nomap) for such regions unnecessarily consumes resources by creating struct pages for memory that may never be used or, in the case of soft-reserved regions, prevents the memory from later being hotplugged in by
dax_kmem. This is also consistent with how x86 handles unusable memory found in the EFI memory map.
x86 doesn't care as much about memory vs device semantics as ARM does.
This affects the output of memblock_is_[region_]memory(), so we'd have to double check that none of those uses get broken by this.
If the soft reserved regions need to be omitted from memblock, we can deal with that separately perhaps, but changing it at this level seems inappropriate to me.
Quoted 40 lines
Signed-off-by Andrew Bresticker <[email protected]>--- drivers/firmware/efi/efi-init.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-)drivers/firmware/efi/efi-init.c +1
-12@@ -24,13 +24,6 @@unsigned long __initdata screen_info_table =EFI_INVALID_TABLE_ADDR ; -static int __init is_memory (efi_memory_desc_t *md) -{ -if (md->attribute & (EFI_MEMORY_WB |EFI_MEMORY_WT |EFI_MEMORY_WC )) -return 1 ; -return 0 ; -} -/* * Translate a EFI virtual address into a physical address: this is necessary, * as some data members of the EFI system table are virtually remapped after @@ -195,12 +188,9 @@ static __init void reserve_regions(void)memrange_efi_to_native (&paddr, &npages); size = npages <<PAGE_SHIFT ; -if (is_memory (md)) { +if (is_usable_memory (md)) {early_init_dt_add_memory_arch (paddr, size); -if (!is_usable_memory (md)) -memblock_mark_nomap (paddr, size); -/* keep ACPI reclaim memory intact for kexec etc. */ if (md->type ==EFI_ACPI_RECLAIM_MEMORY )memblock_reserve (paddr, size); --2.34.1
Re: [PATCH 2/2] efi: Don't add memblocks for unusable memory
Quoted 10 lines · Ard Biesheuvel
Quoted 7 lines · Andrew Bresticker
Adding memblocks (even if nomap) for such regions unnecessarily consumes resources by creating struct pages for memory that may never be used or, in the case of soft-reserved regions, prevents the memory from later being hotplugged in by
dax_kmem. This is also consistent with how x86 handles unusable memory found in the EFI memory map.
Quoted 8 lines
x86 doesn't care as much about memory vs device semantics as ARM does.
This affects the output of memblock_is_[region_]memory(), so we'd have to double check that none of those uses get broken by this.
If the soft reserved regions need to be omitted from memblock, we can deal with that separately perhaps, but changing it at this level seems inappropriate to me.
Sure, I can constrain this to just the soft-reserved regions.
-Andrew
Quoted 42 lines
Quoted 42 lines
Signed-off-by Andrew Bresticker <[email protected]>--- drivers/firmware/efi/efi-init.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-)drivers/firmware/efi/efi-init.c +1
-12@@ -24,13 +24,6 @@unsigned long __initdata screen_info_table =EFI_INVALID_TABLE_ADDR ; -static int __init is_memory (efi_memory_desc_t *md) -{ -if (md->attribute & (EFI_MEMORY_WB |EFI_MEMORY_WT |EFI_MEMORY_WC )) -return 1 ; -return 0 ; -} -/* * Translate a EFI virtual address into a physical address: this is necessary, * as some data members of the EFI system table are virtually remapped after @@ -195,12 +188,9 @@ static __init void reserve_regions(void)memrange_efi_to_native (&paddr, &npages); size = npages <<PAGE_SHIFT ; -if (is_memory (md)) { +if (is_usable_memory (md)) {early_init_dt_add_memory_arch (paddr, size); -if (!is_usable_memory (md)) -memblock_mark_nomap (paddr, size); -/* keep ACPI reclaim memory intact for kexec etc. */ if (md->type ==EFI_ACPI_RECLAIM_MEMORY )memblock_reserve (paddr, size); --2.34.1