Skip to content

KVM: x86/pmu: selftests: Fixes and new tests

Sean Christopherson kvm lkml 6 versions – Applied

Status from this message: Applied to kvm-x86 pmu, with the fix for the file goof Andrew pointed out.

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v10 Latest29 patches 12 repliesApplied
  2. v928 patches 6 repliesSuperseded
  3. v826 patches 10 repliesSuperseded
Earlier versions · 3
VersionPostedPatchesRepliesStatus
v719 patches18 repliesSuperseded
v620 patches22 repliesSuperseded
v513 patches11 repliesSuperseded

Changes in v10 from the cover letter

- Collect review. [Dapeng]
- Treat the FIXED type in RDPMC's ECX as a value, not a flag. [Jim]

Patches in v10 Applied

#Subject and filesSizeRepliesApplied
1/29KVM: x86/pmu: Always treat Fixed counters as available when supportedarch/x86/kvm/vmx/pmu_intel.c+14 -10 replies
2/29KVM: x86/pmu: Allow programming events that match unsupported arch eventsarch/x86/include/asm/kvm-x86-pmu-ops.h arch/x86/kvm/pmu.c arch/x86/kvm/pmu.h +2 more+0 -470 replies
3/29KVM: x86/pmu: Remove KVM's enumeration of Intel's architectural encodingsarch/x86/kvm/vmx/pmu_intel.c+23 -490 replies
4/29KVM: x86/pmu: Setup fixed counters' eventsel during PMU initializationarch/x86/kvm/vmx/pmu_intel.c+5 -110 replies
5/29KVM: x86/pmu: Get eventsel for fixed counters from perfarch/x86/kvm/vmx/pmu_intel.c+17 -130 replies
6/29KVM: x86/pmu: Don't ignore bits 31:30 for RDPMC index on AMDarch/x86/kvm/svm/pmu.c+1 -30 replies
7/29KVM: x86/pmu: Prioritize VMX interception over #GP on RDPMC due to bad indexarch/x86/include/asm/kvm-x86-pmu-ops.h arch/x86/kvm/emulate.c arch/x86/kvm/kvm_emulate.h +5 more+27 -290 replies
8/29KVM: x86/pmu: Apply "fast" RDPMC only to Intel PMUsarch/x86/kvm/pmu.c arch/x86/kvm/vmx/pmu_intel.c+15 -40 replies
9/29KVM: x86/pmu: Disallow "fast" RDPMC for architectural Intel PMUsarch/x86/kvm/vmx/pmu_intel.c+18 -40 replies
10/29KVM: x86/pmu: Treat "fixed" PMU type in RDPMC as index as a value, not flagarch/x86/kvm/vmx/pmu_intel.c+11 -30 replies
11/29KVM: x86/pmu: Explicitly check for RDPMC of unsupported Intel PMC typesarch/x86/kvm/vmx/pmu_intel.c+15 -61 reply
12/29KVM: selftests: Add vcpu_set_cpuid_property() to set propertiestools/testing/selftests/kvm/include/x86_64/processor.h tools/testing/selftests/kvm/lib/x86_64/processor.c tools/testing/selftests/kvm/x86_64/smaller_maxphyaddr_emulation_test.c+16 -50 replies
13/29KVM: selftests: Drop the "name" param from KVM_X86_PMU_FEATURE()tools/testing/selftests/kvm/include/x86_64/processor.h+2 -20 replies
14/29KVM: selftests: Extend {kvm,this}_pmu_has() to support fixed counterstools/testing/selftests/kvm/include/x86_64/processor.h+47 -180 replies
15/29KVM: selftests: Add pmu.h and lib/pmu.c for common PMU assetstools/testing/selftests/kvm/Makefile tools/testing/selftests/kvm/include/pmu.h tools/testing/selftests/kvm/lib/pmu.c +1 more+173 -972 replies
16/29KVM: selftests: Test Intel PMU architectural events on gp counterstools/testing/selftests/kvm/Makefile tools/testing/selftests/kvm/x86_64/pmu_counters_test.c+322 -07 replies
17/29KVM: selftests: Test Intel PMU architectural events on fixed counterstools/testing/selftests/kvm/x86_64/pmu_counters_test.c+45 -90 replies
18/29KVM: selftests: Test consistency of CPUID with num of gp counterstools/testing/selftests/kvm/x86_64/pmu_counters_test.c+99 -00 replies
19/29KVM: selftests: Test consistency of CPUID with num of fixed counterstools/testing/selftests/kvm/x86_64/pmu_counters_test.c+57 -30 replies
20/29KVM: selftests: Add functional test for Intel's fixed PMU counterstools/testing/selftests/kvm/x86_64/pmu_counters_test.c+30 -10 replies
21/29KVM: selftests: Expand PMU counters test to verify LLC eventstools/testing/selftests/kvm/x86_64/pmu_counters_test.c+40 -190 replies
22/29KVM: selftests: Add a helper to query if the PMU module param is enabledtools/testing/selftests/kvm/include/x86_64/processor.h tools/testing/selftests/kvm/x86_64/pmu_counters_test.c tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c +1 more+8 -30 replies
23/29KVM: selftests: Add helpers to read integer module paramstools/testing/selftests/kvm/include/kvm_util_base.h tools/testing/selftests/kvm/lib/kvm_util.c+60 -60 replies
24/29KVM: selftests: Query module param to detect FEP in MSR filtering testtools/testing/selftests/kvm/include/x86_64/processor.h tools/testing/selftests/kvm/x86_64/userspace_msr_exit_test.c+14 -180 replies
25/29KVM: selftests: Move KVM_FEP macro into common library headertools/testing/selftests/kvm/include/x86_64/processor.h tools/testing/selftests/kvm/x86_64/userspace_msr_exit_test.c+3 -20 replies
26/29KVM: selftests: Test PMC virtualization with forced emulationtools/testing/selftests/kvm/x86_64/pmu_counters_test.c+30 -140 replies
27/29KVM: selftests: Add a forced emulation variation of KVM_ASM_SAFE()tools/testing/selftests/kvm/include/x86_64/processor.h+28 -20 replies
28/29KVM: selftests: Add helpers for safe and safe+forced RDMSR, RDPMC, and XGETBVtools/testing/selftests/kvm/include/x86_64/processor.h+27 -130 replies
29/29KVM: selftests: Extend PMU counters test to validate RDPMC after WRMSRtools/testing/selftests/kvm/x86_64/pmu_counters_test.c+41 -00 replies

Reviews trailers per patch

13 of 29 patches have a Reviewed-by or Acked-by.

PatchDapeng MiJim MattsonKan Liang
SeriesT-b
1/29
2/29R-b R-b R-b
3/29
4/29
5/29R-b
6/29
7/29
8/29R-b
9/29R-b
10/29
11/29R-b
12/29R-b
13/29R-b
14/29
15/29
16/29
17/29R-b R-b
18/29
19/29R-b
20/29R-b
21/29R-b
22/29R-b
23/29
24/29
25/29
26/29R-b
27/29
28/29
29/29

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v10 thread

Cover letter [PATCH v10 00/29] KVM: x86/pmu: selftests: Fixes and new tests

Knock wood, _this_ is the final of fixes and tests for PMU counters. New in v10 is a small refactor to treat FIXED as a value, not a flag, when emulating RDPMC. Everything else is the same as v9 (although rebased, but there were no conflicts).

v10:
- Collect review. [Dapeng]
- Treat the FIXED type in RDPMC's ECX as a value, not a flag. [Jim]

v9:
- https://lore.kernel.org/all/[email protected]
- Collect reviews. [Dapeng, Kan]
- Fix a 63:31 => 63:32 typo in a changelog. [Dapeng]
- Actually check that forced emulation is enabled before trying to force emulation on RDPMC. [Jinrong]
- Fix the aformentioned priority inversion issue.
- Completely drop "support" for fast RDPMC, in quotes because KVM doesn't actually support RDPMC for non-architectural PMUs. I had left the code in v8 because I didn't fully grok what the early emulator check was doing, i.e. wasn't 100% confident it was dead code.

v8:
- https://lore.kernel.org/all/[email protected]
- Collect reviews. [Jim, Dapeng, Kan]
- Tweak names for the RDPMC flags in the selftests #defines.
- Get the event selectors used to virtualize fixed straight from perf instead of hardcoding the (wrong) selectors in KVM. [Kan]
- Rename an "eventsel" field to "event" for a patch that gets blasted away in the end anyways. [Jim]
- Add patches to fix RDPMC emulation and to test the behavior on Intel. I spot tested on AMD and spent ~30 minutes trying to squeeze in the bare minimum AMD support, but the PMU implementations between Intel and AMD are juuuust different enough to make adding AMD support non- trivial, and this series is already way too big.

v7:
- https://lore.kernel.org/all/[email protected]
- Drop patches that unnecessarily sanitized supported CPUID. [Jim]
- Purge the array of architectural event encodings. [Jim, Dapeng]
- Clean up pmu.h to remove useless macros, and make it easier to use the new macros. [Jim]
- Port more of pmu_event_filter_test.c to pmu.h macros. [Jim, Jinrong]
- Clean up test comments and error messages. [Jim]
- Sanity check the value provided to vcpu_set_cpuid_property(). [Jim]

v6:
- https://lore.kernel.org/all/[email protected]
- Test LLC references/misses with CFLUSH{OPT}. [Jim]
- Make the tests play nice without PERF_CAPABILITIES. [Mingwei]
- Don't squash eventsels that happen to match an unsupported arch event. [Kan]
- Test PMC counters with forced emulation (don't ask how long it took me to figure out how to read integer module params).

v5: https://lore.kernel.org/all/[email protected]
v4: https://lore.kernel.org/all/[email protected]
v3: https://lore.kernel.org/kvm/[email protected]

Jinrong Liang (7):
KVM: selftests: Add vcpu_set_cpuid_property() to set properties
KVM: selftests: Add pmu.h and lib/pmu.c for common PMU assets
KVM: selftests: Test Intel PMU architectural events on gp counters
KVM: selftests: Test Intel PMU architectural events on fixed counters
KVM: selftests: Test consistency of CPUID with num of gp counters
KVM: selftests: Test consistency of CPUID with num of fixed counters
KVM: selftests: Add functional test for Intel's fixed PMU counters

Sean Christopherson (22):
KVM: x86/pmu: Always treat Fixed counters as available when supported
KVM: x86/pmu: Allow programming events that match unsupported arch
events
KVM: x86/pmu: Remove KVM's enumeration of Intel's architectural
encodings
KVM: x86/pmu: Setup fixed counters' eventsel during PMU initialization
KVM: x86/pmu: Get eventsel for fixed counters from perf
KVM: x86/pmu: Don't ignore bits 31:30 for RDPMC index on AMD
KVM: x86/pmu: Prioritize VMX interception over #GP on RDPMC due to bad
index
KVM: x86/pmu: Apply "fast" RDPMC only to Intel PMUs
KVM: x86/pmu: Disallow "fast" RDPMC for architectural Intel PMUs
KVM: x86/pmu: Treat "fixed" PMU type in RDPMC as index as a value, not
flag
KVM: x86/pmu: Explicitly check for RDPMC of unsupported Intel PMC
types
KVM: selftests: Drop the "name" param from KVM_X86_PMU_FEATURE()
KVM: selftests: Extend {kvm,this}_pmu_has() to support fixed counters
KVM: selftests: Expand PMU counters test to verify LLC events
KVM: selftests: Add a helper to query if the PMU module param is
enabled
KVM: selftests: Add helpers to read integer module params
KVM: selftests: Query module param to detect FEP in MSR filtering test
KVM: selftests: Move KVM_FEP macro into common library header
KVM: selftests: Test PMC virtualization with forced emulation
KVM: selftests: Add a forced emulation variation of KVM_ASM_SAFE()
KVM: selftests: Add helpers for safe and safe+forced RDMSR, RDPMC, and
XGETBV
KVM: selftests: Extend PMU counters test to validate RDPMC after WRMSR

 arch/x86/include/asm/kvm-x86-pmu-ops.h        |   3 +-
 arch/x86/kvm/emulate.c                        |   2 +-
 arch/x86/kvm/kvm_emulate.h                    |   2 +-
 arch/x86/kvm/pmu.c                            |  20 +-
 arch/x86/kvm/pmu.h                            |   5 +-
 arch/x86/kvm/svm/pmu.c                        |  17 +-
 arch/x86/kvm/vmx/pmu_intel.c                  | 178 +++--
 arch/x86/kvm/x86.c                            |   9 +-
 tools/testing/selftests/kvm/Makefile          |   2 +
 .../selftests/kvm/include/kvm_util_base.h     |   4 +
 tools/testing/selftests/kvm/include/pmu.h     |  97 +++
 .../selftests/kvm/include/x86_64/processor.h  | 148 ++++-
 tools/testing/selftests/kvm/lib/kvm_util.c    |  62 +-
 tools/testing/selftests/kvm/lib/pmu.c         |  31 +
 .../selftests/kvm/lib/x86_64/processor.c      |  15 +-
 .../selftests/kvm/x86_64/pmu_counters_test.c  | 617 ++++++++++++++++++
 .../kvm/x86_64/pmu_event_filter_test.c        | 143 ++--
 .../smaller_maxphyaddr_emulation_test.c       |   2 +-
 .../kvm/x86_64/userspace_msr_exit_test.c      |  29 +-
 .../selftests/kvm/x86_64/vmx_pmu_caps_test.c  |   2 +-
 20 files changed, 1097 insertions(+), 291 deletions(-)
 create mode 100644 tools/testing/selftests/kvm/include/pmu.h
 create mode 100644 tools/testing/selftests/kvm/lib/pmu.c
 create mode 100644 tools/testing/selftests/kvm/x86_64/pmu_counters_test.c

base-commit: 1c6d984f523f67ecfad1083bb04c55d91977bb15

Signature · 1 line
2.43.0.472.g3155946c3a-goog