x86/dom0: improve PVH initrd and metadata placement
PATCH v3 1/1 x86/dom0: improve PVH initrd and metadata placement
Don't assume there's going to be enough space at the tail of the loaded kernel and instead try to find a suitable memory area where the initrd and metadata can be loaded.
---
Changes since v2:
- Simplify checks since the kernel used memory must always be a subset of a RAM region.
- Fix comment grammar.
- Align the loaded kernel area to page boundaries.
- For safety assert that all RAM regions in the memory map are page aligned.
Changes since v1:
- Calculate end of e820 entry earlier.
- Only check if the end of the region is < 1MB.
- Check for range overlaps with the kernel region.
- Check the region is of type RAM.
- Fix off-by-one checks in range overlaps.
- Add a comment about why initrd and metadata is placed together.
- Add parentheses around size calculations.
--- xen/arch/x86/hvm/dom0_build.c | 58 ++++++++++++++++++++++++++++++++++- 1 file changed, 57 insertions(+), 1 deletion(-)
xen/arch/x86/hvm/dom0_build.c +57 -1
@@ -490,6 +490,45 @@ static int __init pvh_populate_p2m(struct domain *d)#undef MB1_PAGES } +static paddr_t find_memory (const struct domain *d,const struct elf_binary *elf, +size_t size) +{ +paddr_t kernel_start = (paddr_t )elf->dest_base &PAGE_MASK ; +paddr_t kernel_end =ROUNDUP ((paddr_t )elf->dest_base + elf->dest_size, +PAGE_SIZE ); +unsigned int i; + +/* +* The memory map is sorted and all RAM regions starts and sizes are +* aligned to page boundaries. +*/ +for ( i =0 ; i < d->arch.nr_e820; i++ ) + { +paddr_t start, end = d->arch.e820[i].addr + d->arch.e820[i].size; + +/* Don't use memory below 1MB, as it could overwrite the BDA/EBDA. */ +if ( end <=MB (1 ) || d->arch.e820[i].type !=E820_RAM ) +continue ; + + start =MAX (ROUNDUP (d->arch.e820[i].addr,PAGE_SIZE ),MB (1 )); + +ASSERT (IS_ALIGNED (start,PAGE_SIZE ) &&IS_ALIGNED (end,PAGE_SIZE )); + +if ( end <= kernel_start || start >= kernel_end ) + ;/* No overlap, nothing to do. */ +/* Deal with the kernel already being loaded in the region. */ +else if ( kernel_start - start > end - kernel_end ) + end = kernel_start; +else + start = kernel_end; + +if ( end - start >= size ) +return start; + } + +return INVALID_PADDR ; +} + static int __init pvh_load_kernel(struct domain *d, const module_t *image, unsigned long image_headroom, module_t *initrd, void *image_base,
@@ -546,7 +585,24 @@ static int __init pvh_load_kernel(struct domain *d, const module_t *image,return rc; } - last_addr =ROUNDUP (parms.virt_kend - parms.virt_base,PAGE_SIZE ); +/* +* Find a RAM region big enough (and that doesn't overlap with the loaded +* kernel) in order to load the initrd and the metadata. Note it could be +* split into smaller allocations, done as a single region in order to +* simplify it. +*/ + last_addr =find_memory (d, &elf,sizeof (start_info) + + (initrd ?ROUNDUP (initrd->mod_end,PAGE_SIZE ) + +sizeof (mod) + :0 ) + + (cmdline ?ROUNDUP (strlen (cmdline) +1 , +elf_64bit (&elf) ?8 :4 ) + :0 )); +if ( last_addr ==INVALID_PADDR ) + { +printk ("Unable to find a memory region to load initrd and metadata\n" ); +return -ENOMEM ; + }if ( initrd !=NULL ) {
Signature · 7 lines
2.25.0 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 6 lines · Roger Pau Monne
Don't assume there's going to be enough space at the tail of the loaded kernel and instead try to find a suitable memory area where the initrd and metadata can be loaded.
Reported-by Andrew Cooper <[email protected]>Signed-off-by Roger Pau Monné <[email protected]>
preferably with, as Andrew suggested, ...
Quoted 13 lines
xen/arch/x86/hvm/dom0_build.c +7
-0@@ -490,6 +490,45 @@ static int __init pvh_populate_p2m(struct domain *d)#undef MB1_PAGES } +static paddr_t find_memory (const struct domain *d,const struct elf_binary *elf, +size_t size) +{ +paddr_t kernel_start = (paddr_t )elf->dest_base &PAGE_MASK ; +paddr_t kernel_end =ROUNDUP ((paddr_t )elf->dest_base + elf->dest_size, +PAGE_SIZE ); +unsigned int i;
xen/arch/x86/hvm/dom0_build.c static int __init pvh_populate_p2m(struct domain *d) · line 509
Quoted 10 lines
xen/arch/x86/hvm/dom0_build.c +10
-0+ +/* +* The memory map is sorted and all RAM regions starts and sizes are +* aligned to page boundaries. +*/ +for ( i =0 ; i < d->arch.nr_e820; i++ ) + { +paddr_t start, end = d->arch.e820[i].addr + d->arch.e820[i].size; + +/* Don't use memory below 1MB, as it could overwrite the BDA/EBDA. */
... IBFT added here (I'm not worried so much about whether BDA remains here or gets dropped). This could of course be done while committing.
Jan
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 29 lines · Jan Beulich
Quoted 6 lines · Roger Pau Monne
Don't assume there's going to be enough space at the tail of the loaded kernel and instead try to find a suitable memory area where the initrd and metadata can be loaded.
Reported-by Andrew Cooper <[email protected]>Signed-off-by Roger Pau Monné <[email protected]>Reviewed-by Jan Beulich <[email protected]>preferably with, as Andrew suggested, ...
Quoted 18 lines
xen/arch/x86/hvm/dom0_build.c +12
-0@@ -490,6 +490,45 @@ static int __init pvh_populate_p2m(struct domain *d)#undef MB1_PAGES } +static paddr_t find_memory (const struct domain *d,const struct elf_binary *elf, +size_t size) +{ +paddr_t kernel_start = (paddr_t )elf->dest_base &PAGE_MASK ; +paddr_t kernel_end =ROUNDUP ((paddr_t )elf->dest_base + elf->dest_size, +PAGE_SIZE ); +unsigned int i; + +/* +* The memory map is sorted and all RAM regions starts and sizes are +* aligned to page boundaries. +*/
Quoted 8 lines
xen/arch/x86/hvm/dom0_build.c static int __init pvh_populate_p2m(struct domain *d) · line 509
Quoted 5 lines
xen/arch/x86/hvm/dom0_build.c +5
-0+for ( i =0 ; i < d->arch.nr_e820; i++ ) + { +paddr_t start, end = d->arch.e820[i].addr + d->arch.e820[i].size; + +/* Don't use memory below 1MB, as it could overwrite the BDA/EBDA. */ ... IBFT added here (I'm not worried so much about whether BDA remains here or gets dropped). This could of course be done while committing.
Sure, thanks.
Roger.
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel