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>

diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index dac9e977c703cc6b070b9404a19c3329290b2054..5b14dcbd248a0b977d8ebc5caa482e93b3cc0627 100644 (file)
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -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);

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index d243eba6234077ca6ef55c3bfa8c59e48a437a47..fa7e46210a0da0a769847edfd9f7fef1ed4b062f 100644 (file)
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -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;
 }