d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add bhyve support for LA57 guest mode.

Browse Source 
Noted and reviewed by:	grehan
Sponsored by:	The FreeBSD Foundation
Differential revision:	https://reviews.freebsd.org/D25273
This commit is contained in:
Konstantin Belousov 2020-08-23 20:37:21 +00:00
parent 25f2da2e64
commit f3eb12e4a6
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/amd64/include/vmm.h
View File

@ -522,6 +522,7 @@ enum vm_paging_mode {
PAGING_MODE_32,
PAGING_MODE_PAE,
PAGING_MODE_64,
PAGING_MODE_64_LA57,
};
struct vm_guest_paging {

12
sys/amd64/vmm/intel/vmx.c
View File

@ -1940,14 +1940,18 @@ vmx_cpu_mode(void)
static enum vm_paging_mode
vmx_paging_mode(void)
{
uint64_t cr4;
if (!(vmcs_read(VMCS_GUEST_CR0) & CR0_PG))
return (PAGING_MODE_FLAT);
if (!(vmcs_read(VMCS_GUEST_CR4) & CR4_PAE))
cr4 = vmcs_read(VMCS_GUEST_CR4);
if (!(cr4 & CR4_PAE))
return (PAGING_MODE_32);
if (vmcs_read(VMCS_GUEST_IA32_EFER) & EFER_LME)
return (PAGING_MODE_64);
else
if (vmcs_read(VMCS_GUEST_IA32_EFER) & EFER_LME) {
if (!(cr4 & CR4_LA57))
return (PAGING_MODE_64);
return (PAGING_MODE_64_LA57);
} else
return (PAGING_MODE_PAE);
}

6
sys/amd64/vmm/vmm_instruction_emul.c
View File

@ -2189,8 +2189,12 @@ restart:
ptpphys = pte;
nlevels = 2;
} else
} else if (paging->paging_mode == PAGING_MODE_64_LA57) {
nlevels = 5;
} else {
nlevels = 4;
}
while (--nlevels >= 0) {
/* Zero out the lower 12 bits and the upper 12 bits */
ptpphys >>= 12; ptpphys <<= 24; ptpphys >>= 12;

3
usr.sbin/bhyve/gdb.c
View File

@ -251,7 +251,8 @@ guest_paging_info(int vcpu, struct vm_guest_paging *paging)
else if (!(regs[2] & CR4_PAE))
paging->paging_mode = PAGING_MODE_32;
else if (regs[3] & EFER_LME)
paging->paging_mode = PAGING_MODE_64;
paging->paging_mode = (regs[2] & CR4_LA57) ?
PAGING_MODE_64_LA57 : PAGING_MODE_64;
else
paging->paging_mode = PAGING_MODE_PAE;
return (0);