| Message ID | 1475103092-27893-7-git-send-email-daniel.kiper@oracle.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
>>> On 29.09.16 at 00:51, <daniel.kiper@oracle.com> wrote: > v8 - suggestions/fixes: > - disable whole ebmalloc machinery on ARM platforms, This is certainly not in line with my understanding of the outcome of that discussion. > --- a/xen/arch/x86/efi/stub.c > +++ b/xen/arch/x86/efi/stub.c > @@ -9,6 +9,8 @@ bool efi_enabled(unsigned int feature) > return false; > } > > +void __init free_ebmalloc_unused_mem(void) { } > + > void __init efi_init_memory(void) { } Looking at this I wonder - can't the freeing be put into efi_init_memory()? > --- a/xen/common/efi/boot.c > +++ b/xen/common/efi/boot.c > @@ -98,6 +98,56 @@ static CHAR16 __initdata newline[] = L"\r\n"; > #define PrintStr(s) StdOut->OutputString(StdOut, s) > #define PrintErr(s) StdErr->OutputString(StdErr, s) > > +#ifndef CONFIG_ARM > + > +/* > + * TODO: Enable EFI boot allocator on ARM. > + * This code can be common for x86 and ARM. > + * Things TODO on ARM before enabling ebmalloc: > + * - estimate required EBMALLOC_SIZE value, > + * - where (in which section) ebmalloc_mem[] > + * should live; if in .bss.page_aligned > + * then whole BSS zeroing have to be > + * disabled in xen/arch/arm/arm64/head.S; > + * though BSS should be initialized somehow > + * before use of variables living there, > + * - add free_ebmalloc_unused_mem() call to > + * e.g. xen/arch/arm/setup.c:init_done(). > + */ Please make better use of line length in such longer comments - the longest line here ends at column 48 or so. Jan
On Thu, Sep 29, 2016 at 01:40:44AM -0600, Jan Beulich wrote: > >>> On 29.09.16 at 00:51, <daniel.kiper@oracle.com> wrote: > > v8 - suggestions/fixes: > > - disable whole ebmalloc machinery on ARM platforms, > > This is certainly not in line with my understanding of the outcome of > that discussion. Well, I understand that you would like to reduce number of changes needed to enable ebmalloc ARM in the future. However, on the other hand Julien wish to not have any calls to ebmalloc on ARM now. So, if the ebmalloc code and data is not referenced anywhere on ARM then I do not think that it make sens to build it into ARM xen image. Especially if I am not sure that 1 MiB ebmalloc region is correct or not on ARM. So, I would like to wait for Julien final opinion about that. If he likes your proposal (maybe with some adjustments) then I am not going to object. > > --- a/xen/arch/x86/efi/stub.c > > +++ b/xen/arch/x86/efi/stub.c > > @@ -9,6 +9,8 @@ bool efi_enabled(unsigned int feature) > > return false; > > } > > > > +void __init free_ebmalloc_unused_mem(void) { } > > + > > void __init efi_init_memory(void) { } > > Looking at this I wonder - can't the freeing be put into > efi_init_memory()? I am not sure that all mem infrastructure needed to free ebmalloc unused region exists then. Anyway, I will try it. However, I think that init_done() is more natural place to do that because later we free .init* sections there. > > --- a/xen/common/efi/boot.c > > +++ b/xen/common/efi/boot.c > > @@ -98,6 +98,56 @@ static CHAR16 __initdata newline[] = L"\r\n"; > > #define PrintStr(s) StdOut->OutputString(StdOut, s) > > #define PrintErr(s) StdErr->OutputString(StdErr, s) > > > > +#ifndef CONFIG_ARM > > + > > +/* > > + * TODO: Enable EFI boot allocator on ARM. > > + * This code can be common for x86 and ARM. > > + * Things TODO on ARM before enabling ebmalloc: > > + * - estimate required EBMALLOC_SIZE value, > > + * - where (in which section) ebmalloc_mem[] > > + * should live; if in .bss.page_aligned > > + * then whole BSS zeroing have to be > > + * disabled in xen/arch/arm/arm64/head.S; > > + * though BSS should be initialized somehow > > + * before use of variables living there, > > + * - add free_ebmalloc_unused_mem() call to > > + * e.g. xen/arch/arm/setup.c:init_done(). > > + */ > > Please make better use of line length in such longer comments - > the longest line here ends at column 48 or so. OK. Daniel
On Thu, Sep 29, 2016 at 10:08:30AM +0200, Daniel Kiper wrote: > On Thu, Sep 29, 2016 at 01:40:44AM -0600, Jan Beulich wrote: > > >>> On 29.09.16 at 00:51, <daniel.kiper@oracle.com> wrote: > > > v8 - suggestions/fixes: > > > - disable whole ebmalloc machinery on ARM platforms, > > > > This is certainly not in line with my understanding of the outcome of > > that discussion. > > Well, I understand that you would like to reduce number of changes > needed to enable ebmalloc ARM in the future. However, on the other > hand Julien wish to not have any calls to ebmalloc on ARM now. So, > if the ebmalloc code and data is not referenced anywhere on ARM then > I do not think that it make sens to build it into ARM xen image. > Especially if I am not sure that 1 MiB ebmalloc region is correct > or not on ARM. So, I would like to wait for Julien final opinion > about that. If he likes your proposal (maybe with some adjustments) > then I am not going to object. Julien, ping? Sorry for fire drill but tomorrow is last day before hard code freeze. Please tell us what do you think about this patch. Then I will prepare v9 and post it today evening or tomorrow morning. Daniel
diff --git a/xen/arch/x86/efi/efi-boot.h b/xen/arch/x86/efi/efi-boot.h index 388c4ea..62c010e 100644 --- a/xen/arch/x86/efi/efi-boot.h +++ b/xen/arch/x86/efi/efi-boot.h @@ -114,7 +114,7 @@ static void __init relocate_trampoline(unsigned long phys) static void __init place_string(u32 *addr, const char *s) { - static char *__initdata alloc = start; + char *alloc = NULL; if ( s && *s ) { @@ -122,7 +122,7 @@ static void __init place_string(u32 *addr, const char *s) const char *old = (char *)(long)*addr; size_t len2 = *addr ? strlen(old) + 1 : 0; - alloc -= len1 + len2; + alloc = ebmalloc(len1 + len2); /* * Insert new string before already existing one. This is needed * for options passed on the command line to override options from @@ -205,12 +205,7 @@ static void __init efi_arch_process_memory_map(EFI_SYSTEM_TABLE *SystemTable, static void *__init efi_arch_allocate_mmap_buffer(UINTN map_size) { - place_string(&mbi.mem_upper, NULL); - mbi.mem_upper -= map_size; - mbi.mem_upper &= -__alignof__(EFI_MEMORY_DESCRIPTOR); - if ( mbi.mem_upper < xen_phys_start ) - return NULL; - return (void *)(long)mbi.mem_upper; + return ebmalloc(map_size); } static void __init efi_arch_pre_exit_boot(void) diff --git a/xen/arch/x86/efi/stub.c b/xen/arch/x86/efi/stub.c index 4158124..bc9919c 100644 --- a/xen/arch/x86/efi/stub.c +++ b/xen/arch/x86/efi/stub.c @@ -9,6 +9,8 @@ bool efi_enabled(unsigned int feature) return false; } +void __init free_ebmalloc_unused_mem(void) { } + void __init efi_init_memory(void) { } void efi_update_l4_pgtable(unsigned int l4idx, l4_pgentry_t l4e) { } diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 06f3970..5b17783 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -520,6 +520,8 @@ static void noinline init_done(void) system_state = SYS_STATE_active; + free_ebmalloc_unused_mem(); + /* MUST be done prior to removing .init data. */ unregister_init_virtual_region(); @@ -1080,8 +1082,7 @@ void __init noreturn __start_xen(unsigned long mbi_p) if ( !xen_phys_start ) panic("Not enough memory to relocate Xen."); - reserve_e820_ram(&boot_e820, efi_enabled(EFI_LOADER) ? mbi->mem_upper : __pa(&_start), - __pa(&_end)); + reserve_e820_ram(&boot_e820, __pa(&_start), __pa(&_end)); /* Late kexec reservation (dynamic start address). */ kexec_reserve_area(&boot_e820); diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 1ef5d0b..fc76695 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -98,6 +98,56 @@ static CHAR16 __initdata newline[] = L"\r\n"; #define PrintStr(s) StdOut->OutputString(StdOut, s) #define PrintErr(s) StdErr->OutputString(StdErr, s) +#ifndef CONFIG_ARM + +/* + * TODO: Enable EFI boot allocator on ARM. + * This code can be common for x86 and ARM. + * Things TODO on ARM before enabling ebmalloc: + * - estimate required EBMALLOC_SIZE value, + * - where (in which section) ebmalloc_mem[] + * should live; if in .bss.page_aligned + * then whole BSS zeroing have to be + * disabled in xen/arch/arm/arm64/head.S; + * though BSS should be initialized somehow + * before use of variables living there, + * - add free_ebmalloc_unused_mem() call to + * e.g. xen/arch/arm/setup.c:init_done(). + */ + +#define EBMALLOC_SIZE MB(1) + +static char __section(".bss.page_aligned") __aligned(PAGE_SIZE) + ebmalloc_mem[EBMALLOC_SIZE]; +static unsigned long __initdata ebmalloc_allocated; + +/* EFI boot allocator. */ +static void __init *ebmalloc(size_t size) +{ + void *ptr = ebmalloc_mem + ebmalloc_allocated; + + ebmalloc_allocated += (size + sizeof(void *) - 1) & ~(sizeof(void *) - 1); + + if ( ebmalloc_allocated > sizeof(ebmalloc_mem) ) + blexit(L"Out of static memory\r\n"); + + return ptr; +} + +void __init free_ebmalloc_unused_mem(void) +{ + unsigned long start, end; + + start = (unsigned long)ebmalloc_mem + PAGE_ALIGN(ebmalloc_allocated); + end = (unsigned long)ebmalloc_mem + sizeof(ebmalloc_mem); + + 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 + /* * Include architecture specific implementation here, which references the * static globals defined above. diff --git a/xen/include/xen/efi.h b/xen/include/xen/efi.h index 68c68a8..6c7f601 100644 --- a/xen/include/xen/efi.h +++ b/xen/include/xen/efi.h @@ -32,6 +32,7 @@ struct xenpf_efi_runtime_call; struct compat_pf_efi_runtime_call; bool efi_enabled(unsigned int feature); +void free_ebmalloc_unused_mem(void); void efi_init_memory(void); bool_t efi_rs_using_pgtables(void); unsigned long efi_get_time(void);
There is a problem with place_string() which is used as early memory allocator. It gets memory chunks starting from start symbol and goes down. Sadly this does not work when Xen is loaded using multiboot2 protocol because then the start lives on 1 MiB address and we should not allocate a memory from below of it. So, I tried to use mem_lower address calculated by GRUB2. However, this solution works only on some machines. There are machines in the wild (e.g. Dell PowerEdge R820) which uses first ~640 KiB for boot services code or data... :-((( Hence, we need new memory allocator for Xen EFI boot code which is quite simple and generic and could be used by place_string() and efi_arch_allocate_mmap_buffer(). I think about following solutions: 1) We could use native EFI allocation functions (e.g. AllocatePool() or AllocatePages()) to get memory chunk. However, later (somewhere in __start_xen()) we must copy its contents to safe place or reserve it in e820 memory map and map it in Xen virtual address space. This means that the code referring to Xen command line, loaded modules and EFI memory map, mostly in __start_xen(), will be further complicated and diverge from legacy BIOS cases. Additionally, both former things have to be placed below 4 GiB because their addresses are stored in multiboot_info_t structure which has 32-bit relevant members. 2) We may allocate memory area statically somewhere in Xen code which could be used as memory pool for early dynamic allocations. Looks quite simple. Additionally, it would not depend on EFI at all and could be used on legacy BIOS platforms if we need it. However, we must carefully choose size of this pool. We do not want increase Xen binary size too much and waste too much memory but also we must fit at least memory map on x86 EFI platforms. As I saw on small machine, e.g. IBM System x3550 M2 with 8 GiB RAM, memory map may contain more than 200 entries. Every entry on x86-64 platform is 40 bytes in size. So, it means that we need more than 8 KiB for EFI memory map only. Additionally, if we use this memory pool for Xen and modules command line storage (it would be used when xen.efi is executed as EFI application) then we should add, I think, about 1 KiB. In this case, to be on safe side, we should assume at least 64 KiB pool for early memory allocations. Which is about 4 times of our earlier calculations. However, during discussion on Xen-devel Jan Beulich suggested that just in case we should use 1 MiB memory pool like it is in original place_string() implementation. So, let's use 1 MiB as it was proposed. If we think that we should not waste unallocated memory in the pool on running system then we can mark this region as __initdata and move all required data to dynamically allocated places somewhere in __start_xen(). 2a) We could put memory pool into .bss.page_aligned section. Then allocate memory chunks starting from the lowest address. After init phase we can free unused portion of the memory pool as in case of .init.text or .init.data sections. This way we do not need to allocate any space in image file and freeing of unused area in the memory pool is very simple. Now #2a solution is implemented because it is quite simple and requires limited number of changes, especially in __start_xen(). New allocator is quite generic and can be used on ARM platforms too. Though it is not enabled on ARM yet due to lack of some prereq. List of them is placed before ebmalloc code. Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com> --- v8 - suggestions/fixes: - disable whole ebmalloc machinery on ARM platforms, - add comment saying what should be done before enabling ebmalloc on ARM, (suggested by Julien Grall), - move ebmalloc code before efi-boot.h inclusion and remove unneeded forward declaration (suggested by Jan Beulich), - remove free_ebmalloc_unused_mem() call from xen/arch/arm/setup.c:init_done() (suggested by Julien Grall), - improve commit message. v7 - suggestions/fixes: - enable most of ebmalloc machinery on ARM platforms (suggested by Jan Beulich), - remove unneeded cast (suggested by Jan Beulich), - wrap long line (suggested by Jan Beulich), - improve commit message. v6 - suggestions/fixes: - optimize ebmalloc allocator, - move ebmalloc machinery to xen/common/efi/boot.c (suggested by Jan Beulich), - enforce PAGE_SIZE ebmalloc_mem alignment (suggested by Jan Beulich), - ebmalloc() must allocate properly aligned memory regions (suggested by Jan Beulich), - printk() should use XENLOG_INFO (suggested by Jan Beulich). v4 - suggestions/fixes: - move from #2 solution to #2a solution, - improve commit message. --- xen/arch/x86/efi/efi-boot.h | 11 +++------- xen/arch/x86/efi/stub.c | 2 ++ xen/arch/x86/setup.c | 5 +++-- xen/common/efi/boot.c | 50 +++++++++++++++++++++++++++++++++++++++++++ xen/include/xen/efi.h | 1 + 5 files changed, 59 insertions(+), 10 deletions(-)