Commit 1fb883bb authored by Ladi Prosek's avatar Ladi Prosek Committed by Radim Krčmář
Browse files

KVM: nVMX: initialize PML fields in vmcs02 



L2 was running with uninitialized PML fields which led to incomplete
dirty bitmap logging. This manifested as all kinds of subtle erratic
behavior of the nested guest.

Fixes: 843e4330 ("KVM: VMX: Add PML support in VMX")
Signed-off-by: default avatarLadi Prosek <lprosek@redhat.com>
Signed-off-by: default avatarRadim Krčmář <rkrcmar@redhat.com>
parent ab007cc9

arch/x86/kvm/vmx.c

+12 −0
Original line number Diff line number Diff line
@@ -10270,6 +10270,18 @@ static int prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12, 


	}



	if (enable_pml) {

		/*

		 * Conceptually we want to copy the PML address and index from

		 * vmcs01 here, and then back to vmcs01 on nested vmexit. But,

		 * since we always flush the log on each vmexit, this happens

		 * to be equivalent to simply resetting the fields in vmcs02.

		 */

		ASSERT(vmx->pml_pg);

		vmcs_write64(PML_ADDRESS, page_to_phys(vmx->pml_pg));

		vmcs_write16(GUEST_PML_INDEX, PML_ENTITY_NUM - 1);

	}



	if (nested_cpu_has_ept(vmcs12)) {

		kvm_mmu_unload(vcpu);

		nested_ept_init_mmu_context(vcpu);