Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3dc773e7 authored Oct 08, 2018 by Vitaly Kuznetsov Committed by Paolo Bonzini Oct 17, 2018

x86/kvm/mmu.c: set get_pdptr hook in kvm_init_shadow_ept_mmu()



kvm_init_shadow_ept_mmu() doesn't set get_pdptr() hook and is this
not a problem just because MMU context is already initialized and this
hook points to kvm_pdptr_read(). As we're intended to use a dedicated
MMU for shadow EPT MMU set this hook explicitly.

Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Sean Christopherson <sean.j.christopherson@intel.com>

parent 44dd3ffa

arch/x86/kvm/mmu.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -4862,6 +4862,7 @@ void kvm_init_shadow_ept_mmu(struct kvm_vcpu *vcpu, bool execonly,
		context->root_level = PT64_ROOT_4LEVEL;
		context->direct_map = false;
		context->base_role.word = root_page_role.word & mmu_base_role_mask.word;

		update_permission_bitmask(vcpu, context, true);
		update_pkru_bitmask(vcpu, context, true);
		update_last_nonleaf_level(vcpu, context);

arch/x86/kvm/vmx.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -11308,6 +11308,7 @@ static void nested_ept_init_mmu_context(struct kvm_vcpu *vcpu)
		vcpu->arch.mmu->set_cr3 = vmx_set_cr3;
		vcpu->arch.mmu->get_cr3 = nested_ept_get_cr3;
		vcpu->arch.mmu->inject_page_fault = nested_ept_inject_page_fault;
		vcpu->arch.mmu->get_pdptr = kvm_pdptr_read;

		vcpu->arch.walk_mmu = &vcpu->arch.nested_mmu;
		}