Skip to content

Commit f83a4a6

Browse files
Sean Christophersonbonzini
authored andcommitted
KVM: VXM: Remove temporary WARN on expected vs. actual EPTP level mismatch
Remove the WARN in vmx_load_mmu_pgd() that was temporarily added to aid bisection/debug in the event the current MMU's shadow root level didn't match VMX's computed EPTP level. Signed-off-by: Sean Christopherson <[email protected]> Message-Id: <[email protected]> Signed-off-by: Paolo Bonzini <[email protected]>
1 parent 2a40b90 commit f83a4a6

File tree

1 file changed

+0
-10
lines changed

1 file changed

+0
-10
lines changed

arch/x86/kvm/vmx/vmx.c

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3072,14 +3072,6 @@ static int vmx_get_tdp_level(struct kvm_vcpu *vcpu)
30723072
return 4;
30733073
}
30743074

3075-
static int get_ept_level(struct kvm_vcpu *vcpu)
3076-
{
3077-
if (is_guest_mode(vcpu) && nested_cpu_has_ept(get_vmcs12(vcpu)))
3078-
return vmx_eptp_page_walk_level(nested_ept_get_eptp(vcpu));
3079-
3080-
return vmx_get_tdp_level(vcpu);
3081-
}
3082-
30833075
u64 construct_eptp(struct kvm_vcpu *vcpu, unsigned long root_hpa,
30843076
int root_level)
30853077
{
@@ -3104,8 +3096,6 @@ static void vmx_load_mmu_pgd(struct kvm_vcpu *vcpu, unsigned long pgd,
31043096
u64 eptp;
31053097

31063098
if (enable_ept) {
3107-
WARN_ON(pgd_level != get_ept_level(vcpu));
3108-
31093099
eptp = construct_eptp(vcpu, pgd, pgd_level);
31103100
vmcs_write64(EPT_POINTER, eptp);
31113101

0 commit comments

Comments
 (0)