KVM: nVMX: Copy PDPTRs to/from vmcs12 only when necessary
Per Intel's SDM: ... the logical processor uses PAE paging if CR0.PG=1, CR4.PAE=1 and IA32_EFER.LME=0. A VM entry to a guest that uses PAE paging loads the PDPTEs into internal, non-architectural registers based on the setting of the "enable EPT" VM-execution control. and: [GUEST_PDPTR] values are saved into the four PDPTE fields as follows: - If the "enable EPT" VM-execution control is 0 or the logical processor was not using PAE paging at the time of the VM exit, the values saved are undefined. In other words, if EPT is disabled or the guest isn't using PAE paging, then the PDPTRS aren't consumed by hardware on VM-Entry and are loaded with junk on VM-Exit. From a nesting perspective, all of the above hold true, i.e. KVM can effectively ignore the VMCS PDPTRs. E.g. KVM already loads the PDPTRs from memory when nested EPT is disabled (see nested_vmx_load_cr3()). Because KVM intercepts setting CR4.PAE, there is no danger of consuming a stale value or crushing L1's VMWRITEs regardless of whether L1 intercepts CR4.PAE. The vmcs12's values are unchanged up until the VM-Exit where L2 sets CR4.PAE, i.e. L0 will see the new PAE state on the subsequent VM-Entry and propagate the PDPTRs from vmcs12 to vmcs02. Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Родитель
bf03d4f933
Коммит
c7554efc83
|
@ -2252,10 +2252,16 @@ static int prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12,
|
|||
u32 *entry_failure_code)
|
||||
{
|
||||
struct vcpu_vmx *vmx = to_vmx(vcpu);
|
||||
struct hv_enlightened_vmcs *hv_evmcs = vmx->nested.hv_evmcs;
|
||||
bool load_guest_pdptrs_vmcs12 = false;
|
||||
|
||||
if (vmx->nested.dirty_vmcs12 || vmx->nested.hv_evmcs) {
|
||||
if (vmx->nested.dirty_vmcs12 || hv_evmcs) {
|
||||
prepare_vmcs02_rare(vmx, vmcs12);
|
||||
vmx->nested.dirty_vmcs12 = false;
|
||||
|
||||
load_guest_pdptrs_vmcs12 = !hv_evmcs ||
|
||||
!(hv_evmcs->hv_clean_fields &
|
||||
HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP1);
|
||||
}
|
||||
|
||||
if (vmx->nested.nested_run_pending &&
|
||||
|
@ -2358,6 +2364,15 @@ static int prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12,
|
|||
entry_failure_code))
|
||||
return -EINVAL;
|
||||
|
||||
/* Late preparation of GUEST_PDPTRs now that EFER and CRs are set. */
|
||||
if (load_guest_pdptrs_vmcs12 && nested_cpu_has_ept(vmcs12) &&
|
||||
is_pae_paging(vcpu)) {
|
||||
vmcs_write64(GUEST_PDPTR0, vmcs12->guest_pdptr0);
|
||||
vmcs_write64(GUEST_PDPTR1, vmcs12->guest_pdptr1);
|
||||
vmcs_write64(GUEST_PDPTR2, vmcs12->guest_pdptr2);
|
||||
vmcs_write64(GUEST_PDPTR3, vmcs12->guest_pdptr3);
|
||||
}
|
||||
|
||||
if (!enable_ept)
|
||||
vcpu->arch.walk_mmu->inject_page_fault = vmx_inject_page_fault_nested;
|
||||
|
||||
|
@ -3547,10 +3562,12 @@ static void sync_vmcs02_to_vmcs12(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12)
|
|||
*/
|
||||
if (enable_ept) {
|
||||
vmcs12->guest_cr3 = vmcs_readl(GUEST_CR3);
|
||||
vmcs12->guest_pdptr0 = vmcs_read64(GUEST_PDPTR0);
|
||||
vmcs12->guest_pdptr1 = vmcs_read64(GUEST_PDPTR1);
|
||||
vmcs12->guest_pdptr2 = vmcs_read64(GUEST_PDPTR2);
|
||||
vmcs12->guest_pdptr3 = vmcs_read64(GUEST_PDPTR3);
|
||||
if (nested_cpu_has_ept(vmcs12) && is_pae_paging(vcpu)) {
|
||||
vmcs12->guest_pdptr0 = vmcs_read64(GUEST_PDPTR0);
|
||||
vmcs12->guest_pdptr1 = vmcs_read64(GUEST_PDPTR1);
|
||||
vmcs12->guest_pdptr2 = vmcs_read64(GUEST_PDPTR2);
|
||||
vmcs12->guest_pdptr3 = vmcs_read64(GUEST_PDPTR3);
|
||||
}
|
||||
}
|
||||
|
||||
vmcs12->guest_linear_address = vmcs_readl(GUEST_LINEAR_ADDRESS);
|
||||
|
|
Загрузка…
Ссылка в новой задаче