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

vittyvk · bonzini · commit 3dc773e74523 · 2018-10-17T00:30:03.000+02:00
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 &lt;vkuznets@redhat.com&gt;
Signed-off-by: Paolo Bonzini &lt;pbonzini@redhat.com&gt;
Reviewed-by: Sean Christopherson &lt;sean.j.christopherson@intel.com&gt;
diff --git 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
@@ -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;
 }

Original file line number	Diff line number	Diff line change
`@@ -11308,6 +11308,7 @@ static void nested_ept_init_mmu_context(struct kvm_vcpu *vcpu)`
`11308`	`11308`	`vcpu->arch.mmu->set_cr3 = vmx_set_cr3;`
`11309`	`11309`	`vcpu->arch.mmu->get_cr3 = nested_ept_get_cr3;`
`11310`	`11310`	`vcpu->arch.mmu->inject_page_fault = nested_ept_inject_page_fault;`
	`11311`	`+ vcpu->arch.mmu->get_pdptr = kvm_pdptr_read;`
`11311`	`11312`
`11312`	`11313`	`vcpu->arch.walk_mmu = &vcpu->arch.nested_mmu;`
`11313`	`11314`	`}`