[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 6/9] i386: hvf: Move Guest LMA reset to macvm_set_cr0()
From: |
Roman Bolshakov |
Subject: |
[PATCH v2 6/9] i386: hvf: Move Guest LMA reset to macvm_set_cr0() |
Date: |
Tue, 30 Jun 2020 13:28:21 +0300 |
The only useful purpose of hvf_reset_vcpu() is to clear "IA-32e mode
guest" (LMA) VM-Entry control. But it can be moved to macvm_set_cr0()
which is indirectly used by post-init and post-reset to flush emulator
state. That enables clean removal of hvf_reset_vcpu().
LMA is set only if IA32_EFER.LME = 1, according to Intel SDM "9.8.5
Initializing IA-32e Mode" and "9.8.5.4 Switching Out of IA-32e Mode
Operation", otherwise the entry control can be safely cleared.
Cc: Cameron Esfahani <dirty@apple.com>
Signed-off-by: Roman Bolshakov <r.bolshakov@yadro.com>
---
target/i386/hvf/hvf.c | 1 -
target/i386/hvf/vmx.h | 4 ++++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/target/i386/hvf/hvf.c b/target/i386/hvf/hvf.c
index 317304aa1d..1d3a27167d 100644
--- a/target/i386/hvf/hvf.c
+++ b/target/i386/hvf/hvf.c
@@ -462,7 +462,6 @@ void hvf_reset_vcpu(CPUState *cpu) {
/* TODO: this shouldn't be needed; there is already a call to
* cpu_synchronize_all_post_reset in vl.c
*/
- wvmcs(cpu->hvf_fd, VMCS_ENTRY_CTLS, 0);
wvmcs(cpu->hvf_fd, VMCS_GUEST_IA32_EFER, 0);
/* Initialize PDPTE */
diff --git a/target/i386/hvf/vmx.h b/target/i386/hvf/vmx.h
index 437238f11d..75ba1e2a5f 100644
--- a/target/i386/hvf/vmx.h
+++ b/target/i386/hvf/vmx.h
@@ -123,6 +123,7 @@ static inline void macvm_set_cr0(hv_vcpuid_t vcpu, uint64_t
cr0)
uint64_t old_cr0 = rvmcs(vcpu, VMCS_GUEST_CR0);
uint64_t changed_cr0 = old_cr0 ^ cr0;
uint64_t mask = CR0_PG | CR0_CD | CR0_NW | CR0_NE | CR0_ET;
+ uint64_t entry_ctls;
if ((cr0 & CR0_PG) && (rvmcs(vcpu, VMCS_GUEST_CR4) & CR4_PAE) &&
!(efer & MSR_EFER_LME)) {
@@ -146,6 +147,9 @@ static inline void macvm_set_cr0(hv_vcpuid_t vcpu, uint64_t
cr0)
exit_long_mode(vcpu, cr0, efer);
}
}
+ } else {
+ entry_ctls = rvmcs(vcpu, VMCS_ENTRY_CTLS);
+ wvmcs(vcpu, VMCS_ENTRY_CTLS, entry_ctls & ~VM_ENTRY_GUEST_LMA);
}
/* Filter new CR0 after we are finished examining it above. */
--
2.26.1
- [PATCH v2 0/9] Improve synchronization between QEMU and HVF, Roman Bolshakov, 2020/06/30
- [PATCH v2 1/9] i386: hvf: Set env->eip in macvm_set_rip(), Roman Bolshakov, 2020/06/30
- [PATCH v2 2/9] i386: hvf: Move synchronize functions to sysemu, Roman Bolshakov, 2020/06/30
- [PATCH v2 5/9] i386: hvf: Make long mode enter and exit clearer, Roman Bolshakov, 2020/06/30
- [PATCH v2 3/9] i386: hvf: Add hvf_cpu_synchronize_pre_loadvm(), Roman Bolshakov, 2020/06/30
- [PATCH v2 4/9] i386: hvf: Implement CPU kick, Roman Bolshakov, 2020/06/30
- [PATCH v2 8/9] i386: hvf: Clean up synchronize functions, Roman Bolshakov, 2020/06/30
- [PATCH v2 7/9] i386: hvf: Don't duplicate register reset, Roman Bolshakov, 2020/06/30
- [PATCH v2 6/9] i386: hvf: Move Guest LMA reset to macvm_set_cr0(),
Roman Bolshakov <=
- [PATCH v2 9/9] MAINTAINERS: Add Cameron as HVF co-maintainer, Roman Bolshakov, 2020/06/30