v7 of AMD PMU v2 support.  This includes the global_ovf_ctrl_mask =>
global_status_mask rename that I *just* posted.  I really wanted to apply
v6 and be done with this series, and so sent it out separately, but the
code movement from pmu_intel.c to common x86 was too buggy to do in fixup.

Lightly tested (it's late, it's Friday).

v7:
 - Massage/rewrite changelogs to use preferred style.
 - Actually move PERF_GLOBAL_CTRL and friends out of pmu_intel.c.
 - Move intel_pmu_has_perf_global_ctrl() to common code instead of open
   coding it.
 - Split moving pmc_is_enabled() out to a separate patch.
 - Rebase on the s/global_ovf_ctrl_mask/global_status_mask rename

v6: https://lore.kernel.org/all/20230530060423.32361-1-likexu@tencent.com
v5: https://lore.kernel.org/all/20230410105056.60973-1-likexu@tencent.com
v4: https://lore.kernel.org/kvm/20230214050757.9623-1-likexu@tencent.com

Like Xu (11):
  KVM: x86/pmu: Move reprogram_counters() to pmu.h
  KVM: x86/pmu: Reject userspace attempts to set reserved GLOBAL_STATUS
    bits
  KVM: x86/pmu: Move handling PERF_GLOBAL_CTRL and friends to common x86
  KVM: x86/pmu: Provide Intel PMU's pmc_is_enabled() as generic x86 code
  KVM: x86: Explicitly zero cpuid "0xa" leaf when PMU is disabled
  KVM: x86/pmu: Disable vPMU if the minimum num of counters isn't met
  KVM: x86/pmu: Advertise PERFCTR_CORE iff the min nr of counters is met
  KVM: x86/pmu: Constrain the num of guest counters with kvm_pmu_cap
  KVM: x86/cpuid: Add a KVM-only leaf to redirect AMD PerfMonV2 flag
  KVM: x86/svm/pmu: Add AMD PerfMonV2 support
  KVM: x86/cpuid: Add AMD CPUID ExtPerfMonAndDbg leaf 0x80000022

Sean Christopherson (1):
  KVM: x86/pmu: Rename global_ovf_ctrl_mask to global_status_mask

 arch/x86/include/asm/kvm-x86-pmu-ops.h |  1 -
 arch/x86/include/asm/kvm_host.h        |  2 +-
 arch/x86/kvm/cpuid.c                   | 30 ++++++++-
 arch/x86/kvm/pmu.c                     | 92 +++++++++++++++++++++++---
 arch/x86/kvm/pmu.h                     | 56 ++++++++++++++--
 arch/x86/kvm/reverse_cpuid.h           |  7 ++
 arch/x86/kvm/svm/pmu.c                 | 68 +++++++++++++------
 arch/x86/kvm/svm/svm.c                 | 19 +++++-
 arch/x86/kvm/vmx/nested.c              |  4 +-
 arch/x86/kvm/vmx/pmu_intel.c           | 77 ++++-----------------
 arch/x86/kvm/vmx/vmx.h                 | 12 ----
 arch/x86/kvm/x86.c                     | 10 +++
 12 files changed, 260 insertions(+), 118 deletions(-)


base-commit: b9846a698c9aff4eb2214a06ac83638ad098f33f
-- 
2.41.0.rc2.161.g9c6817b8e7-goog

On Fri, 02 Jun 2023 18:10:46 -0700, Sean Christopherson wrote:
> v7 of AMD PMU v2 support.  This includes the global_ovf_ctrl_mask =>
> global_status_mask rename that I *just* posted.  I really wanted to apply
> v6 and be done with this series, and so sent it out separately, but the
> code movement from pmu_intel.c to common x86 was too buggy to do in fixup.
> 
> Lightly tested (it's late, it's Friday).
> 
> [...]

Somewhat speculatively applied to kvm-x86 pmu.  I'd really like to get a thumbs
up that I didn't break anything, but I'm OOO later this week and want to get
this into linux-next before I go offline.  Holler if something is broken, this
is the only thing sitting in "pmu" so it should be easy to massage if necessary.

Thanks!

[01/12] KVM: x86/pmu: Rename global_ovf_ctrl_mask to global_status_mask
        https://github.com/kvm-x86/linux/commit/53550b89220b
[02/12] KVM: x86/pmu: Move reprogram_counters() to pmu.h
        https://github.com/kvm-x86/linux/commit/8de18543dfe3
[03/12] KVM: x86/pmu: Reject userspace attempts to set reserved GLOBAL_STATUS bits
        https://github.com/kvm-x86/linux/commit/30dab5c0b65e
[04/12] KVM: x86/pmu: Move handling PERF_GLOBAL_CTRL and friends to common x86
        https://github.com/kvm-x86/linux/commit/c85cdc1cc1ea
[05/12] KVM: x86/pmu: Provide Intel PMU's pmc_is_enabled() as generic x86 code
        https://github.com/kvm-x86/linux/commit/13afa29ae489
[06/12] KVM: x86: Explicitly zero cpuid "0xa" leaf when PMU is disabled
        https://github.com/kvm-x86/linux/commit/6593039d33c1
[07/12] KVM: x86/pmu: Disable vPMU if the minimum num of counters isn't met
        https://github.com/kvm-x86/linux/commit/6a08083f294c
[08/12] KVM: x86/pmu: Advertise PERFCTR_CORE iff the min nr of counters is met
        https://github.com/kvm-x86/linux/commit/d338d8789e64
[09/12] KVM: x86/pmu: Constrain the num of guest counters with kvm_pmu_cap
        https://github.com/kvm-x86/linux/commit/1c2bf8a6b045
[10/12] KVM: x86/cpuid: Add a KVM-only leaf to redirect AMD PerfMonV2 flag
        https://github.com/kvm-x86/linux/commit/fe8d76c1a6f0
[11/12] KVM: x86/svm/pmu: Add AMD PerfMonV2 support
        https://github.com/kvm-x86/linux/commit/4a2771895ca6
[12/12] KVM: x86/cpuid: Add AMD CPUID ExtPerfMonAndDbg leaf 0x80000022
        https://github.com/kvm-x86/linux/commit/94cdeebd8211

--
https://github.com/kvm-x86/linux/tree/next
https://github.com/kvm-x86/linux/tree/fixes