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

KVM: SVM: Intercept INVPCID when it's disabled to inject #UD 



Intercept INVPCID if it's disabled in the guest, even when using NPT,
as KVM needs to inject #UD in this case.

Fixes: 4407a797 ("KVM: SVM: Enable INVPCID feature on AMD")
Cc: Babu Moger <babu.moger@amd.com>
Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Message-Id: <20210212003411.1102677-2-seanjc@google.com>
Reviewed-by: default avatarJim Mattson <jmattson@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent bcd22e14

arch/x86/kvm/svm/svm.c

+4 −4
Original line number Diff line number Diff line
@@ -1103,12 +1103,12 @@ static u64 svm_write_l1_tsc_offset(struct kvm_vcpu *vcpu, u64 offset) 
static void svm_check_invpcid(struct vcpu_svm *svm)

{

	/*

	 * Intercept INVPCID instruction only if shadow page table is

	 * enabled. Interception is not required with nested page table

	 * enabled.

	 * Intercept INVPCID if shadow paging is enabled to sync/free shadow

	 * roots, or if INVPCID is disabled in the guest to inject #UD.

	 */

	if (kvm_cpu_cap_has(X86_FEATURE_INVPCID)) {

		if (!npt_enabled)

		if (!npt_enabled ||

		    !guest_cpuid_has(&svm->vcpu, X86_FEATURE_INVPCID))

			svm_set_intercept(svm, INTERCEPT_INVPCID);

		else

			svm_clr_intercept(svm, INTERCEPT_INVPCID);