KVM: x86: Ignore benign host accesses to "unsupported" PEBS and BTS MSRs

Ignore host userspace reads and writes of '0' to PEBS and BTS MSRs that
KVM reports in the MSR-to-save list, but the MSRs are ultimately
unsupported.  All MSRs in said list must be writable by userspace, e.g.
if userspace sends the list back at KVM without filtering out the MSRs it
doesn't need.

Fixes: 0bff66da5fca ("KVM: x86/pmu: Add IA32_DS_AREA MSR emulation to support guest DS")
Fixes: e04a03139ab6 ("KVM: x86/pmu: Add PEBS_DATA_CFG MSR emulation to support adaptive PEBS")
Fixes: 56a759afcfa5 ("KVM: x86/pmu: Add IA32_PEBS_ENABLE MSR emulation for extended PEBS")
Signed-off-by: Sean Christopherson <seanjc@google.com>
Message-Id: <20220611005755.753273-7-seanjc@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 46301b148f64cca2c7689fd69df4c6ec72c39735..e07c5765a551328726e5b39efe45c482a22d85c3 100644 (file)
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -3786,6 +3786,16 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
                vcpu->arch.guest_fpu.xfd_err = data;
                break;
 #endif
+       case MSR_IA32_PEBS_ENABLE:
+       case MSR_IA32_DS_AREA:
+       case MSR_PEBS_DATA_CFG:
+               if (kvm_pmu_is_valid_msr(vcpu, msr))
+                       return kvm_pmu_set_msr(vcpu, msr_info);
+               /*
+                * Userspace is allowed to write '0' to MSRs that KVM reports
+                * as to-be-saved, even if an MSRs isn't fully supported.
+                */
+               return !msr_info->host_initiated || data;
        default:
                if (kvm_pmu_is_valid_msr(vcpu, msr))
                        return kvm_pmu_set_msr(vcpu, msr_info);
@@ -3866,9 +3876,16 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
        case MSR_DRAM_ENERGY_STATUS:    /* DRAM controller */
                msr_info->data = 0;
                break;
+       case MSR_IA32_PEBS_ENABLE:
+       case MSR_IA32_DS_AREA:
+       case MSR_PEBS_DATA_CFG:
        case MSR_F15H_PERF_CTL0 ... MSR_F15H_PERF_CTR5:
                if (kvm_pmu_is_valid_msr(vcpu, msr_info->index))
                        return kvm_pmu_get_msr(vcpu, msr_info);
+               /*
+                * Userspace is allowed to read MSRs that KVM reports in
+                * KVM_GET_MSR_INDEX_LIST, even if an MSR isn't fully supported.
+                */
                if (!msr_info->host_initiated)
                        return 1;
                msr_info->data = 0;