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

hv: Let trampoline execution use 1GB pages 

ACRN currently uses 2MB large pages in the page tables setup
for trampoline code and data. This patch lets ACRN use 1GB large
pages instead.
When it comes to fixing symbols in trampoline code, fixing pointers
in PDPT is no more needed as PDPT PTEs contain Physical Address.

Tracked-On: #3899
Signed-off-by: Sainath Grandhi <sainath.grandhi@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Sainath Grandhi 2019-10-08 16:59:51 -07:00 committed by wenlingz
parent 70f2ee398b
commit f01aad7e77
2 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hypervisor/arch/x86/boot/trampoline.S
View File

@ -179,7 +179,8 @@ trampoline_gdt_ptr:
.short (trampoline_gdt_end - trampoline_gdt) - 1 .short (trampoline_gdt_end - trampoline_gdt) - 1
.quad trampoline_gdt .quad trampoline_gdt
/* PML4, PDPT, and PD tables initialized to map first 4 GBytes of memory */ /* PML4 and PDPT tables initialized to map first 4 GBytes of memory */
/* Assumes CPU supports 1GB large pages */
.align 4 .align 4
.global cpu_boot_page_tables_ptr .global cpu_boot_page_tables_ptr
cpu_boot_page_tables_ptr: cpu_boot_page_tables_ptr:
@ -197,19 +198,9 @@ cpu_boot_page_tables_start:
trampoline_pdpt_addr: trampoline_pdpt_addr:
address = 0 address = 0
.rept 4 .rept 4
/* 0x3 = (PAGE_PRESENT | PAGE_RW) */ /* 0x83 = (PAGE_PRESENT | PAGE_PSE | PAGE_RW) */
.quad trampoline_pdt_addr + address + 0x3
/*0x1000 = PAGE_SIZE*/
address = address + 0x1000
.endr
/*0x1000 = PAGE_SIZE*/
.align 0x1000
trampoline_pdt_addr:
address = 0
.rept 2048
/* 0x83 = (PAGE_PSE | PAGE_PRESENT | PAGE_RW) */
.quad address + 0x83 .quad address + 0x83
address = address + 0x200000 address = address + 0x40000000
.endr .endr
.end .end

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

@ -59,11 +59,13 @@ uint64_t get_trampoline_start16_paddr(void)
return trampoline_start16_paddr; return trampoline_start16_paddr;
} }
/*
* @pre pcpu_has_cap(X86_FEATURE_PAGE1GB) == true
*/
static void update_trampoline_code_refs(uint64_t dest_pa) static void update_trampoline_code_refs(uint64_t dest_pa)
{ {
void *ptr; void *ptr;
uint64_t val; uint64_t val;
int32_t i;
/* /*
* calculate the fixup CS:IP according to fixup target address * calculate the fixup CS:IP according to fixup target address
@ -87,11 +89,6 @@ static void update_trampoline_code_refs(uint64_t dest_pa)
ptr = hpa2hva(dest_pa + trampoline_relo_addr(&cpu_boot_page_tables_start)); ptr = hpa2hva(dest_pa + trampoline_relo_addr(&cpu_boot_page_tables_start));
*(uint64_t *)(ptr) += dest_pa; *(uint64_t *)(ptr) += dest_pa;
ptr = hpa2hva(dest_pa + trampoline_relo_addr(&trampoline_pdpt_addr));
for (i = 0; i < 4; i++) {
*(uint64_t *)(ptr + sizeof(uint64_t) * i) += dest_pa;
}
/* update the gdt base pointer with relocated offset */ /* update the gdt base pointer with relocated offset */
ptr = hpa2hva(dest_pa + trampoline_relo_addr(&trampoline_gdt_ptr)); ptr = hpa2hva(dest_pa + trampoline_relo_addr(&trampoline_gdt_ptr));
*(uint64_t *)(ptr + 2) += dest_pa; *(uint64_t *)(ptr + 2) += dest_pa;