github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-21 13:08:42 +00:00
Code Issues Projects Releases Wiki Activity

Merge d0213fdf39 into 60fc6c2bc4

Browse Source
This commit is contained in:
Jiaqing Zhao 2025-04-21 11:20:29 +00:00 committed by GitHub
commit 6d9ad0f088
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 57 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hypervisor/arch/x86/cpu.c
View File

@ -503,7 +503,7 @@ void cpu_dead(void)
vmx_off();
stac();
flush_cache_range((void *)get_hv_image_base(), get_hv_ram_size());
flush_cache_range((void *)get_hv_image_base(), get_hv_image_size());
clac();
/* Set state to show CPU is dead */

70
hypervisor/arch/x86/e820.c
View File

@ -10,6 +10,7 @@
#include <asm/e820.h>
#include <asm/mmu.h>
#include <boot.h>
#include <reloc.h>
#include <efi_mmap.h>
#include <logmsg.h>
#include <asm/guest/ept.h>
@ -232,6 +233,47 @@ static void calculate_e820_ram_size(void)
dev_dbg(DBG_LEVEL_E820, "ram size: 0x%016lx ",hv_e820_ram_size);
}
static void reserve_e820_region(uint64_t start_hpa, uint64_t end_hpa)
{
uint32_t e820_index;
uint64_t entry_start, entry_end;
for (e820_index = 0; e820_index < hv_e820_entries_nr; e820_index++) {
entry_start = hv_e820[e820_index].baseaddr;
entry_end = hv_e820[e820_index].baseaddr + hv_e820[e820_index].length;
/* No need handle in these cases*/
if ((hv_e820[e820_index].type != E820_TYPE_RAM) || (entry_end <= start_hpa) || (entry_start >= end_hpa)) {
continue;
}
if ((entry_start <= start_hpa) && (entry_end >= end_hpa)) {
hv_e820[e820_index].length = start_hpa - entry_start;
if (end_hpa < entry_end) {
/*
* .......|start_hpa......................end_hpa|.....
* |entry_start..............................entry_end|
*/
insert_e820_entry(e820_index + 1, end_hpa, entry_end - end_hpa, E820_TYPE_RAM);
}
} else {
panic("%s: region 0x%016x-0x%016x crosses multiple e820 entries, check your bootloader!",
__func__, entry_start, entry_end);
}
}
}
static void alloc_hv_memory(void)
{
uint64_t hv_start = hva2hpa((void *)(get_hv_image_base()));
uint64_t hv_end = hv_start + get_hv_image_size();
pr_err("%s: hv start: 0x%016x, end: 0x%016x", __func__, hv_start, hv_end);
reserve_e820_region(hv_start, hv_end);
}
static void alloc_mods_memory(void)
{
uint32_t mod_index, e820_index, target_index;
@ -242,32 +284,11 @@ static void alloc_mods_memory(void)
/* 1st pass: remove the exact region */
for (mod_index = 0; mod_index < abi->mods_count; mod_index++) {
mod_start = hva2hpa(abi->mods[mod_index].start);
mod_end = hva2hpa(abi->mods[mod_index].start) + abi->mods[mod_index].size;
mod_end = mod_start + abi->mods[mod_index].size;
for (e820_index = 0; e820_index < hv_e820_entries_nr; e820_index++) {
entry_start = hv_e820[e820_index].baseaddr;
entry_end = hv_e820[e820_index].baseaddr + hv_e820[e820_index].length;
pr_err("%s: mod %d, start: 0x%016x, end: 0x%016x", __func__, mod_index, mod_start, mod_end);
/* No need handle in these cases*/
if ((hv_e820[e820_index].type != E820_TYPE_RAM) || (entry_end <= mod_start) || (entry_start >= mod_end)) {
continue;
}
if ((entry_start <= mod_start) && (entry_end >= mod_end)) {
hv_e820[e820_index].length = mod_start - entry_start;
if (mod_end < entry_end) {
/*
* .......|start_pa... ....................end_pa|.....
* |entry_start..............................entry_end|
*/
insert_e820_entry(e820_index + 1, mod_end, entry_end - mod_end, E820_TYPE_RAM);
}
} else {
panic("%s: region 0x%016x-0x%016x crosses multiple e820 entries, check your bootloader!",
__func__, entry_start, entry_end);
}
}
reserve_e820_region(mod_start, mod_end);
}
/* 2nd pass: shrink the entries to page boundary */
@ -300,6 +321,7 @@ void init_e820(void)
}
calculate_e820_ram_size();
alloc_hv_memory();
/* reserve multiboot modules memory */
alloc_mods_memory();
}

2
hypervisor/arch/x86/guest/optee.c
View File

@ -45,7 +45,7 @@ void prepare_tee_vm_memmap(struct acrn_vm *vm, const struct acrn_vm_config *vm_c
prepare_vm_identical_memmap(vm, E820_TYPE_RAM, EPT_WB | EPT_RWX);
hv_hpa = hva2hpa((void *)(get_hv_image_base()));
ept_del_mr(vm, (uint64_t *)vm->arch_vm.nworld_eptp, hv_hpa, get_hv_ram_size());
ept_del_mr(vm, (uint64_t *)vm->arch_vm.nworld_eptp, hv_hpa, get_hv_image_size());
}
}

4
hypervisor/arch/x86/guest/ve820.c
View File

@ -138,8 +138,6 @@ void create_service_vm_e820(struct acrn_vm *vm)
{
uint16_t vm_id;
uint32_t i;
uint64_t hv_start_pa = hva2hpa((void *)(get_hv_image_base()));
uint64_t hv_end_pa = hv_start_pa + get_hv_ram_size();
uint32_t entries_count = get_e820_entries_count();
struct acrn_vm_config *service_vm_config = get_vm_config(vm->vm_id);
@ -148,8 +146,6 @@ void create_service_vm_e820(struct acrn_vm *vm)
vm->e820_entry_num = entries_count;
vm->e820_entries = service_vm_e820;
/* filter out hv memory from e820 table */
filter_mem_from_service_vm_e820(vm, hv_start_pa, hv_end_pa);
/* filter out prelaunched vm memory from e820 table */
for (vm_id = 0U; vm_id < CONFIG_MAX_VM_NUM; vm_id++) {

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

@ -528,7 +528,7 @@ static void prepare_service_vm_memmap(struct acrn_vm *vm)
* will cause EPT violation if Service VM accesses hv memory
*/
hv_hpa = hva2hpa((void *)(get_hv_image_base()));
ept_del_mr(vm, pml4_page, hv_hpa, get_hv_ram_size());
ept_del_mr(vm, pml4_page, hv_hpa, get_hv_image_size());
/* unmap prelaunch VM memory */
for (vm_id = 0U; vm_id < CONFIG_MAX_VM_NUM; vm_id++) {
vm_config = get_vm_config(vm_id);

9
hypervisor/arch/x86/mmu.c
View File

@ -39,7 +39,6 @@
#include <logmsg.h>
#include <misc_cfg.h>
static uint64_t hv_ram_size;
static void *ppt_mmu_pml4_addr;
/**
* @brief The sanitized page
@ -147,11 +146,6 @@ void invept(const void *eptp)
}
}
uint64_t get_hv_ram_size(void)
{
return hv_ram_size;
}
void enable_paging(void)
{
uint64_t tmp64 = 0UL;
@ -265,7 +259,6 @@ void init_paging(void)
const struct abi_mmap *p_mmap = abi->mmap_entry;
pr_dbg("HV MMU Initialization");
hv_ram_size = (uint64_t)(&ld_ram_end - &ld_ram_start);
init_sanitized_page((uint64_t *)sanitized_page, hva2hpa_early(sanitized_page));
@ -314,7 +307,7 @@ void init_paging(void)
*/
hv_hva = get_hv_image_base();
pgtable_modify_or_del_map((uint64_t *)ppt_mmu_pml4_addr, hv_hva & PDE_MASK,
hv_ram_size + (((hv_hva & (PDE_SIZE - 1UL)) != 0UL) ? PDE_SIZE : 0UL),
get_hv_image_size() + (((hv_hva & (PDE_SIZE - 1UL)) != 0UL) ? PDE_SIZE : 0UL),
PAGE_CACHE_WB, PAGE_CACHE_MASK | PAGE_USER, &ppt_pgtable, MR_MODIFY);
/*

1
hypervisor/boot/include/reloc.h
View File

@ -9,6 +9,7 @@
extern void relocate(void);
extern uint64_t get_hv_image_delta(void);
extern uint64_t get_hv_image_base(void);
extern uint64_t get_hv_image_size(void);
/* external symbols that are helpful for relocation */
extern uint8_t _DYNAMIC[1];

5
hypervisor/boot/reloc.c
View File

@ -55,6 +55,11 @@ uint64_t get_hv_image_base(void)
return (get_hv_image_delta() + CONFIG_HV_RAM_START);
}
inline uint64_t get_hv_image_size(void)
{
return (uint64_t)(&ld_ram_end - &ld_ram_start);
}
void relocate(void)
{
#ifdef CONFIG_RELOC

2
hypervisor/common/hypercall.c
View File

@ -764,7 +764,7 @@ static int32_t write_protect_page(struct acrn_vm *vm,const struct wp_data *wp)
base_paddr = hva2hpa((void *)(get_hv_image_base()));
if (((hpa <= base_paddr) && ((hpa + PAGE_SIZE) > base_paddr)) ||
((hpa >= base_paddr) &&
(hpa < (base_paddr + get_hv_ram_size())))) {
(hpa < (base_paddr + get_hv_image_size())))) {
pr_err("%s: overlap the HV memory region.", __func__);
} else {
prot_set = (wp->set != 0U) ? 0UL : EPT_WR;

2
hypervisor/include/arch/x86/asm/mmu.h
View File

@ -169,8 +169,6 @@ void flush_vpid_global(void);
*/
void invept(const void *eptp);
uint64_t get_hv_ram_size(void);
/* get PDPT address from CR3 vaule in PAE mode */
static inline uint64_t get_pae_pdpt_addr(uint64_t cr3)
{