x86/kvm/mmu.c: set get_pdptr hook in kvm_init_shadow_ept_mmu()
authorVitaly Kuznetsov <vkuznets@redhat.com>
Mon, 8 Oct 2018 19:28:06 +0000 (21:28 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Tue, 16 Oct 2018 22:30:03 +0000 (00:30 +0200)
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>
arch/x86/kvm/mmu.c
arch/x86/kvm/vmx.c

index dac9e97..5b14dcb 100644 (file)
@@ -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);
index d243eba..fa7e462 100644 (file)
@@ -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;
 }