| From bb28587885c617fa25bdcbe9c6d84c2b3734335f Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 16 Dec 2021 17:52:13 +0100 |
| Subject: KVM: x86: Drop guest CPUID check for host initiated writes to |
| MSR_IA32_PERF_CAPABILITIES |
| |
| From: Vitaly Kuznetsov <vkuznets@redhat.com> |
| |
| [ Upstream commit 1aa2abb33a419090c7c87d4ae842a6347078ee12 ] |
| |
| The ability to write to MSR_IA32_PERF_CAPABILITIES from the host should |
| not depend on guest visible CPUID entries, even if just to allow |
| creating/restoring guest MSRs and CPUIDs in any sequence. |
| |
| Fixes: 27461da31089 ("KVM: x86/pmu: Support full width counting") |
| Suggested-by: Sean Christopherson <seanjc@google.com> |
| Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com> |
| Message-Id: <20211216165213.338923-3-vkuznets@redhat.com> |
| Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/x86/kvm/x86.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c |
| index 3c9e2d236830c..dea578586fa4e 100644 |
| --- a/arch/x86/kvm/x86.c |
| +++ b/arch/x86/kvm/x86.c |
| @@ -3359,7 +3359,7 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info) |
| |
| if (!msr_info->host_initiated) |
| return 1; |
| - if (guest_cpuid_has(vcpu, X86_FEATURE_PDCM) && kvm_get_msr_feature(&msr_ent)) |
| + if (kvm_get_msr_feature(&msr_ent)) |
| return 1; |
| if (data & ~msr_ent.data) |
| return 1; |
| -- |
| 2.34.1 |
| |
