From: Paolo Bonzini <pbonzini@redhat.com>
Date: Mon, 14 Dec 2020 12:59:15 +0000 (-0500)
Subject: KVM: x86: remove bogus #GP injection
X-Git-Tag: v5.11-rc1~50^2~32
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9caec4bf1d0126fa5f2fcd21852958bccd2a4c18;p=thirdparty%2Flinux.git

KVM: x86: remove bogus #GP injection

There is no need to inject a #GP from kvm_mtrr_set_msr, kvm_emulate_wrmsr will
handle it.

Reviewed-by: Tom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/arch/x86/kvm/mtrr.c b/arch/x86/kvm/mtrr.c
index 7f0059aa30e16..f472fdb6ae7e0 100644
--- a/arch/x86/kvm/mtrr.c
+++ b/arch/x86/kvm/mtrr.c
@@ -84,12 +84,8 @@ bool kvm_mtrr_valid(struct kvm_vcpu *vcpu, u32 msr, u64 data)
 	} else
 		/* MTRR mask */
 		mask |= 0x7ff;
-	if (data & mask) {
-		kvm_inject_gp(vcpu, 0);
-		return false;
-	}
 
-	return true;
+	return (data & mask) == 0;
 }
 EXPORT_SYMBOL_GPL(kvm_mtrr_valid);