OrgACRN
/
acrn-hypervisor
mirror of https://github.com/projectacrn/acrn-hypervisor.git
1
0
Fork 0
Code Issues Releases Wiki Activity

EFI: Allocate 2M aligned memory for hypervisor image 

Hypervisor does memory alignment during initializing paging(init_paging)
although the starting address allocated by EFI stub doesn't meet the
requirement. As a result, HV might overwrite some memory belong to UEFI
BIOS. The patch introduces a new routine to fix the issue.

Tracked-On: #2349
Signed-off-by: Chaohong guo <chaohong.guo@intel.com>
Reviewed-by: Zheng, Gen <gen.zheng@intel.com>
Reviewed-by: Zide Chen <zide.chen@intel.com>
This commit is contained in:
Chaohong guo 2019-01-16 13:53:26 +08:00 committed by Eddie Dong
parent 912be6c4dd
commit ad0f8bc3b1
3 changed files with 73 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
efi-stub/boot.c
View File

@ -363,7 +363,7 @@ efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *_table)
* instead.
*/
#ifdef CONFIG_RELOC
err = emalloc_reserved_mem(&hv_hpa, HV_RUNTIME_MEM_SIZE, MEM_ADDR_4GB);
err = emalloc_reserved_aligned(&hv_hpa, HV_RUNTIME_MEM_SIZE, 1 << 21, MEM_ADDR_4GB);
#else
err = emalloc_fixed_addr(&hv_hpa, HV_RUNTIME_MEM_SIZE, CONFIG_HV_RAM_START);
#endif

3
efi-stub/efilinux.h
View File

@ -52,6 +52,9 @@
extern EFI_SYSTEM_TABLE *sys_table;
extern EFI_BOOT_SERVICES *boot;
extern EFI_STATUS
emalloc_reserved_aligned(EFI_PHYSICAL_ADDRESS *addr, UINTN size, UINTN align, EFI_PHYSICAL_ADDRESS maxaddr);
/**
* allocate_pages - Allocate memory pages from the system
* @atype: type of allocation to perform

69
efi-stub/malloc.c
View File

@ -94,6 +94,75 @@ failed:
}
EFI_STATUS
emalloc_reserved_aligned(EFI_PHYSICAL_ADDRESS *addr, UINTN size, UINTN align,
EFI_PHYSICAL_ADDRESS maxaddr)
{
UINTN msize, mkey, desc_sz, desc_addr, pages;
UINT32 desc_version;
EFI_MEMORY_DESCRIPTOR *mbuf;
EFI_STATUS err;
pages = EFI_SIZE_TO_PAGES(size);
err = memory_map(&mbuf, &msize, &mkey, &desc_sz, &desc_version);
if (err != EFI_SUCCESS) {
goto fail;
}
/* In most time, Memory map reported by BIOS is an ordering list from low to hight.
* Scan it from high to low, so that allocate memory as high as possible
*/
for (desc_addr = (UINTN)mbuf + msize - desc_sz; desc_addr >= (UINTN)mbuf; desc_addr -= desc_sz) {
EFI_MEMORY_DESCRIPTOR *desc;
EFI_PHYSICAL_ADDRESS start, end;
desc = (EFI_MEMORY_DESCRIPTOR*)desc_addr;
if (desc->Type != EfiConventionalMemory)
continue;
start = desc->PhysicalStart;
end = start + (desc->NumberOfPages << EFI_PAGE_SHIFT);
/* 1MB low memory is allocated only if required/requested */
if ((end <= MEM_ADDR_1MB) && (maxaddr > MEM_ADDR_1MB))
continue;
/* starting allocation from 1M above unless requested */
if ((start < MEM_ADDR_1MB) && (maxaddr > MEM_ADDR_1MB)) {
start = MEM_ADDR_1MB;
}
/* zero page won't be allocated */
if (start < 4096) {
start = 4096;
}
start = (start + align - 1) & ~(align - 1);
/* Since this routine is called during booting, memory block is large
* enought, the reduction of memory size for memory alignment won't
* impact allocation. It is true in most cases. if it is not true, loop
* again
*/
if ((start + size <= end) && (start + size <= maxaddr)) {
err = allocate_pages(AllocateAddress, EfiReservedMemoryType, pages, &start);
if (err == EFI_SUCCESS) {
*addr = start;
break;
}
}
}
if (desc_addr < (UINTN)mbuf) {
err = EFI_OUT_OF_RESOURCES;
}
free_pool(mbuf);
fail:
return err;
}
EFI_STATUS dump_e820(void)
{
UINTN map_size, map_key, desc_size;