Commit a6337a35 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: x86: Move call to update_exception_bitmap() into VMX code 



Now that vcpu_after_set_cpuid() and update_exception_bitmap() are called
back-to-back, subsume the exception bitmap update into the common CPUID
update.  Drop the SVM invocation entirely as SVM's exception bitmap
doesn't vary with respect to guest CPUID.

Signed-off-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Message-Id: <20200930041659.28181-4-sean.j.christopherson@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent c44d9b34

arch/x86/kvm/cpuid.c

+0 −1
Original line number Diff line number Diff line
@@ -171,7 +171,6 @@ static void kvm_vcpu_after_set_cpuid(struct kvm_vcpu *vcpu) 


	/* Invoke the vendor callback only after the above state is updated. */

	kvm_x86_ops.vcpu_after_set_cpuid(vcpu);

	kvm_x86_ops.update_exception_bitmap(vcpu);

}



static int is_efer_nx(void)

arch/x86/kvm/vmx/vmx.c

+3 −0
Original line number Diff line number Diff line
@@ -7248,6 +7248,9 @@ static void vmx_vcpu_after_set_cpuid(struct kvm_vcpu *vcpu) 
			vmx_set_guest_uret_msr(vmx, msr, enabled ? 0 : TSX_CTRL_RTM_DISABLE);

		}

	}



	/* Refresh #PF interception to account for MAXPHYADDR changes. */

	update_exception_bitmap(vcpu);

}



static __init void vmx_set_cpu_caps(void)