github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-23 22:18:17 +00:00
Code Issues Projects Releases Wiki Activity

hv: separate host e820 and SOS ve820

Browse Source 
There are 2 reasons why SOS ve820 has to be separated from host e820:
- in hybrid mode, SOS may not own all the host memory.
- when SOS is being re-launched, it needs an untainted version of host
  e820 to create SOS ve820.

This patch creates sos_e820 table for SOS and keeps host e820 intact
during SOS creation.

Tracked-On: #2700
Signed-off-by: Zide Chen <zide.chen@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Zide Chen 2019-04-12 23:09:12 -07:00 committed by wenlingz
parent 51068eccd0
commit 1b7d33a426
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hypervisor/arch/x86/guest/vm.c
View File

@ -34,6 +34,8 @@ static struct acrn_vm vm_array[CONFIG_MAX_VM_NUM] __aligned(PAGE_SIZE);
static struct acrn_vm *sos_vm_ptr = NULL; static struct acrn_vm *sos_vm_ptr = NULL;
static struct e820_entry sos_ve820[E820_MAX_ENTRIES];
uint16_t get_vmid_by_uuid(const uint8_t *uuid) uint16_t get_vmid_by_uuid(const uint8_t *uuid)
{ {
uint16_t vm_id = 0U; uint16_t vm_id = 0U;
@ -190,7 +192,7 @@ static void prepare_prelaunched_vm_memmap(struct acrn_vm *vm, const struct acrn_
/** /**
* before boot sos_vm(service OS), call it to hide the HV RAM entry in e820 table from sos_vm * before boot sos_vm(service OS), call it to hide the HV RAM entry in e820 table from sos_vm
* *
* @pre vm != NULL && entry != NULL && p_e820_mem != NULL * @pre vm != NULL && entry != NULL
*/ */
static void create_sos_vm_e820(struct acrn_vm *vm) static void create_sos_vm_e820(struct acrn_vm *vm)
{ {
@ -201,14 +203,17 @@ static void create_sos_vm_e820(struct acrn_vm *vm)
uint64_t hv_end_pa = hv_start_pa + CONFIG_HV_RAM_SIZE; uint64_t hv_end_pa = hv_start_pa + CONFIG_HV_RAM_SIZE;
uint32_t entries_count = get_e820_entries_count(); uint32_t entries_count = get_e820_entries_count();
struct e820_entry *entry, new_entry = {0}; struct e820_entry *entry, new_entry = {0};
struct e820_entry *p_e820 = (struct e820_entry *)get_e820_entry(); const struct e820_mem_params *p_e820_mem_info = get_e820_mem_info();
struct e820_mem_params *p_e820_mem = (struct e820_mem_params *)get_e820_mem_info(); struct acrn_vm_config *vm_config = get_vm_config(vm->vm_id);
/* hypervisor mem need be filter out from e820 table /* hypervisor mem need be filter out from e820 table
* it's hv itself + other hv reserved mem like vgt etc * it's hv itself + other hv reserved mem like vgt etc
*/ */
(void)memcpy_s((void *)sos_ve820, entries_count * sizeof(struct e820_entry),
(const void *)get_e820_entry(), entries_count * sizeof(struct e820_entry));
for (i = 0U; i < entries_count; i++) { for (i = 0U; i < entries_count; i++) {
entry = p_e820 + i; entry = &sos_ve820[i];
entry_start = entry->baseaddr; entry_start = entry->baseaddr;
entry_end = entry->baseaddr + entry->length; entry_end = entry->baseaddr + entry->length;
@ -250,16 +255,15 @@ static void create_sos_vm_e820(struct acrn_vm *vm)
if (new_entry.length > 0UL) { if (new_entry.length > 0UL) {
entries_count++; entries_count++;
ASSERT(entries_count <= E820_MAX_ENTRIES, "e820 entry overflow"); ASSERT(entries_count <= E820_MAX_ENTRIES, "e820 entry overflow");
entry = p_e820 + entries_count - 1; entry = &sos_ve820[entries_count - 1U];
entry->baseaddr = new_entry.baseaddr; entry->baseaddr = new_entry.baseaddr;
entry->length = new_entry.length; entry->length = new_entry.length;
entry->type = new_entry.type; entry->type = new_entry.type;
} }
p_e820_mem->total_mem_size -= CONFIG_HV_RAM_SIZE;
vm->e820_entry_num = entries_count; vm->e820_entry_num = entries_count;
vm->e820_entries = p_e820; vm->e820_entries = sos_ve820;
vm_config->memory.size = p_e820_mem_info->total_mem_size - CONFIG_HV_RAM_SIZE;
} }
/** /**

6
hypervisor/common/vm_load.c
View File

@ -105,7 +105,7 @@ int32_t general_sw_loader(struct acrn_vm *vm)
struct sw_kernel_info *sw_kernel = &(vm->sw.kernel_info); struct sw_kernel_info *sw_kernel = &(vm->sw.kernel_info);
/* get primary vcpu */ /* get primary vcpu */
struct acrn_vcpu *vcpu = vcpu_from_vid(vm, BOOT_CPU_ID); struct acrn_vcpu *vcpu = vcpu_from_vid(vm, BOOT_CPU_ID);
const struct e820_mem_params *p_e820_mem_info = get_e820_mem_info(); const struct acrn_vm_config *vm_config = get_vm_config(vm->vm_id);
pr_dbg("Loading guest to run-time location"); pr_dbg("Loading guest to run-time location");
@ -157,9 +157,9 @@ int32_t general_sw_loader(struct acrn_vm *vm)
int32_t reserving_1g_pages; int32_t reserving_1g_pages;
#ifdef CONFIG_REMAIN_1G_PAGES #ifdef CONFIG_REMAIN_1G_PAGES
reserving_1g_pages = (p_e820_mem_info->total_mem_size >> 30U) - CONFIG_REMAIN_1G_PAGES; reserving_1g_pages = (vm_config->memory.size >> 30U) - CONFIG_REMAIN_1G_PAGES;
#else #else
reserving_1g_pages = (p_e820_mem_info->total_mem_size >> 30U) - 3; reserving_1g_pages = (vm_config->memory.size >> 30U) - 3U;
#endif #endif
if (reserving_1g_pages > 0) { if (reserving_1g_pages > 0) {
snprintf(dyn_bootargs, 100U, " hugepagesz=1G hugepages=%d", reserving_1g_pages); snprintf(dyn_bootargs, 100U, " hugepagesz=1G hugepages=%d", reserving_1g_pages);