build: corrections to .init.o generation logic
v2 cover build: corrections to .init.o generation logic
Initially I merely noticed the regression addressed by a patch which meanwhile has already gone in, but looking more closely revealed further deficiencies. After having moved the FIXME in patch 1 I couldn't resist and address that issue at least partly (patch 2), seeing that three and a half years have passed and nothing was done to improve the situation.
1: build: also check for empty .bss.* in .o -> .init.o conversion 2: EFI: free unused boot mem in at least some cases
Jan
PATCH v2 1/2 build: also check for empty .bss.* in .o -> .init.o conversion
We're gaining such sections, and like .text.* and .data.* they shouldn't be present in objects subject to automatic to-init conversion. Oddly enough for quite some time we did have an instance breaking this rule, which gets fixed at this occasion, by breaking out the EFI boot allocator functions into its own translation unit.
---
This depends on "x86/EFI: sanitize build logic" updated to v3 earlier today, due to the new source file added, as explicit dependencies on the individual objects in x86/Makefile go away there.
xen/Makefile +1 -1
@@ -355,7 +355,7 @@ $(TARGET): delete-unfresh-files $(MAKE) -C tools $(MAKE) -f $(BASEDIR)/Rules.mk include/xen/compile.h [ -e include/asm ] || ln -sf asm-$(TARGET_ARCH) include/asm - [ -e arch/$(TARGET_ARCH)/efi ] && for f in boot.c runtime.c compat.c efi.h;\ + [ -e arch/$(TARGET_ARCH)/efi ] && for f in $$(cd common/efi; echo *.[ch]); \ do test -r arch/$(TARGET_ARCH)/efi/$$f || \ ln -nsf ../../../common/efi/$$f arch/$(TARGET_ARCH)/efi/; \ done; \
xen/Rules.mk +1 -1
@@ -188,7 +188,7 @@ define cmd_obj_init_o $(OBJDUMP) -h $< | while read idx name sz rest; do \ case "$$name" in \ .*.local) ;; \ - .text|.text.*|.data|.data.*|.bss) \ + .text|.text.*|.data|.data.*|.bss|.bss.*) \ test $$(echo $$sz | sed 's,00*,0,') != 0 || continue; \ echo "Error: size of $<:$$name is 0x$$sz" >&2; \ exit $$(expr $$idx + 1);; \
xen/arch/arm/efi/Makefile +1 -1
@@ -1,4 +1,4 @@ CFLAGS-y += -fshort-wchar -obj-y += boot.init.o runtime.o +obj-y += boot.init.o ebmalloc.o runtime.o obj-$(CONFIG_ACPI) += efi-dom0.init.o
xen/arch/x86/efi/Makefile +1 -1
@@ -8,7 +8,7 @@ cmd_objcopy_o_ihex = $(OBJCOPY) -I ihex boot.init.o: buildid.o -EFIOBJ := boot.init.o compat.o runtime.o +EFIOBJ := boot.init.o ebmalloc.o compat.o runtime.o $(call cc-option-add,cflags-stack-boundary,CC,-mpreferred-stack-boundary=4) $(EFIOBJ): CFLAGS-stack-boundary := $(cflags-stack-boundary)
xen/common/efi/boot.c +1 -52
71 lines not on this page · raw message
xen/common/efi/ebmalloc.c new file +52 -0
52 lines not on this page · raw message
xen/common/efi/efi.h +6 -0
@@ -40,4 +40,10 @@ extern UINT64 efi_boot_max_var_store_sizextern UINT64 efi_apple_properties_addr;extern UINTN efi_apple_properties_len; +void noreturnblexit (const CHAR16 *str); +const CHAR16 *wmemchr (const CHAR16 *s,CHAR16 c,UINTN n); + +/* EFI boot allocator. */ +void *ebmalloc (size_t size); +void free_ebmalloc_unused_mem (void );
PATCH v2 2/2 EFI: free unused boot mem in at least some cases
In reply to Jan BeulichAddress at least the primary reason why 52bba67f8b87 ("efi/boot: Don't free ebmalloc area at all") was put in place: Make xen_in_range() aware of the freed range. This is in particular relevant for EFI-enabled builds not actually running on EFI, as the entire range will be unused in this case.
---
v2: Also adjust the two places where comments point out that they need
to remain in sync with xen_in_range(). Add assertions to xen_in_range().
---
The remaining issue could be addressed too, by making the area 2M in size and 2M-aligned.
xen/arch/x86/efi/stub.c +6 -0
@@ -52,6 +52,12 @@ bool efi_enabled(unsigned int feature)void __init efi_init_memory (void ) { } +bool efi_boot_mem_unused (unsigned long *start,unsigned long *end) +{ + *start = *end = (unsigned long )_end; +return false; +} +void efi_update_l4_pgtable (unsigned int l4idx,l4_pgentry_t l4e) { }bool efi_rs_using_pgtables (void )
xen/arch/x86/setup.c +20 -4
@@ -608,7 +608,7 @@ static void __init kexec_reserve_area(st#endif } -static inline bool using_2M_mapping (void ) +bool using_2M_mapping (void ) {return !l1_table_offset ((unsigned long )__2M_text_end) && !l1_table_offset((unsigned long)__2M_rodata_start) &&
@@ -830,6 +830,7 @@ void __init noreturn __start_xen(unsignemodule_t *mod;unsigned long nr_pages, raw_max_page, modules_headroom, module_map[1 ];int i, j, e820_warn =0 , bytes =0 ; +unsigned long eb_start, eb_end;bool acpi_boot_table_init_done = false, relocated = false;int ret;struct ns16550_defaults ns16550 = {
@@ -1145,7 +1146,8 @@ void __init noreturn __start_xen(unsigne/* * This needs to remain in sync with xen_in_range() and the -* respective reserve_e820_ram() invocation below. +* respective reserve_e820_ram() invocation below. No need to +* query efi_boot_mem_unused() here, though. */ mod[mbi->mods_count].mod_start =virt_to_mfn (_stext); mod[mbi->mods_count].mod_end = __2M_rwdata_end - _stext;
@@ -1418,7 +1420,13 @@ void __init noreturn __start_xen(unsignepanic ("Not enough memory to relocate Xen\n" );/* This needs to remain in sync with xen_in_range(). */ -reserve_e820_ram (&boot_e820,__pa (_stext),__pa (__2M_rwdata_end)); +if (efi_boot_mem_unused (&eb_start, &eb_end) ) + { +reserve_e820_ram (&boot_e820,__pa (_stext),__pa (eb_start)); +reserve_e820_ram (&boot_e820,__pa (eb_end),__pa (__2M_rwdata_end)); + } +else +reserve_e820_ram (&boot_e820,__pa (_stext),__pa (__2M_rwdata_end));/* Late kexec reservation (dynamic start address). */ kexec_reserve_area (&boot_e820);
@@ -1979,7 +1987,7 @@ int __hwdom_init xen_in_range(unsigned lpaddr_t start, end;int i; -enum { region_s3, region_ro, region_rw, nr_regions }; +enum { region_s3, region_ro, region_rw, region_bss, nr_regions };static struct {paddr_t s, e; } xen_regions[nr_regions] __hwdom_initdata;
@@ -2004,6 +2012,14 @@ int __hwdom_init xen_in_range(unsigned l/* hypervisor .data + .bss */ xen_regions[region_rw].s =__pa (&__2M_rwdata_start); xen_regions[region_rw].e =__pa (&__2M_rwdata_end); +if (efi_boot_mem_unused (&start, &end) ) + { +ASSERT (__pa (start) >= xen_regions[region_rw].s); +ASSERT (__pa (end) <= xen_regions[region_rw].e); + xen_regions[region_rw].e =__pa (start); + xen_regions[region_bss].s =__pa (end); + xen_regions[region_bss].e =__pa (&__2M_rwdata_end); + } } start = (paddr_t )mfn <<PAGE_SHIFT ;
xen/arch/x86/tboot.c +12 -0
@@ -1,3 +1,4 @@ +#include <xen/efi.h> #include <xen/init.h> #include <xen/types.h> #include <xen/lib.h>
@@ -364,6 +365,8 @@ void tboot_shutdown(uint32_t shutdown_ty/* if this is S3 then set regions to MAC */ if ( shutdown_type ==TB_SHUTDOWN_S3 ) { +unsigned long s, e; +/* * Xen regions for tboot to MAC. This needs to remain in sync with * xen_in_range().
@@ -378,6 +381,15 @@ void tboot_shutdown(uint32_t shutdown_ty/* hypervisor .data + .bss */ g_tboot_shared->mac_regions[2 ].start = (uint64_t )__pa (&__2M_rwdata_start); g_tboot_shared->mac_regions[2 ].size = __2M_rwdata_end - __2M_rwdata_start; +if (efi_boot_mem_unused (&s, &e) ) + { + g_tboot_shared->mac_regions[2 ].size = + s - (unsigned long )__2M_rwdata_start; + g_tboot_shared->mac_regions[3 ].start =__pa (e); + g_tboot_shared->mac_regions[3 ].size = + (unsigned long )__2M_rwdata_end - e; + g_tboot_shared->num_mac_regions =4 ; + }/* * MAC domains and other Xen memory
xen/common/efi/ebmalloc.c +24 -5
@@ -1,5 +1,9 @@#include "efi.h" #include <xen/init.h> +#include <xen/mm.h> +#ifdef CONFIG_X86 +#include <asm/setup.h> +#endif #ifdef CONFIG_ARM /*
@@ -21,7 +25,7 @@ static char __section(".bss.page_aligned") __aligned(PAGE_SIZE) ebmalloc_mem[EBMALLOC_SIZE ]; -static unsigned long __initdata ebmalloc_allocated; +static unsigned long __read_mostly ebmalloc_allocated;/* EFI boot allocator. */ void __init *ebmalloc (size_t size)
@@ -36,17 +40,32 @@ void __init *ebmalloc(size_t size)return ptr; } +bool efi_boot_mem_unused (unsigned long *start,unsigned long *end) +{ + *start = (unsigned long )ebmalloc_mem +PAGE_ALIGN (ebmalloc_allocated); + *end = (unsigned long )ebmalloc_mem +sizeof (ebmalloc_mem); + +return *start < *end; +} +void __init free_ebmalloc_unused_mem (void ) { -#if 0 /* FIXME: Putting a hole in the BSS breaks the IOMMU mappings for dom0. */ unsigned long start, end; - start = (unsigned long )ebmalloc_mem +PAGE_ALIGN (ebmalloc_allocated); - end = (unsigned long )ebmalloc_mem +sizeof (ebmalloc_mem); +#ifdef CONFIG_X86 +/* FIXME: Putting a hole in .bss would shatter the large page mapping. */ +if (using_2M_mapping () ) + { + ebmalloc_allocated =sizeof (ebmalloc_mem); +return ; + } +#endif + +if ( !efi_boot_mem_unused (&start, &end) ) +return ;destroy_xen_mappings (start, end);init_xenheap_pages (__pa (start),__pa (end));printk (XENLOG_INFO "Freed %lukB unused BSS memory\n" , (end - start) >>10 ); -#endif }
xen/include/asm-x86/setup.h +2 -0
@@ -9,6 +9,8 @@ extern const char __2M_rodata_start[], _extern char __2M_init_start[], __2M_init_end[];extern char __2M_rwdata_start[], __2M_rwdata_end[]; +bool using_2M_mapping (void ); +extern unsigned long xenheap_initial_phys_start;extern uint64_t boot_tsc_stamp;
xen/include/xen/efi.h +1 -0
@@ -33,6 +33,7 @@ struct compat_pf_efi_runtime_call;bool efi_enabled (unsigned int feature);void efi_init_memory (void ); +bool efi_boot_mem_unused (unsigned long *start,unsigned long *end);bool efi_rs_using_pgtables (void );unsigned long efi_get_time (void );void efi_halt_system (void );
Ping: [PATCH v2 2/2] EFI: free unused boot mem in at least some cases
Quoted 11 lines · Jan Beulich
Address at least the primary reason why
52bba67f8b87("efi/boot: Don't free ebmalloc area at all") was put in place: Makexen_in_range()aware of the freed range. This is in particular relevant for EFI-enabled builds not actually running on EFI, as the entire range will be unused in this case.Signed-off-by Jan Beulich <[email protected]>---
v2: Also adjust the two places where comments point out that they need
to remain in sync withxen_in_range(). Add assertions toxen_in_range().
Anyone?
Quoted 199 lines
---
The remaining issue could be addressed too, by making the area 2M in size and 2M-aligned.xen/arch/x86/efi/stub.c +6
-0@@ -52,6 +52,12 @@ bool efi_enabled(unsigned int feature)void __init efi_init_memory (void ) { } +bool efi_boot_mem_unused (unsigned long *start,unsigned long *end) +{ + *start = *end = (unsigned long )_end; +return false; +} +void efi_update_l4_pgtable (unsigned int l4idx,l4_pgentry_t l4e) { }bool efi_rs_using_pgtables (void )xen/arch/x86/setup.c +20
-4@@ -608,7 +608,7 @@ static void __init kexec_reserve_area(st#endif } -static inline bool using_2M_mapping (void ) +bool using_2M_mapping (void ) {return !l1_table_offset ((unsigned long )__2M_text_end) && !l1_table_offset((unsigned long)__2M_rodata_start) &&@@ -830,6 +830,7 @@ void __init noreturn __start_xen(unsignemodule_t *mod;unsigned long nr_pages, raw_max_page, modules_headroom, module_map[1 ];int i, j, e820_warn =0 , bytes =0 ; +unsigned long eb_start, eb_end;bool acpi_boot_table_init_done = false, relocated = false;int ret;struct ns16550_defaults ns16550 = {@@ -1145,7 +1146,8 @@ void __init noreturn __start_xen(unsigne/* * This needs to remain in sync with xen_in_range() and the -* respective reserve_e820_ram() invocation below. +* respective reserve_e820_ram() invocation below. No need to +* query efi_boot_mem_unused() here, though. */ mod[mbi->mods_count].mod_start =virt_to_mfn (_stext); mod[mbi->mods_count].mod_end = __2M_rwdata_end - _stext;@@ -1418,7 +1420,13 @@ void __init noreturn __start_xen(unsignepanic ("Not enough memory to relocate Xen\n" );/* This needs to remain in sync with xen_in_range(). */ -reserve_e820_ram (&boot_e820,__pa (_stext),__pa (__2M_rwdata_end)); +if (efi_boot_mem_unused (&eb_start, &eb_end) ) + { +reserve_e820_ram (&boot_e820,__pa (_stext),__pa (eb_start)); +reserve_e820_ram (&boot_e820,__pa (eb_end),__pa (__2M_rwdata_end)); + } +else +reserve_e820_ram (&boot_e820,__pa (_stext),__pa (__2M_rwdata_end));/* Late kexec reservation (dynamic start address). */ kexec_reserve_area (&boot_e820);@@ -1979,7 +1987,7 @@ int __hwdom_init xen_in_range(unsigned lpaddr_t start, end;int i; -enum { region_s3, region_ro, region_rw, nr_regions }; +enum { region_s3, region_ro, region_rw, region_bss, nr_regions };static struct {paddr_t s, e; } xen_regions[nr_regions] __hwdom_initdata;@@ -2004,6 +2012,14 @@ int __hwdom_init xen_in_range(unsigned l/* hypervisor .data + .bss */ xen_regions[region_rw].s =__pa (&__2M_rwdata_start); xen_regions[region_rw].e =__pa (&__2M_rwdata_end); +if (efi_boot_mem_unused (&start, &end) ) + { +ASSERT (__pa (start) >= xen_regions[region_rw].s); +ASSERT (__pa (end) <= xen_regions[region_rw].e); + xen_regions[region_rw].e =__pa (start); + xen_regions[region_bss].s =__pa (end); + xen_regions[region_bss].e =__pa (&__2M_rwdata_end); + } } start = (paddr_t )mfn <<PAGE_SHIFT ;xen/arch/x86/tboot.c +12
-0@@ -1,3 +1,4 @@ +#include <xen/efi.h> #include <xen/init.h> #include <xen/types.h> #include <xen/lib.h> @@ -364,6 +365,8 @@ void tboot_shutdown(uint32_t shutdown_ty/* if this is S3 then set regions to MAC */ if ( shutdown_type ==TB_SHUTDOWN_S3 ) { +unsigned long s, e; +/* * Xen regions for tboot to MAC. This needs to remain in sync with * xen_in_range(). @@ -378,6 +381,15 @@ void tboot_shutdown(uint32_t shutdown_ty/* hypervisor .data + .bss */ g_tboot_shared->mac_regions[2 ].start = (uint64_t )__pa (&__2M_rwdata_start); g_tboot_shared->mac_regions[2 ].size = __2M_rwdata_end - __2M_rwdata_start; +if (efi_boot_mem_unused (&s, &e) ) + { + g_tboot_shared->mac_regions[2 ].size = + s - (unsigned long )__2M_rwdata_start; + g_tboot_shared->mac_regions[3 ].start =__pa (e); + g_tboot_shared->mac_regions[3 ].size = + (unsigned long )__2M_rwdata_end - e; + g_tboot_shared->num_mac_regions =4 ; + }/* * MAC domains and other Xen memory xen/common/efi/ebmalloc.c +24
-5@@ -1,5 +1,9 @@#include "efi.h" #include <xen/init.h> +#include <xen/mm.h> +#ifdef CONFIG_X86 +#include <asm/setup.h> +#endif #ifdef CONFIG_ARM /* @@ -21,7 +25,7 @@ static char __section(".bss.page_aligned") __aligned(PAGE_SIZE) ebmalloc_mem[EBMALLOC_SIZE ]; -static unsigned long __initdata ebmalloc_allocated; +static unsigned long __read_mostly ebmalloc_allocated;/* EFI boot allocator. */ void __init *ebmalloc (size_t size)@@ -36,17 +40,32 @@ void __init *ebmalloc(size_t size)return ptr; } +bool efi_boot_mem_unused (unsigned long *start,unsigned long *end) +{ + *start = (unsigned long )ebmalloc_mem +PAGE_ALIGN (ebmalloc_allocated); + *end = (unsigned long )ebmalloc_mem +sizeof (ebmalloc_mem); + +return *start < *end; +} +void __init free_ebmalloc_unused_mem (void ) { -#if 0 /* FIXME: Putting a hole in the BSS breaks the IOMMU mappings for dom0. */ unsigned long start, end; - start = (unsigned long )ebmalloc_mem +PAGE_ALIGN (ebmalloc_allocated); - end = (unsigned long )ebmalloc_mem +sizeof (ebmalloc_mem); +#ifdef CONFIG_X86 +/* FIXME: Putting a hole in .bss would shatter the large page mapping. */ +if (using_2M_mapping () ) + { + ebmalloc_allocated =sizeof (ebmalloc_mem); +return ; + } +#endif + +if ( !efi_boot_mem_unused (&start, &end) ) +return ;destroy_xen_mappings (start, end);init_xenheap_pages (__pa (start),__pa (end));printk (XENLOG_INFO "Freed %lukB unused BSS memory\n" , (end - start) >>10 ); -#endif }xen/include/asm-x86/setup.h +2
-0@@ -9,6 +9,8 @@ extern const char __2M_rodata_start[], _extern char __2M_init_start[], __2M_init_end[];extern char __2M_rwdata_start[], __2M_rwdata_end[]; +bool using_2M_mapping (void ); +extern unsigned long xenheap_initial_phys_start;extern uint64_t boot_tsc_stamp;xen/include/xen/efi.h +1
-0@@ -33,6 +33,7 @@ struct compat_pf_efi_runtime_call;bool efi_enabled (unsigned int feature);void efi_init_memory (void ); +bool efi_boot_mem_unused (unsigned long *start,unsigned long *end);bool efi_rs_using_pgtables (void );unsigned long efi_get_time (void );void efi_halt_system (void );
Re: [PATCH v2 2/2] EFI: free unused boot mem in at least some cases
In reply to Jan BeulichQuoted 7 lines · Jan Beulich
Address at least the primary reason why
52bba67f8b87("efi/boot: Don't free ebmalloc area at all") was put in place: Makexen_in_range()aware of the freed range. This is in particular relevant for EFI-enabled builds not actually running on EFI, as the entire range will be unused in this case.Signed-off-by Jan Beulich <[email protected]>
Just one comment below.
Quoted 43 lines
---
v2: Also adjust the two places where comments point out that they need
to remain in sync withxen_in_range(). Add assertions toxen_in_range().
---
The remaining issue could be addressed too, by making the area 2M in size and 2M-aligned.xen/arch/x86/efi/stub.c +6
-0@@ -52,6 +52,12 @@ bool efi_enabled(unsigned int feature)void __init efi_init_memory (void ) { } +bool efi_boot_mem_unused (unsigned long *start,unsigned long *end) +{ + *start = *end = (unsigned long )_end; +return false; +} +void efi_update_l4_pgtable (unsigned int l4idx,l4_pgentry_t l4e) { }bool efi_rs_using_pgtables (void )xen/arch/x86/setup.c +2
-1@@ -608,7 +608,7 @@ static void __init kexec_reserve_area(st#endif } -static inline bool using_2M_mapping (void ) +bool using_2M_mapping (void ) {return !l1_table_offset ((unsigned long )__2M_text_end) && !l1_table_offset((unsigned long)__2M_rodata_start) &&@@ -830,6 +830,7 @@ void __init noreturn __start_xen(unsignemodule_t *mod;unsigned long nr_pages, raw_max_page, modules_headroom, module_map[1 ];int i, j, e820_warn =0 , bytes =0 ; +unsigned long eb_start, eb_end;bool acpi_boot_table_init_done = false, relocated = false;int ret;struct ns16550_defaults ns16550 = {
xen/arch/x86/setup.c void __init noreturn __start_xen(unsigne · line 1153
Quoted 9 lines
xen/arch/x86/setup.c +2
-1@@ -1145,7 +1146,8 @@ void __init noreturn __start_xen(unsigne/* * This needs to remain in sync with xen_in_range() and the -* respective reserve_e820_ram() invocation below. +* respective reserve_e820_ram() invocation below. No need to +* query efi_boot_mem_unused() here, though. */ mod[mbi->mods_count].mod_start =virt_to_mfn (_stext); mod[mbi->mods_count].mod_end = __2M_rwdata_end - _stext;
I find this extremely confusing, we reuse mod_start/mod_end to contain a mfn and a size (in bytes) instead of a start and end address (not something that should be fixed here, but seeing this I assumed it was wrong).
Quoted 7 lines
xen/arch/x86/setup.c +7
-0+bool efi_boot_mem_unused (unsigned long *start,unsigned long *end) +{ + *start = (unsigned long )ebmalloc_mem +PAGE_ALIGN (ebmalloc_allocated); + *end = (unsigned long )ebmalloc_mem +sizeof (ebmalloc_mem); + +return *start < *end; +}
xen/arch/x86/setup.c
Quoted 10 lines
xen/arch/x86/setup.c +3
-3+void __init free_ebmalloc_unused_mem (void ) { -#if 0 /* FIXME: Putting a hole in the BSS breaks the IOMMU mappings for dom0. */ unsigned long start, end; - start = (unsigned long )ebmalloc_mem +PAGE_ALIGN (ebmalloc_allocated); - end = (unsigned long )ebmalloc_mem +sizeof (ebmalloc_mem); +#ifdef CONFIG_X86 +/* FIXME: Putting a hole in .bss would shatter the large page mapping. */
Could you make the ebmalloc size (EBMALLOC_SIZE) 2MB (and aligned), so that you would only shatter the malloc'ed pages but not the surrounding mappings?
That would be a good compromise IMO.
Roger.
Re: [PATCH v2 2/2] EFI: free unused boot mem in at least some cases
Quoted 10 lines · Roger Pau Monné
Quoted 7 lines · Jan Beulich
Address at least the primary reason why
52bba67f8b87("efi/boot: Don't free ebmalloc area at all") was put in place: Makexen_in_range()aware of the freed range. This is in particular relevant for EFI-enabled builds not actually running on EFI, as the entire range will be unused in this case.Signed-off-by Jan Beulich <[email protected]>Acked-by Roger Pau Monné <[email protected]>
Thanks much.
Quoted 15 lines
xen/arch/x86/setup.c void __init noreturn __start_xen(unsigne · line 1153
Quoted 10 lines
xen/arch/x86/setup.c +2
-1@@ -1145,7 +1146,8 @@ void __init noreturn __start_xen(unsigne/* * This needs to remain in sync with xen_in_range() and the -* respective reserve_e820_ram() invocation below. +* respective reserve_e820_ram() invocation below. No need to +* query efi_boot_mem_unused() here, though. */ mod[mbi->mods_count].mod_start =virt_to_mfn (_stext); mod[mbi->mods_count].mod_end = __2M_rwdata_end - _stext;I find this extremely confusing, we reuse mod_start/mod_end to contain a mfn and a size (in bytes) instead of a start and end address (not something that should be fixed here, but seeing this I assumed it was wrong).
While perhaps somewhat confusing, I still think it was a fair thing to do in favor of introducing a completely new way of propagating respective information, and then having the consumer of this data look at two different places.
Quoted 22 lines
Quoted 7 lines
xen/common/efi/ebmalloc.c +7
-0+bool efi_boot_mem_unused (unsigned long *start,unsigned long *end) +{ + *start = (unsigned long )ebmalloc_mem +PAGE_ALIGN (ebmalloc_allocated); + *end = (unsigned long )ebmalloc_mem +sizeof (ebmalloc_mem); + +return *start < *end; +}xen/common/efi/ebmalloc.c void __init *ebmalloc(size_t size) · line 56
Quoted 10 lines
xen/common/efi/ebmalloc.c +3
-3+void __init free_ebmalloc_unused_mem (void ) { -#if 0 /* FIXME: Putting a hole in the BSS breaks the IOMMU mappings for dom0. */ unsigned long start, end; - start = (unsigned long )ebmalloc_mem +PAGE_ALIGN (ebmalloc_allocated); - end = (unsigned long )ebmalloc_mem +sizeof (ebmalloc_mem); +#ifdef CONFIG_X86 +/* FIXME: Putting a hole in .bss would shatter the large page mapping. */ Could you make the ebmalloc size (
EBMALLOC_SIZE) 2MB (and aligned), so that you would only shatter the malloc'ed pages but not the surrounding mappings?
Quoted 1 line
That would be a good compromise IMO.
Yes, that's what I've been considering as a compromise as well. In fact I was further thinking whether to allocate the space from the linker script instead of having a global/static object. Maybe by extending into the .pad section, which is already 2Mb aligned anyway.
Another option is to not further align the whole blob at all and merely free whatever comes past the next 2Mb boundary (and is not in use). This would avoid having an up to 2Mb block of unused, not freed memory ahead of the ebmalloc one.
Jan
Re: [PATCH v2 2/2] EFI: free unused boot mem in at least some cases
Quoted 30 lines · Jan Beulich
Quoted 10 lines · Roger Pau Monné
Quoted 7 lines · Jan Beulich
Address at least the primary reason why
52bba67f8b87("efi/boot: Don't free ebmalloc area at all") was put in place: Makexen_in_range()aware of the freed range. This is in particular relevant for EFI-enabled builds not actually running on EFI, as the entire range will be unused in this case.Signed-off-by Jan Beulich <[email protected]>Acked-by Roger Pau Monné <[email protected]>Thanks much.
Quoted 15 lines
xen/arch/x86/setup.c void __init noreturn __start_xen(unsigne · line 1153
Quoted 10 lines
xen/arch/x86/setup.c +2
-1@@ -1145,7 +1146,8 @@ void __init noreturn __start_xen(unsigne/* * This needs to remain in sync with xen_in_range() and the -* respective reserve_e820_ram() invocation below. +* respective reserve_e820_ram() invocation below. No need to +* query efi_boot_mem_unused() here, though. */ mod[mbi->mods_count].mod_start =virt_to_mfn (_stext); mod[mbi->mods_count].mod_end = __2M_rwdata_end - _stext;I find this extremely confusing, we reuse mod_start/mod_end to contain a mfn and a size (in bytes) instead of a start and end address (not something that should be fixed here, but seeing this I assumed it was wrong).
Quoted 4 lines
While perhaps somewhat confusing, I still think it was a fair thing to do in favor of introducing a completely new way of propagating respective information, and then having the consumer of this data look at two different places.
Maybe we could add a union there so that mod_end would alias with mod_size or something.
Quoted 22 lines
Quoted 22 lines
Quoted 7 lines
xen/common/efi/ebmalloc.c +7
-0+bool efi_boot_mem_unused (unsigned long *start,unsigned long *end) +{ + *start = (unsigned long )ebmalloc_mem +PAGE_ALIGN (ebmalloc_allocated); + *end = (unsigned long )ebmalloc_mem +sizeof (ebmalloc_mem); + +return *start < *end; +}xen/common/efi/ebmalloc.c void __init *ebmalloc(size_t size) · line 56
Quoted 10 lines
xen/common/efi/ebmalloc.c +3
-3+void __init free_ebmalloc_unused_mem (void ) { -#if 0 /* FIXME: Putting a hole in the BSS breaks the IOMMU mappings for dom0. */ unsigned long start, end; - start = (unsigned long )ebmalloc_mem +PAGE_ALIGN (ebmalloc_allocated); - end = (unsigned long )ebmalloc_mem +sizeof (ebmalloc_mem); +#ifdef CONFIG_X86 +/* FIXME: Putting a hole in .bss would shatter the large page mapping. */ Could you make the ebmalloc size (
EBMALLOC_SIZE) 2MB (and aligned), so that you would only shatter the malloc'ed pages but not the surrounding mappings?
Quoted 6 lines
Quoted 1 line
That would be a good compromise IMO.
Yes, that's what I've been considering as a compromise as well. In fact I was further thinking whether to allocate the space from the linker script instead of having a global/static object. Maybe by extending into the .pad section, which is already 2Mb aligned anyway.
We would have to adjust the calculations then, but would be fine IMO as it won't require poking a hole in the bss section. I assume we would need to then move _end to cover it.
Quoted 4 lines
Another option is to not further align the whole blob at all and merely free whatever comes past the next 2Mb boundary (and is not in use). This would avoid having an up to 2Mb block of unused, not freed memory ahead of the ebmalloc one.
I would just place it at the end of the loaded image (after bss) as it seems simpler.
Roger.
PATCH v3 1/1 EFI: free unused boot mem in at least some cases
In reply to Jan BeulichAddress at least the primary reason why 52bba67f8b87 ("efi/boot: Don't free ebmalloc area at all") was put in place: Make xen_in_range() aware of the freed range. This is in particular relevant for EFI-enabled builds not actually running on EFI, as the entire range will be unused in this case.
---
v3: Don't free the memory twice.
v2: Also adjust the two places where comments point out that they need
to remain in sync with xen_in_range(). Add assertions to xen_in_range().
---
The remaining issue could be addressed too, by making the area 2M in size and 2M-aligned.
xen/arch/x86/efi/stub.c +6 -0
@@ -52,6 +52,12 @@ bool efi_enabled(unsigned int feature)void __init efi_init_memory (void ) { } +bool efi_boot_mem_unused (unsigned long *start,unsigned long *end) +{ + *start = *end = (unsigned long )_end; +return false; +} +void efi_update_l4_pgtable (unsigned int l4idx,l4_pgentry_t l4e) { }bool efi_rs_using_pgtables (void )
xen/arch/x86/setup.c +23 -3
@@ -830,6 +830,7 @@ void __init noreturn __start_xen(unsignemodule_t *mod;unsigned long nr_pages, raw_max_page, modules_headroom, module_map[1 ];int i, j, e820_warn =0 , bytes =0 ; +unsigned long eb_start, eb_end;bool acpi_boot_table_init_done = false, relocated = false;int ret;struct ns16550_defaults ns16550 = {
@@ -1145,7 +1146,8 @@ void __init noreturn __start_xen(unsigne/* * This needs to remain in sync with xen_in_range() and the -* respective reserve_e820_ram() invocation below. +* respective reserve_e820_ram() invocation below. No need to +* query efi_boot_mem_unused() here, though. */ mod[mbi->mods_count].mod_start =virt_to_mfn (_stext); mod[mbi->mods_count].mod_end = __2M_rwdata_end - _stext;
@@ -1417,8 +1419,18 @@ void __init noreturn __start_xen(unsigneif ( !xen_phys_start )panic ("Not enough memory to relocate Xen\n" ); +/* FIXME: Putting a hole in .bss would shatter the large page mapping. */ +if (using_2M_mapping () ) +efi_boot_mem_unused (NULL ,NULL ); +/* This needs to remain in sync with xen_in_range(). */ -reserve_e820_ram (&boot_e820,__pa (_stext),__pa (__2M_rwdata_end)); +if (efi_boot_mem_unused (&eb_start, &eb_end) ) + { +reserve_e820_ram (&boot_e820,__pa (_stext),__pa (eb_start)); +reserve_e820_ram (&boot_e820,__pa (eb_end),__pa (__2M_rwdata_end)); + } +else +reserve_e820_ram (&boot_e820,__pa (_stext),__pa (__2M_rwdata_end));/* Late kexec reservation (dynamic start address). */ kexec_reserve_area (&boot_e820);
@@ -1979,7 +1991,7 @@ int __hwdom_init xen_in_range(unsigned lpaddr_t start, end;int i; -enum { region_s3, region_ro, region_rw, nr_regions }; +enum { region_s3, region_ro, region_rw, region_bss, nr_regions };static struct {paddr_t s, e; } xen_regions[nr_regions] __hwdom_initdata;
@@ -2004,6 +2016,14 @@ int __hwdom_init xen_in_range(unsigned l/* hypervisor .data + .bss */ xen_regions[region_rw].s =__pa (&__2M_rwdata_start); xen_regions[region_rw].e =__pa (&__2M_rwdata_end); +if (efi_boot_mem_unused (&start, &end) ) + { +ASSERT (__pa (start) >= xen_regions[region_rw].s); +ASSERT (__pa (end) <= xen_regions[region_rw].e); + xen_regions[region_rw].e =__pa (start); + xen_regions[region_bss].s =__pa (end); + xen_regions[region_bss].e =__pa (&__2M_rwdata_end); + } } start = (paddr_t )mfn <<PAGE_SHIFT ;
xen/arch/x86/tboot.c +12 -0
@@ -1,3 +1,4 @@ +#include <xen/efi.h> #include <xen/init.h> #include <xen/types.h> #include <xen/lib.h>
@@ -364,6 +365,8 @@ void tboot_shutdown(uint32_t shutdown_ty/* if this is S3 then set regions to MAC */ if ( shutdown_type ==TB_SHUTDOWN_S3 ) { +unsigned long s, e; +/* * Xen regions for tboot to MAC. This needs to remain in sync with * xen_in_range().
@@ -378,6 +381,15 @@ void tboot_shutdown(uint32_t shutdown_ty/* hypervisor .data + .bss */ g_tboot_shared->mac_regions[2 ].start = (uint64_t )__pa (&__2M_rwdata_start); g_tboot_shared->mac_regions[2 ].size = __2M_rwdata_end - __2M_rwdata_start; +if (efi_boot_mem_unused (&s, &e) ) + { + g_tboot_shared->mac_regions[2 ].size = + s - (unsigned long )__2M_rwdata_start; + g_tboot_shared->mac_regions[3 ].start =__pa (e); + g_tboot_shared->mac_regions[3 ].size = + (unsigned long )__2M_rwdata_end - e; + g_tboot_shared->num_mac_regions =4 ; + }/* * MAC domains and other Xen memory
xen/common/efi/ebmalloc.c +26 -5
@@ -1,5 +1,6 @@#include "efi.h" #include <xen/init.h> +#include <xen/mm.h> #ifdef CONFIG_ARM /*
@@ -21,7 +22,7 @@ static char __section(".bss.page_aligned") __aligned(PAGE_SIZE) ebmalloc_mem[EBMALLOC_SIZE ]; -static unsigned long __initdata ebmalloc_allocated; +static unsigned long __read_mostly ebmalloc_allocated;/* EFI boot allocator. */ void __init *ebmalloc (size_t size)
@@ -36,17 +37,37 @@ void __init *ebmalloc(size_t size)return ptr; } +bool efi_boot_mem_unused (unsigned long *start,unsigned long *end) +{ +if ( !start && !end ) + { + ebmalloc_allocated =sizeof (ebmalloc_mem); +return false; + } + + *start = (unsigned long )ebmalloc_mem +PAGE_ALIGN (ebmalloc_allocated); + *end = (unsigned long )ebmalloc_mem +sizeof (ebmalloc_mem); + +return *start < *end; +} +void __init free_ebmalloc_unused_mem (void ) { -#if 0 /* FIXME: Putting a hole in the BSS breaks the IOMMU mappings for dom0. */ unsigned long start, end; - start = (unsigned long )ebmalloc_mem +PAGE_ALIGN (ebmalloc_allocated); - end = (unsigned long )ebmalloc_mem +sizeof (ebmalloc_mem); +if ( !efi_boot_mem_unused (&start, &end) ) +return ;destroy_xen_mappings (start, end); + +#ifdef CONFIG_X86 +/* +* By reserving the space early in the E820 map, it gets freed way before +* we make it here. Don't free the range a 2nd time. +*/ +#else init_xenheap_pages (__pa (start),__pa (end)); +#endif printk (XENLOG_INFO "Freed %lukB unused BSS memory\n" , (end - start) >>10 ); -#endif }
xen/include/xen/efi.h +1 -0
@@ -33,6 +33,7 @@ struct compat_pf_efi_runtime_call;bool efi_enabled (unsigned int feature);void efi_init_memory (void ); +bool efi_boot_mem_unused (unsigned long *start,unsigned long *end);bool efi_rs_using_pgtables (void );unsigned long efi_get_time (void );void efi_halt_system (void );
Re: [PATCH v3] EFI: free unused boot mem in at least some cases
Quoted 6 lines · Jan Beulich
Address at least the primary reason why
52bba67f8b87("efi/boot: Don't free ebmalloc area at all") was put in place: Makexen_in_range()aware of the freed range. This is in particular relevant for EFI-enabled builds not actually running on EFI, as the entire range will be unused in this case.
Quoted 7 lines
Signed-off-by Jan Beulich <[email protected]>Acked-by Roger Pau Monné <[email protected]>---
v3: Don't free the memory twice.
v2: Also adjust the two places where comments point out that they need
to remain in sync withxen_in_range(). Add assertions toxen_in_range().
I've sent this just for the sake of having it on the list; I'm about to commit it with Roger's ack.
Jan
PATCH v4 1/1 EFI: free unused boot mem in at least some cases
In reply to Jan BeulichAddress at least the primary reason why 52bba67f8b87 ("efi/boot: Don't free ebmalloc area at all") was put in place: Make xen_in_range() aware of the freed range. This is in particular relevant for EFI-enabled builds not actually running on EFI, as the entire range will be unused in this case.
---
v4: Address PV shim breakage (stub function also needed adjustment).
v3: Don't free the memory twice.
v2: Also adjust the two places where comments point out that they need
to remain in sync with xen_in_range(). Add assertions to xen_in_range().
---
The remaining issue could be addressed too, by making the area 2M in size and 2M-aligned.
xen/arch/x86/efi/stub.c +7 -0
@@ -52,6 +52,13 @@ bool efi_enabled(unsigned int feature)void __init efi_init_memory (void ) { } +bool efi_boot_mem_unused (unsigned long *start,unsigned long *end) +{ +if ( start || end ) + *start = *end = (unsigned long )_end; +return false; +} +void efi_update_l4_pgtable (unsigned int l4idx,l4_pgentry_t l4e) { }bool efi_rs_using_pgtables (void )
xen/arch/x86/setup.c +23 -3
@@ -830,6 +830,7 @@ void __init noreturn __start_xen(unsignemodule_t *mod;unsigned long nr_pages, raw_max_page, modules_headroom, module_map[1 ];int i, j, e820_warn =0 , bytes =0 ; +unsigned long eb_start, eb_end;bool acpi_boot_table_init_done = false, relocated = false;int ret;struct ns16550_defaults ns16550 = {
@@ -1145,7 +1146,8 @@ void __init noreturn __start_xen(unsigne/* * This needs to remain in sync with xen_in_range() and the -* respective reserve_e820_ram() invocation below. +* respective reserve_e820_ram() invocation below. No need to +* query efi_boot_mem_unused() here, though. */ mod[mbi->mods_count].mod_start =virt_to_mfn (_stext); mod[mbi->mods_count].mod_end = __2M_rwdata_end - _stext;
@@ -1417,8 +1419,18 @@ void __init noreturn __start_xen(unsigneif ( !xen_phys_start )panic ("Not enough memory to relocate Xen\n" ); +/* FIXME: Putting a hole in .bss would shatter the large page mapping. */ +if (using_2M_mapping () ) +efi_boot_mem_unused (NULL ,NULL ); +/* This needs to remain in sync with xen_in_range(). */ -reserve_e820_ram (&boot_e820,__pa (_stext),__pa (__2M_rwdata_end)); +if (efi_boot_mem_unused (&eb_start, &eb_end) ) + { +reserve_e820_ram (&boot_e820,__pa (_stext),__pa (eb_start)); +reserve_e820_ram (&boot_e820,__pa (eb_end),__pa (__2M_rwdata_end)); + } +else +reserve_e820_ram (&boot_e820,__pa (_stext),__pa (__2M_rwdata_end));/* Late kexec reservation (dynamic start address). */ kexec_reserve_area (&boot_e820);
@@ -1979,7 +1991,7 @@ int __hwdom_init xen_in_range(unsigned lpaddr_t start, end;int i; -enum { region_s3, region_ro, region_rw, nr_regions }; +enum { region_s3, region_ro, region_rw, region_bss, nr_regions };static struct {paddr_t s, e; } xen_regions[nr_regions] __hwdom_initdata;
@@ -2004,6 +2016,14 @@ int __hwdom_init xen_in_range(unsigned l/* hypervisor .data + .bss */ xen_regions[region_rw].s =__pa (&__2M_rwdata_start); xen_regions[region_rw].e =__pa (&__2M_rwdata_end); +if (efi_boot_mem_unused (&start, &end) ) + { +ASSERT (__pa (start) >= xen_regions[region_rw].s); +ASSERT (__pa (end) <= xen_regions[region_rw].e); + xen_regions[region_rw].e =__pa (start); + xen_regions[region_bss].s =__pa (end); + xen_regions[region_bss].e =__pa (&__2M_rwdata_end); + } } start = (paddr_t )mfn <<PAGE_SHIFT ;
xen/arch/x86/tboot.c +12 -0
@@ -1,3 +1,4 @@ +#include <xen/efi.h> #include <xen/init.h> #include <xen/types.h> #include <xen/lib.h>
@@ -364,6 +365,8 @@ void tboot_shutdown(uint32_t shutdown_ty/* if this is S3 then set regions to MAC */ if ( shutdown_type ==TB_SHUTDOWN_S3 ) { +unsigned long s, e; +/* * Xen regions for tboot to MAC. This needs to remain in sync with * xen_in_range().
@@ -378,6 +381,15 @@ void tboot_shutdown(uint32_t shutdown_ty/* hypervisor .data + .bss */ g_tboot_shared->mac_regions[2 ].start = (uint64_t )__pa (&__2M_rwdata_start); g_tboot_shared->mac_regions[2 ].size = __2M_rwdata_end - __2M_rwdata_start; +if (efi_boot_mem_unused (&s, &e) ) + { + g_tboot_shared->mac_regions[2 ].size = + s - (unsigned long )__2M_rwdata_start; + g_tboot_shared->mac_regions[3 ].start =__pa (e); + g_tboot_shared->mac_regions[3 ].size = + (unsigned long )__2M_rwdata_end - e; + g_tboot_shared->num_mac_regions =4 ; + }/* * MAC domains and other Xen memory
xen/common/efi/ebmalloc.c +26 -5
@@ -1,5 +1,6 @@#include "efi.h" #include <xen/init.h> +#include <xen/mm.h> #ifdef CONFIG_ARM /*
@@ -21,7 +22,7 @@ static char __section(".bss.page_aligned") __aligned(PAGE_SIZE) ebmalloc_mem[EBMALLOC_SIZE ]; -static unsigned long __initdata ebmalloc_allocated; +static unsigned long __read_mostly ebmalloc_allocated;/* EFI boot allocator. */ void __init *ebmalloc (size_t size)
@@ -36,17 +37,37 @@ void __init *ebmalloc(size_t size)return ptr; } +bool efi_boot_mem_unused (unsigned long *start,unsigned long *end) +{ +if ( !start && !end ) + { + ebmalloc_allocated =sizeof (ebmalloc_mem); +return false; + } + + *start = (unsigned long )ebmalloc_mem +PAGE_ALIGN (ebmalloc_allocated); + *end = (unsigned long )ebmalloc_mem +sizeof (ebmalloc_mem); + +return *start < *end; +} +void __init free_ebmalloc_unused_mem (void ) { -#if 0 /* FIXME: Putting a hole in the BSS breaks the IOMMU mappings for dom0. */ unsigned long start, end; - start = (unsigned long )ebmalloc_mem +PAGE_ALIGN (ebmalloc_allocated); - end = (unsigned long )ebmalloc_mem +sizeof (ebmalloc_mem); +if ( !efi_boot_mem_unused (&start, &end) ) +return ;destroy_xen_mappings (start, end); + +#ifdef CONFIG_X86 +/* +* By reserving the space early in the E820 map, it gets freed way before +* we make it here. Don't free the range a 2nd time. +*/ +#else init_xenheap_pages (__pa (start),__pa (end)); +#endif printk (XENLOG_INFO "Freed %lukB unused BSS memory\n" , (end - start) >>10 ); -#endif }
xen/include/xen/efi.h +1 -0
@@ -33,6 +33,7 @@ struct compat_pf_efi_runtime_call;bool efi_enabled (unsigned int feature);void efi_init_memory (void ); +bool efi_boot_mem_unused (unsigned long *start,unsigned long *end);bool efi_rs_using_pgtables (void );unsigned long efi_get_time (void );void efi_halt_system (void );
Re: [PATCH v4] EFI: free unused boot mem in at least some cases
Quoted 20 lines · Jan Beulich
Address at least the primary reason why
52bba67f8b87("efi/boot: Don't free ebmalloc area at all") was put in place: Makexen_in_range()aware of the freed range. This is in particular relevant for EFI-enabled builds not actually running on EFI, as the entire range will be unused in this case.Signed-off-by Jan Beulich <[email protected]>---
v4: Address PV shim breakage (stub function also needed adjustment).
v3: Don't free the memory twice.
v2: Also adjust the two places where comments point out that they need
to remain in sync withxen_in_range(). Add assertions toxen_in_range().
---
The remaining issue could be addressed too, by making the area 2M in size and 2M-aligned.
xen/arch/x86/efi/stub.c bool efi_enabled(unsigned int feature) · line 57
Quoted 6 lines
xen/arch/x86/efi/stub.c +3
-0@@ -52,6 +52,13 @@ bool efi_enabled(unsigned int feature)void __init efi_init_memory (void ) { } +bool efi_boot_mem_unused (unsigned long *start,unsigned long *end) +{ +if ( start || end )
Shouldn't this be start && end?
Or else you might be de-referencing a NULL pointer?
Quoted 28 lines
xen/arch/x86/efi/stub.c +4
-0+ *start = *end = (unsigned long )_end; +return false; +} +void efi_update_l4_pgtable (unsigned int l4idx,l4_pgentry_t l4e) { }bool efi_rs_using_pgtables (void )xen/arch/x86/setup.c +3
-1@@ -830,6 +830,7 @@ void __init noreturn __start_xen(unsignemodule_t *mod;unsigned long nr_pages, raw_max_page, modules_headroom, module_map[1 ];int i, j, e820_warn =0 , bytes =0 ; +unsigned long eb_start, eb_end;bool acpi_boot_table_init_done = false, relocated = false;int ret;struct ns16550_defaults ns16550 = {@@ -1145,7 +1146,8 @@ void __init noreturn __start_xen(unsigne/* * This needs to remain in sync with xen_in_range() and the -* respective reserve_e820_ram() invocation below. +* respective reserve_e820_ram() invocation below. No need to +* query efi_boot_mem_unused() here, though. */ mod[mbi->mods_count].mod_start =virt_to_mfn (_stext); mod[mbi->mods_count].mod_end = __2M_rwdata_end - _stext;
xen/arch/x86/setup.c void __init noreturn __start_xen(unsigne · line 1424
Quoted 6 lines
xen/arch/x86/setup.c +3
-0@@ -1417,8 +1419,18 @@ void __init noreturn __start_xen(unsigneif ( !xen_phys_start )panic ("Not enough memory to relocate Xen\n" ); +/* FIXME: Putting a hole in .bss would shatter the large page mapping. */ +if (using_2M_mapping () ) +efi_boot_mem_unused (NULL ,NULL );
This seems really weird IMO...
Quoted 88 lines
xen/arch/x86/setup.c +17
-2+/* This needs to remain in sync with xen_in_range(). */ -reserve_e820_ram (&boot_e820,__pa (_stext),__pa (__2M_rwdata_end)); +if (efi_boot_mem_unused (&eb_start, &eb_end) ) + { +reserve_e820_ram (&boot_e820,__pa (_stext),__pa (eb_start)); +reserve_e820_ram (&boot_e820,__pa (eb_end),__pa (__2M_rwdata_end)); + } +else +reserve_e820_ram (&boot_e820,__pa (_stext),__pa (__2M_rwdata_end));/* Late kexec reservation (dynamic start address). */ kexec_reserve_area (&boot_e820);@@ -1979,7 +1991,7 @@ int __hwdom_init xen_in_range(unsigned lpaddr_t start, end;int i; -enum { region_s3, region_ro, region_rw, nr_regions }; +enum { region_s3, region_ro, region_rw, region_bss, nr_regions };static struct {paddr_t s, e; } xen_regions[nr_regions] __hwdom_initdata;@@ -2004,6 +2016,14 @@ int __hwdom_init xen_in_range(unsigned l/* hypervisor .data + .bss */ xen_regions[region_rw].s =__pa (&__2M_rwdata_start); xen_regions[region_rw].e =__pa (&__2M_rwdata_end); +if (efi_boot_mem_unused (&start, &end) ) + { +ASSERT (__pa (start) >= xen_regions[region_rw].s); +ASSERT (__pa (end) <= xen_regions[region_rw].e); + xen_regions[region_rw].e =__pa (start); + xen_regions[region_bss].s =__pa (end); + xen_regions[region_bss].e =__pa (&__2M_rwdata_end); + } } start = (paddr_t )mfn <<PAGE_SHIFT ;xen/arch/x86/tboot.c +12
-0@@ -1,3 +1,4 @@ +#include <xen/efi.h> #include <xen/init.h> #include <xen/types.h> #include <xen/lib.h> @@ -364,6 +365,8 @@ void tboot_shutdown(uint32_t shutdown_ty/* if this is S3 then set regions to MAC */ if ( shutdown_type ==TB_SHUTDOWN_S3 ) { +unsigned long s, e; +/* * Xen regions for tboot to MAC. This needs to remain in sync with * xen_in_range(). @@ -378,6 +381,15 @@ void tboot_shutdown(uint32_t shutdown_ty/* hypervisor .data + .bss */ g_tboot_shared->mac_regions[2 ].start = (uint64_t )__pa (&__2M_rwdata_start); g_tboot_shared->mac_regions[2 ].size = __2M_rwdata_end - __2M_rwdata_start; +if (efi_boot_mem_unused (&s, &e) ) + { + g_tboot_shared->mac_regions[2 ].size = + s - (unsigned long )__2M_rwdata_start; + g_tboot_shared->mac_regions[3 ].start =__pa (e); + g_tboot_shared->mac_regions[3 ].size = + (unsigned long )__2M_rwdata_end - e; + g_tboot_shared->num_mac_regions =4 ; + }/* * MAC domains and other Xen memory xen/common/efi/ebmalloc.c +2
-1@@ -1,5 +1,6 @@#include "efi.h" #include <xen/init.h> +#include <xen/mm.h> #ifdef CONFIG_ARM /* @@ -21,7 +22,7 @@ static char __section(".bss.page_aligned") __aligned(PAGE_SIZE) ebmalloc_mem[EBMALLOC_SIZE ]; -static unsigned long __initdata ebmalloc_allocated; +static unsigned long __read_mostly ebmalloc_allocated;/* EFI boot allocator. */ void __init *ebmalloc (size_t size)
xen/common/efi/ebmalloc.c void __init *ebmalloc(size_t size) · line 46
Quoted 10 lines
xen/common/efi/ebmalloc.c +7
-0@@ -36,17 +37,37 @@ void __init *ebmalloc(size_t size)return ptr; } +bool efi_boot_mem_unused (unsigned long *start,unsigned long *end) +{ +if ( !start && !end ) + { + ebmalloc_allocated =sizeof (ebmalloc_mem); +return false; + }
... I would instead place the using_2M_mapping check here and return start = end in that case.
Thanks, Roger.
Re: [PATCH v4] EFI: free unused boot mem in at least some cases
Quoted 5 lines · Roger Pau Monné
Quoted 4 lines · Jan Beulich
xen/arch/x86/efi/stub.c +0
-0@@ -52,6 +52,13 @@ bool efi_enabled(unsigned int feature)
Quoted 7 lines
xen/arch/x86/efi/stub.c bool efi_enabled(unsigned int feature) · line 57
Quoted 5 lines
xen/arch/x86/efi/stub.c +3
-0void __init efi_init_memory (void ) { } +bool efi_boot_mem_unused (unsigned long *start,unsigned long *end) +{ +if ( start || end )Shouldn't this be start && end?
This is consistent with "if ( !start && !end )" in the non-stub function, which was there in v3 already.
Quoted 1 line
Or else you might be de-referencing a NULL pointer?
Intentionally so: I'd view it as worse if we didn't fill *start or *end if just one gets passed as NULL. The way it's done now it'll be a reliable crash, as the v3 issue with the shim has shown (where the if() here was missing).
Quoted 9 lines
xen/arch/x86/efi/stub.c void __init noreturn __start_xen(unsigne · line 1424
Quoted 7 lines
xen/arch/x86/efi/stub.c +3
-0@@ -1417,8 +1419,18 @@ void __init noreturn __start_xen(unsigneif ( !xen_phys_start )panic ("Not enough memory to relocate Xen\n" ); +/* FIXME: Putting a hole in .bss would shatter the large page mapping. */ +if (using_2M_mapping () ) +efi_boot_mem_unused (NULL ,NULL );This seems really weird IMO...
What I didn't like about earlier versions was the exposure of using_2M_mapping() outside of this CU. The way it works is somewhat fragile, and hence I think limiting its exposure is a win. This way there's also no x86-specific code in ebmalloc.c anymore.
I'm also slightly puzzled that you ask now when you had acked this same construct in v3. It's really just the stub function which has changed in v4.
Quoted 4 lines
Quoted 4 lines
xen/arch/x86/efi/stub.c +0
-0@@ -36,17 +37,37 @@ void __init *ebmalloc(size_t size)return ptr; }
Quoted 9 lines
xen/arch/x86/efi/stub.c void __init *ebmalloc(size_t size) · line 46
Quoted 7 lines
xen/arch/x86/efi/stub.c +7
-0+bool efi_boot_mem_unused (unsigned long *start,unsigned long *end) +{ +if ( !start && !end ) + { + ebmalloc_allocated =sizeof (ebmalloc_mem); +return false; + }... I would instead place the
using_2M_mappingcheck here
As per above, this would mean x86-specific code here again.
Quoted 1 line
and return start = end in that case.
I don't think I understand this part, possibly starting with me wondering whether you mean *start == *end (and implying they'd be set to valid values first).
Jan
Roger Pau Monné
Acked-byRe: [PATCH v4] EFI: free unused boot mem in at least some cases
Quoted 8 lines · Jan Beulich
Quoted 7 lines · Roger Pau Monné
Quoted 6 lines · Jan Beulich
xen/arch/x86/efi/stub.c +0
-0@@ -52,6 +52,13 @@ bool efi_enabled(unsigned int feature)void __init efi_init_memory (void ) { }
Quoted 8 lines
Quoted 5 lines
xen/arch/x86/efi/stub.c bool efi_enabled(unsigned int feature) · line 57
Quoted 3 lines
xen/arch/x86/efi/stub.c +3
-0+bool efi_boot_mem_unused (unsigned long *start,unsigned long *end) +{ +if ( start || end )Shouldn't this be start && end?
This is consistent with "if ( !start && !end )" in the non-stub function, which was there in v3 already.
Right, I certainly didn't catch that passing one as NULL would cause a deref there also.
I would be more comfortable with adding an ASSERT, but I'm not going to insist. IIRC there was a time when Xen running as a PVH guest (like in shim mode) would cause it to have a valid mapping at 0.
Quoted 23 lines
Quoted 1 line
Or else you might be de-referencing a NULL pointer?
Intentionally so: I'd view it as worse if we didn't fill *start or *end if just one gets passed as NULL. The way it's done now it'll be a reliable crash, as the v3 issue with the shim has shown (where the
if()here was missing).Quoted 9 lines
xen/arch/x86/efi/stub.c void __init noreturn __start_xen(unsigne · line 1424
Quoted 7 lines
xen/arch/x86/efi/stub.c +3
-0@@ -1417,8 +1419,18 @@ void __init noreturn __start_xen(unsigneif ( !xen_phys_start )panic ("Not enough memory to relocate Xen\n" ); +/* FIXME: Putting a hole in .bss would shatter the large page mapping. */ +if (using_2M_mapping () ) +efi_boot_mem_unused (NULL ,NULL );This seems really weird IMO...
What I didn't like about earlier versions was the exposure of
using_2M_mapping()outside of this CU. The way it works is somewhat fragile, and hence I think limiting its exposure is a win. This way there's also no x86-specific code inebmalloc.canymore.
Quoted 3 lines
I'm also slightly puzzled that you ask now when you had acked this same construct in v3. It's really just the stub function which has changed in v4.
Would you mind also adding a FIXME comment in efi_boot_mem_unused that setting ebmalloc_allocated to sizeof(ebmalloc_mem) will be removed once we can properly free the region regardless of whether 2M are being used?
Seems like an abuse of that the function should be doing by passing NULL pointers to it, or maybe I'm just being dense.
With that:
Thanks.
Re: [PATCH v4] EFI: free unused boot mem in at least some cases
Quoted 18 lines · Roger Pau Monné
Quoted 8 lines · Jan Beulich
Quoted 7 lines · Roger Pau Monné
Quoted 6 lines · Jan Beulich
xen/arch/x86/efi/stub.c +0
-0@@ -52,6 +52,13 @@ bool efi_enabled(unsigned int feature)void __init efi_init_memory (void ) { }Quoted 8 lines
Quoted 5 lines
xen/arch/x86/efi/stub.c bool efi_enabled(unsigned int feature) · line 57
Quoted 3 lines
xen/arch/x86/efi/stub.c +3
-0+bool efi_boot_mem_unused (unsigned long *start,unsigned long *end) +{ +if ( start || end )Shouldn't this be start && end?
This is consistent with "if ( !start && !end )" in the non-stub function, which was there in v3 already.
Quoted 6 lines
Right, I certainly didn't catch that passing one as NULL would cause a deref there also.
I would be more comfortable with adding an ASSERT, but I'm not going to insist. IIRC there was a time when Xen running as a PVH guest (like in shim mode) would cause it to have a valid mapping at 0.
Well, apparently not anymore, or else v3 wouldn't have needed prompt reverting. With ...
Quoted 16 lines
Quoted 16 lines
Quoted 9 lines
xen/arch/x86/efi/stub.c void __init noreturn __start_xen(unsigne · line 1424
Quoted 7 lines
xen/arch/x86/efi/stub.c +3
-0@@ -1417,8 +1419,18 @@ void __init noreturn __start_xen(unsigneif ( !xen_phys_start )panic ("Not enough memory to relocate Xen\n" ); +/* FIXME: Putting a hole in .bss would shatter the large page mapping. */ +if (using_2M_mapping () ) +efi_boot_mem_unused (NULL ,NULL );This seems really weird IMO...
What I didn't like about earlier versions was the exposure of
using_2M_mapping()outside of this CU. The way it works is somewhat fragile, and hence I think limiting its exposure is a win. This way there's also no x86-specific code inebmalloc.canymore.
Quoted 8 lines
Quoted 3 lines
I'm also slightly puzzled that you ask now when you had acked this same construct in v3. It's really just the stub function which has changed in v4.
Would you mind also adding a FIXME comment in
efi_boot_mem_unusedthat settingebmalloc_allocatedtosizeof(ebmalloc_mem)will be removed once we can properly free the region regardless of whether 2M are being used?
... the two FIXMEs added, it is sufficiently clear that the goal is for this to be transient only anyway. As said - I have a plan, I just need to find the time to see if it works out.
Quoted 2 lines
Seems like an abuse of that the function should be doing by passing NULL pointers to it, or maybe I'm just being dense.
In a way it is an abuse, I agree, with - as said - the goal of avoiding to expose using_2M_mapping().
Quoted 3 lines
With that:
Acked-by Roger Pau Monné <[email protected]>
Thanks much.
Jan