Skip to content

Commit dad7fd8

Browse files
Sainath Grandhiwenlingz
authored andcommitted
hv: Fix issues with the patch to reserve EPT 4K pages after boot
This patch fixes couple of minor issues with patch 8ffe6fc Tracked-On: #4563 Signed-off-by: Sainath Grandhi <sainath.grandhi@intel.com>
1 parent 4bdcd33 commit dad7fd8

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

hypervisor/arch/x86/page.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#include <vtd.h>
1313
#include <security.h>
1414
#include <vm.h>
15-
#include <vm_configurations.h>
1615

1716
static struct page ppt_pml4_pages[PML4_PAGE_NUM(CONFIG_PLATFORM_RAM_SIZE + PLATFORM_LO_MMIO_SIZE)];
1817
static struct page ppt_pdpt_pages[PDPT_PAGE_NUM(CONFIG_PLATFORM_RAM_SIZE + PLATFORM_LO_MMIO_SIZE)];
@@ -104,7 +103,7 @@ static union pgtable_pages_info ept_pages_info[CONFIG_MAX_VM_NUM];
104103
static const uint64_t vm_address_space_size[MAX_LOAD_ORDER] = {
105104
PRE_VM_EPT_ADDRESS_SPACE(CONFIG_UOS_RAM_SIZE), /* for Pre-Launched VM */
106105
EPT_ADDRESS_SPACE(CONFIG_SOS_RAM_SIZE), /* for SOS VM */
107-
EPT_ADDRESS_SPACE(CONFIG_SOS_RAM_SIZE), /* for Post-Launched VM */
106+
EPT_ADDRESS_SPACE(CONFIG_UOS_RAM_SIZE), /* for Post-Launched VM */
108107
};
109108

110109
/*

hypervisor/include/arch/x86/vm_config.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@
3636
* PRE_LAUNCHED_VM is launched by ACRN hypervisor, with LAPIC_PT;
3737
* SOS_VM is launched by ACRN hypervisor, without LAPIC_PT;
3838
* POST_LAUNCHED_VM is launched by ACRN devicemodel, with/without LAPIC_PT depends on usecases.
39+
*
40+
* Assumption: vm_configs array is completely initialized w.r.t. load_order member of
41+
* acrn_vm_config for all the VMs.
3942
*/
4043
enum acrn_vm_load_order {
4144
PRE_LAUNCHED_VM = 0,

0 commit comments

Comments
 (0)