KVM: x86/pmu: Switch to new Intel CPU model defines

Use X86_MATCH_VFM(), which does Vendor checking in addition to Family and
Model checking, to do FMS-based detection of PEBS features.

No functional change intended.

Signed-off-by: Tony Luck <tony.luck@intel.com>
Link: https://lore.kernel.org/r/20240520224620.9480-9-tony.luck@intel.com
[sean: massage changelog]
Signed-off-by: Sean Christopherson <seanjc@google.com>

diff --git a/arch/x86/kvm/pmu.c b/arch/x86/kvm/pmu.c
index a593b03c9aed677efb34c5925c57887023bae0f4..938d01bede8074934ec1ec54fdcbee6961a2d871 100644 (file)
--- a/arch/x86/kvm/pmu.c
+++ b/arch/x86/kvm/pmu.c
@@ -34,16 +34,16 @@ EXPORT_SYMBOL_GPL(kvm_pmu_eventsel);
 
 /* Precise Distribution of Instructions Retired (PDIR) */
 static const struct x86_cpu_id vmx_pebs_pdir_cpu[] = {
-       X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_D, NULL),
-       X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_X, NULL),
+       X86_MATCH_VFM(INTEL_ICELAKE_D, NULL),
+       X86_MATCH_VFM(INTEL_ICELAKE_X, NULL),
        /* Instruction-Accurate PDIR (PDIR++) */
-       X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X, NULL),
+       X86_MATCH_VFM(INTEL_SAPPHIRERAPIDS_X, NULL),
        {}
 };
 
 /* Precise Distribution (PDist) */
 static const struct x86_cpu_id vmx_pebs_pdist_cpu[] = {
-       X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X, NULL),
+       X86_MATCH_VFM(INTEL_SAPPHIRERAPIDS_X, NULL),
        {}
 };