]> git.baikalelectronics.ru Git - kernel.git/commitdiff
KVM: VMX: Give host userspace full control of MSR_IA32_PERF_CAPABILITIES
authorSean Christopherson <seanjc@google.com>
Sat, 11 Jun 2022 00:57:50 +0000 (00:57 +0000)
committerPaolo Bonzini <pbonzini@redhat.com>
Mon, 20 Jun 2022 15:49:20 +0000 (11:49 -0400)
Do not clear manipulate MSR_IA32_PERF_CAPABILITIES in intel_pmu_refresh(),
i.e. give userspace full control over capability/read-only MSRs.  KVM is
not a babysitter, it is userspace's responsiblity to provide a valid and
coherent vCPU model.

Attempting to "help" the guest by forcing a consistent model creates edge
cases, and ironicially leads to inconsistent behavior.

Example #1:  KVM doesn't do intel_pmu_refresh() when userspace writes
the MSR.

Example #2: KVM doesn't clear the bits when the PMU is disabled, or when
there's no architectural PMU.

Signed-off-by: Sean Christopherson <seanjc@google.com>
Message-Id: <20220611005755.753273-3-seanjc@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
arch/x86/kvm/vmx/pmu_intel.c

index 3b324ce0b14271605d66f9235478c88bfbd0fc88..b620127662261a81ea3a0ff2948bbcf40941d854 100644 (file)
@@ -619,8 +619,6 @@ static void intel_pmu_refresh(struct kvm_vcpu *vcpu)
                        pmu->pebs_enable_mask =
                                ~((1ull << pmu->nr_arch_gp_counters) - 1);
                }
-       } else {
-               vcpu->arch.perf_capabilities &= ~PERF_CAP_PEBS_MASK;
        }
 }