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

HV: Fix the problem of copy fail when booting pre-launched VMs

Browse Source 
The length of the ACPI data entry in ve820 tab was 960K, while the
ACPI file is 1MB. It would cause ept unmapped fault when loading the
pre-launched VMs. This patch changes it to 1MB to fix the problem.

And the ACPI data length was missed when calculating
ENTRY_HPA1_LOW_PART2 length. Fixed here too.

The vACPI data and NVS entry size for pre-launched VM is currently
hard-coded. Add VIRT_ACPI_DATA_LEN and VIRT_ACPI_NVS_LEN to replace
them. And build connection with their starting address, too.

Tracked-On: #6507

Signed-off-by: Zhou, Wu <wu.zhou@intel.com>
Reviewed-by: Victor Sun <victor.sun@intel.com>
This commit is contained in:
Zhou, Wu 2021-08-26 17:40:02 +08:00 committed by wenlingz
parent 76f384779c
commit 25ed86e28f
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -204,12 +204,12 @@ static const struct e820_entry pre_ve820_template[E820_MAX_ENTRIES] = {
}, },
{ /* ACPI Reclaim */ { /* ACPI Reclaim */
.baseaddr = VIRT_ACPI_DATA_ADDR,/* consecutive from 0x7fe00000UL */ .baseaddr = VIRT_ACPI_DATA_ADDR,/* consecutive from 0x7fe00000UL */
.length = (960U * MEM_1K), /* 960KB */ .length = VIRT_ACPI_DATA_LEN,
.type = E820_TYPE_ACPI_RECLAIM .type = E820_TYPE_ACPI_RECLAIM
}, },
{ /* ACPI NVS */ { /* ACPI NVS */
.baseaddr = VIRT_ACPI_NVS_ADDR, /* consecutive after ACPI Reclaim */ .baseaddr = VIRT_ACPI_NVS_ADDR, /* consecutive after ACPI Reclaim */
.length = MEM_1M, /* only the first 64KB is used for NVS */ .length = VIRT_ACPI_NVS_LEN,
.type = E820_TYPE_ACPI_NVS .type = E820_TYPE_ACPI_NVS
}, },
{ /* 32bit PCI hole */ { /* 32bit PCI hole */
@ -243,7 +243,7 @@ static inline uint64_t add_ram_entry(struct e820_entry *entry, uint64_t gpa, uin
* Software SRAM segment rather than hpa1. * Software SRAM segment rather than hpa1.
* entry4: usable, the part2 of hpa1 in lowmem, from the ceil of Software SRAM segment, * entry4: usable, the part2 of hpa1 in lowmem, from the ceil of Software SRAM segment,
* and up to 2G-1M. * and up to 2G-1M.
* entry5: ACPI Reclaim from 0x7fe00000 to 0x7feeffff (960K) * entry5: ACPI Reclaim from 0x7fe00000 to 0x7fefffff (1M)
* entry6: ACPI NVS from 0x7ff00000 to 0x7fffffff (1M) * entry6: ACPI NVS from 0x7ff00000 to 0x7fffffff (1M)
* Currently this is used by: * Currently this is used by:
* a) first 64k reserved * a) first 64k reserved
@ -269,7 +269,7 @@ static inline uint64_t add_ram_entry(struct e820_entry *entry, uint64_t gpa, uin
|<---Software SRAM--->| |<---Software SRAM--->|
|<-----hpa1_low_part2--->| |<-----hpa1_low_part2--->|
|<---Non-mapped hole (if there is)-->| |<---Non-mapped hole (if there is)-->|
|<---(1M + 960K) ACPI NVS/DATA--->| |<---(1M + 1M) ACPI NVS/DATA--->|
*/ */
void create_prelaunched_vm_e820(struct acrn_vm *vm) void create_prelaunched_vm_e820(struct acrn_vm *vm)
{ {
@ -291,17 +291,18 @@ void create_prelaunched_vm_e820(struct acrn_vm *vm)
hpa1_hi_size = vm_config->memory.size - lowmem_max_length; hpa1_hi_size = vm_config->memory.size - lowmem_max_length;
gpa_start = add_ram_entry((vm->e820_entries + entry_idx), gpa_start, hpa1_hi_size); gpa_start = add_ram_entry((vm->e820_entries + entry_idx), gpa_start, hpa1_hi_size);
entry_idx++; entry_idx++;
} else if (vm_config->memory.size <= MEM_1M + hpa1_part1_max_length + MEM_1M + (960 * MEM_1K)) { } else if (vm_config->memory.size <= MEM_1M + hpa1_part1_max_length + VIRT_ACPI_DATA_LEN + VIRT_ACPI_NVS_LEN) {
/* /*
* In this case, hpa1 is only enough for the first * In this case, hpa1 is only enough for the first
* 1M + part1 + last (1M + 960K) (ACPI NVS/DATA), so part2 will be empty. * 1M + part1 + last (1M + 1M) (ACPI NVS/DATA), so part2 will be empty.
*/ */
vm->e820_entries[ENTRY_HPA1_LOW_PART1].length = vm_config->memory.size - MEM_2M - (960 * MEM_1K); vm->e820_entries[ENTRY_HPA1_LOW_PART1].length =
vm_config->memory.size - MEM_1M - VIRT_ACPI_DATA_LEN - VIRT_ACPI_NVS_LEN;
vm->e820_entries[ENTRY_HPA1_LOW_PART2].length = 0; vm->e820_entries[ENTRY_HPA1_LOW_PART2].length = 0;
} else { } else {
/* Otherwise, part2 is not empty. */ /* Otherwise, part2 is not empty. */
vm->e820_entries[ENTRY_HPA1_LOW_PART2].length = vm->e820_entries[ENTRY_HPA1_LOW_PART2].length =
vm_config->memory.size - PRE_RTVM_SW_SRAM_BASE_GPA - MEM_1M; vm_config->memory.size - PRE_RTVM_SW_SRAM_BASE_GPA - VIRT_ACPI_DATA_LEN - VIRT_ACPI_NVS_LEN;
/* need to set gpa_start for hpa2 */ /* need to set gpa_start for hpa2 */
} }

7
hypervisor/include/dm/vacpi.h
View File

@ -17,8 +17,11 @@
* table which at GPA 0x7fe00080; * table which at GPA 0x7fe00080;
* The module file should be generated by acrn-config tool; * The module file should be generated by acrn-config tool;
*/ */
#define VIRT_ACPI_DATA_ADDR 0x7fe00000UL #define VIRT_ACPI_DATA_LEN MEM_1M
#define VIRT_ACPI_NVS_ADDR 0x7ff00000UL #define VIRT_ACPI_NVS_LEN MEM_1M
/* Currently ACPI NVS start addr is presumed to be consecutive with ACPI DATA area right below 0x80000000 */
#define VIRT_ACPI_NVS_ADDR (0x80000000UL - VIRT_ACPI_NVS_LEN)
#define VIRT_ACPI_DATA_ADDR (VIRT_ACPI_NVS_ADDR - VIRT_ACPI_DATA_LEN)
#define VIRT_RSDP_ADDR 0x000f2400UL #define VIRT_RSDP_ADDR 0x000f2400UL
#define VIRT_XSDT_ADDR 0x7fe00080UL #define VIRT_XSDT_ADDR 0x7fe00080UL