KVM: x86/pmu: Add support for AMD Host-Only/Guest-Only bits
Subsystems (5)
v2 cover KVM: x86/pmu: Add support for AMD Host-Only/Guest-Only bits
This series adds support for AMD's Host-Only and Guest-Only performance counter eventsel bits in KVM's mediated PMU passthrough implementation.
These bits allow an nSVM-enabled guest to configure performance counters that count only during L1 execution (Host-Only) or only during L2 execution (Guest-Only).
KVM updates the hardware event selector ENABLE bit at the following state transitions to ensure counters only count in the appropriate mode:
- EFER.SVME changes: Enable/disable Guest-Only counters
- Nested VMRUN: Disable Host-Only, enable Guest-Only counters
- Nested VMEXIT: Enable Host-Only, disable Guest-Only counters
v1: https://lore.kernel.org/kvm/[email protected]/
v1 -> v2:
- Fixed various style issues, including indentation, comment placement, and comparison to 0 [Sean]
- Replaced "hg_only" with "host_guest" [Sean]
- Reversed the polarity of the dormant/active logic [Sean]
- Removed the pmc_hostonly and pmc_guestonly bitmaps [Sean]
- Added a refresh helper that iterates over PMCs during transitions [Sean]
- Introduced svm_enter_guest_mode() and svm_leave_guest_mode() [Sean]
- Moved transition logic from VMRUN/VMEXIT emulation to the above [Sean]
- Moved architectural definitions in the selftest to pmu.h [Sean]
- Added a test for neither Host-Only nor Guest-Only [Sean]
- Refactored the selftest to program all 4 bit combinations simultaneously, reducing code replication [Sean]
Jim Mattson (5):
KVM: x86/pmu: Introduce amd_pmu_set_eventsel_hw()
KVM: x86/pmu: Disable Host-Only/Guest-Only events as appropriate for
vCPU state
KVM: x86/pmu: Refresh Host-Only/Guest-Only eventsel at nested
transitions
KVM: x86/pmu: Allow Host-Only/Guest-Only bits with nSVM and mediated
PMU
KVM: selftests: x86: Add svm_pmu_host_guest_test for
Host-Only/Guest-Only bits
arch/x86/include/asm/perf_event.h | 2 + arch/x86/kvm/svm/nested.c | 6 +- arch/x86/kvm/svm/pmu.c | 42 +++- arch/x86/kvm/svm/svm.c | 2 + arch/x86/kvm/svm/svm.h | 17 ++ tools/testing/selftests/kvm/Makefile.kvm | 1 + tools/testing/selftests/kvm/include/x86/pmu.h | 6 + .../kvm/x86/svm_pmu_host_guest_test.c | 199 ++++++++++++++++++ 8 files changed, 270 insertions(+), 5 deletions(-) create mode 100644 tools/testing/selftests/kvm/x86/svm_pmu_host_guest_test.c
base-commit: 1a424e9e0616db91010f08e5985bcc6edc504205
Signature · 1 line
2.53.0.rc1.225.gd81095ad13-goog
PATCH v2 1/5 KVM: x86/pmu: Introduce amd_pmu_set_eventsel_hw()
Extract the computation of eventsel_hw from amd_pmu_set_msr() into a separate helper function, amd_pmu_set_eventsel_hw().
No functional change intended.
--- arch/x86/kvm/svm/pmu.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
arch/x86/kvm/svm/pmu.c +7 -2
@@ -147,6 +147,12 @@ static int amd_pmu_get_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)return 1 ; } +static void amd_pmu_set_eventsel_hw (struct kvm_pmc *pmc) +{ + pmc->eventsel_hw = (pmc->eventsel & ~AMD64_EVENTSEL_HOSTONLY ) | +AMD64_EVENTSEL_GUESTONLY ; +} +static int amd_pmu_set_msr (struct kvm_vcpu *vcpu,struct msr_data *msr_info) {struct kvm_pmu *pmu =vcpu_to_pmu (vcpu);
@@ -166,8 +172,7 @@ static int amd_pmu_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) data &= ~pmu->reserved_bits;if (data != pmc->eventsel) { pmc->eventsel = data; - pmc->eventsel_hw = (data & ~AMD64_EVENTSEL_HOSTONLY ) | -AMD64_EVENTSEL_GUESTONLY ; +amd_pmu_set_eventsel_hw (pmc);kvm_pmu_request_counter_reprogram (pmc); }return 0 ;
Signature · 1 line
2.53.0.rc1.225.gd81095ad13-goog
PATCH v2 2/5 KVM: x86/pmu: Disable Host-Only/Guest-Only events as appropriate for vCPU state
In reply to Jim MattsonUpdate amd_pmu_set_eventsel_hw() to clear the event selector's hardware enable bit when the PMC should not count based on the guest's Host-Only and Guest-Only event selector bits and the current vCPU state.
--- arch/x86/include/asm/perf_event.h | 2 ++ arch/x86/kvm/svm/pmu.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+)
arch/x86/include/asm/perf_event.h +2 -0
@@ -58,6 +58,8 @@#define AMD64_EVENTSEL_INT_CORE_ENABLE (1ULL << 36)#define AMD64_EVENTSEL_GUESTONLY (1ULL << 40)#define AMD64_EVENTSEL_HOSTONLY (1ULL << 41) +#define AMD64_EVENTSEL_HOST_GUEST_MASK \ + (AMD64_EVENTSEL_HOSTONLY | AMD64_EVENTSEL_GUESTONLY)#define AMD64_EVENTSEL_INT_CORE_SEL_SHIFT 37#define AMD64_EVENTSEL_INT_CORE_SEL_MASK \
arch/x86/kvm/svm/pmu.c +18 -0
@@ -149,8 +149,26 @@ static int amd_pmu_get_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)static void amd_pmu_set_eventsel_hw (struct kvm_pmc *pmc) { +struct kvm_vcpu *vcpu = pmc->vcpu; +u64 host_guest_bits; + pmc->eventsel_hw = (pmc->eventsel & ~AMD64_EVENTSEL_HOSTONLY ) |AMD64_EVENTSEL_GUESTONLY ; + +if (!(pmc->eventsel &ARCH_PERFMON_EVENTSEL_ENABLE )) +return ; + +if (!(vcpu->arch.efer &EFER_SVME )) +return ; + + host_guest_bits = pmc->eventsel &AMD64_EVENTSEL_HOST_GUEST_MASK ; +if (!host_guest_bits || host_guest_bits ==AMD64_EVENTSEL_HOST_GUEST_MASK ) +return ; + +if (!!(host_guest_bits &AMD64_EVENTSEL_GUESTONLY ) ==is_guest_mode (vcpu)) +return ; + + pmc->eventsel_hw &= ~ARCH_PERFMON_EVENTSEL_ENABLE ; }static int amd_pmu_set_msr (struct kvm_vcpu *vcpu,struct msr_data *msr_info)
Signature · 1 line
2.53.0.rc1.225.gd81095ad13-goog
PATCH v2 3/5 KVM: x86/pmu: Refresh Host-Only/Guest-Only eventsel at nested transitions
In reply to Jim MattsonAdd amd_pmu_refresh_host_guest_eventsel_hw() to recalculate eventsel_hw for all PMCs based on the current vCPU state. This is needed because Host-Only and Guest-Only counters must be enabled/disabled at:
- SVME changes: When EFER.SVME is modified, counters with Guest-Only bits need their hardware enable state updated.
- Nested transitions: When entering or leaving guest mode, Host-Only counters should be disabled/enabled and Guest-Only counters should be enabled/disabled accordingly.
Introduce svm_enter_guest_mode() and svm_leave_guest_mode() wrappers that call enter_guest_mode()/leave_guest_mode() followed by the PMU refresh, ensuring the PMU state stays synchronized with guest mode transitions.
--- arch/x86/kvm/svm/nested.c | 6 +++--- arch/x86/kvm/svm/pmu.c | 12 ++++++++++++ arch/x86/kvm/svm/svm.c | 2 ++ arch/x86/kvm/svm/svm.h | 17 +++++++++++++++++ 4 files changed, 34 insertions(+), 3 deletions(-)
arch/x86/kvm/svm/nested.c +3 -3
@@ -757,7 +757,7 @@ static void nested_vmcb02_prepare_control(struct vcpu_svm *svm,nested_svm_transition_tlb_flush (vcpu);/* Enter Guest-Mode */ -enter_guest_mode (vcpu); +svm_enter_guest_mode (vcpu);/* * Filled at exit: exit_code, exit_info_1, exit_info_2, exit_int_info,
@@ -1136,7 +1136,7 @@ int nested_svm_vmexit(struct vcpu_svm *svm) vmcb12 = map.hva;/* Exit Guest-Mode */ -leave_guest_mode (vcpu); +svm_leave_guest_mode (vcpu); svm->nested.vmcb12_gpa =0 ;WARN_ON_ONCE (svm->nested.nested_run_pending);
@@ -1402,7 +1402,7 @@ void svm_leave_nested(struct kvm_vcpu *vcpu) svm->nested.nested_run_pending =0 ; svm->nested.vmcb12_gpa =INVALID_GPA ; -leave_guest_mode (vcpu); +svm_leave_guest_mode (vcpu);svm_switch_vmcb (svm, &svm->vmcb01);
arch/x86/kvm/svm/pmu.c +12 -0
@@ -171,6 +171,18 @@ static void amd_pmu_set_eventsel_hw(struct kvm_pmc *pmc) pmc->eventsel_hw &= ~ARCH_PERFMON_EVENTSEL_ENABLE ; } +void amd_pmu_refresh_host_guest_eventsel_hw (struct kvm_vcpu *vcpu) +{ +struct kvm_pmu *pmu =vcpu_to_pmu (vcpu); +int i; + +if (pmu->reserved_bits &AMD64_EVENTSEL_HOST_GUEST_MASK ) +return ; + +for (i =0 ; i < pmu->nr_arch_gp_counters; i++) +amd_pmu_set_eventsel_hw (&pmu->gp_counters[i]); +} +static int amd_pmu_set_msr (struct kvm_vcpu *vcpu,struct msr_data *msr_info) {struct kvm_pmu *pmu =vcpu_to_pmu (vcpu);
arch/x86/kvm/svm/svm.c +2 -0
@@ -244,6 +244,8 @@ int svm_set_efer(struct kvm_vcpu *vcpu, u64 efer)if (svm_gp_erratum_intercept && !sev_guest (vcpu->kvm))set_exception_intercept (svm,GP_VECTOR ); } + +amd_pmu_refresh_host_guest_eventsel_hw (vcpu); } svm->vmcb->save.efer = efer |EFER_SVME ;
arch/x86/kvm/svm/svm.h +17 -0
@@ -864,6 +864,23 @@ void sev_vcpu_deliver_sipi_vector(struct kvm_vcpu *vcpu, u8 vector);void sev_es_prepare_switch_to_guest (struct vcpu_svm *svm,struct sev_es_save_area *hostsa);void sev_es_unmap_ghcb (struct vcpu_svm *svm); + +/* pmu.c */ +void amd_pmu_refresh_host_guest_eventsel_hw (struct kvm_vcpu *vcpu); + + +static inline void svm_enter_guest_mode (struct kvm_vcpu *vcpu) +{ +enter_guest_mode (vcpu); +amd_pmu_refresh_host_guest_eventsel_hw (vcpu); +} + +static inline void svm_leave_guest_mode (struct kvm_vcpu *vcpu) +{ +leave_guest_mode (vcpu); +amd_pmu_refresh_host_guest_eventsel_hw (vcpu); +} +#ifdef CONFIG_KVM_AMD_SEV int sev_mem_enc_ioctl (struct kvm *kvm,void __user *argp); int sev_mem_enc_register_region(struct kvm *kvm,
Signature · 1 line
2.53.0.rc1.225.gd81095ad13-goog
Re: [PATCH v2 3/5] KVM: x86/pmu: Refresh Host-Only/Guest-Only eventsel at nested transitions
Quoted 28 lines · Jim Mattson
Add
amd_pmu_refresh_host_guest_eventsel_hw()to recalculateeventsel_hwfor all PMCs based on the current vCPU state. This is needed because Host-Only and Guest-Only counters must be enabled/disabled at:- SVME changes: When EFER.SVME is modified, counters with Guest-Only bits need their hardware enable state updated.
- Nested transitions: When entering or leaving guest mode, Host-Only counters should be disabled/enabled and Guest-Only counters should be enabled/disabled accordingly.
Introduce
svm_enter_guest_mode()andsvm_leave_guest_mode()wrappers that call enter_guest_mode()/leave_guest_mode() followed by the PMU refresh, ensuring the PMU state stays synchronized with guest mode transitions.Signed-off-by Jim Mattson <[email protected]>--- arch/x86/kvm/svm/nested.c | 6 +++--- arch/x86/kvm/svm/pmu.c | 12 ++++++++++++ arch/x86/kvm/svm/svm.c | 2 ++ arch/x86/kvm/svm/svm.h | 17 +++++++++++++++++ 4 files changed, 34 insertions(+), 3 deletions(-)arch/x86/kvm/svm/nested.c +0
-0
arch/x86/kvm/svm/nested.c static void nested_vmcb02_prepare_control(struct vcpu_svm *svm, · line 760
Quoted 5 lines
arch/x86/kvm/svm/nested.c +1
-1@@ -757,7 +757,7 @@ static void nested_vmcb02_prepare_control(struct vcpu_svm *svm,nested_svm_transition_tlb_flush (vcpu);/* Enter Guest-Mode */ -enter_guest_mode (vcpu); +svm_enter_guest_mode (vcpu);
FWIW, I think this name is a bit confusing because we also have enter_svm_guest_mode(). So we end up with:
enter_svm_guest_mode() -> nested_vmcb02_prepare_control() -> svm_enter_guest_mode() -> enter_guest_mode()
I actually have another proposed change [1] that moves enter_guest_mode() directly into enter_svm_guest_mode(), so the sequence would end up being:
enter_svm_guest_mode() -> svm_enter_guest_mode() -> enter_guest_mode()
Re: [PATCH v2 3/5] KVM: x86/pmu: Refresh Host-Only/Guest-Only eventsel at nested transitions
Quoted 39 lines · Yosry Ahmed
Quoted 28 lines · Jim Mattson
Add
amd_pmu_refresh_host_guest_eventsel_hw()to recalculateeventsel_hwfor all PMCs based on the current vCPU state. This is needed because Host-Only and Guest-Only counters must be enabled/disabled at:- SVME changes: When EFER.SVME is modified, counters with Guest-Only bits need their hardware enable state updated.
- Nested transitions: When entering or leaving guest mode, Host-Only counters should be disabled/enabled and Guest-Only counters should be enabled/disabled accordingly.
Introduce
svm_enter_guest_mode()andsvm_leave_guest_mode()wrappers that call enter_guest_mode()/leave_guest_mode() followed by the PMU refresh, ensuring the PMU state stays synchronized with guest mode transitions.Signed-off-by Jim Mattson <[email protected]>--- arch/x86/kvm/svm/nested.c | 6 +++--- arch/x86/kvm/svm/pmu.c | 12 ++++++++++++ arch/x86/kvm/svm/svm.c | 2 ++ arch/x86/kvm/svm/svm.h | 17 +++++++++++++++++ 4 files changed, 34 insertions(+), 3 deletions(-)arch/x86/kvm/svm/nested.c +0
-0arch/x86/kvm/svm/nested.c static void nested_vmcb02_prepare_control(struct vcpu_svm *svm, · line 760
Quoted 5 lines
arch/x86/kvm/svm/nested.c +1
-1@@ -757,7 +757,7 @@ static void nested_vmcb02_prepare_control(struct vcpu_svm *svm,nested_svm_transition_tlb_flush (vcpu);/* Enter Guest-Mode */ -enter_guest_mode (vcpu); +svm_enter_guest_mode (vcpu);FWIW, I think this name is a bit confusing because we also have
enter_svm_guest_mode(). So we end up with:
Quoted 8 lines
enter_svm_guest_mode()->nested_vmcb02_prepare_control()->svm_enter_guest_mode()->enter_guest_mode()I actually have another proposed change [1] that moves
enter_guest_mode()directly intoenter_svm_guest_mode(), so the sequence would end up being:
enter_svm_guest_mode()->svm_enter_guest_mode()->enter_guest_mode()
Yes, that is confusing. What if I renamed the existing function to something like svm_nested_switch_to_vmcb02()?
Alternatively, I could go back to introducing a new PMU_OP, call it from {enter,leave}_guest_mode(), and drop the wrappers.
Quoted 1 line
Re: [PATCH v2 3/5] KVM: x86/pmu: Refresh Host-Only/Guest-Only eventsel at nested transitions
Quoted 49 lines · Jim Mattson
Quoted 46 lines · Yosry Ahmed
On Thu, Jan 29, 2026 at 03:28:08PM -0800, Jim Mattson wrote:
Addamd_pmu_refresh_host_guest_eventsel_hw()to recalculateeventsel_hwfor all PMCs based on the current vCPU state. This is needed because Host-Only and Guest-Only counters must be enabled/disabled at:- SVME changes: When EFER.SVME is modified, counters with Guest-Only bits need their hardware enable state updated.
- Nested transitions: When entering or leaving guest mode, Host-Only counters should be disabled/enabled and Guest-Only counters should be enabled/disabled accordingly.
Introduce
svm_enter_guest_mode()andsvm_leave_guest_mode()wrappers that call enter_guest_mode()/leave_guest_mode() followed by the PMU refresh, ensuring the PMU state stays synchronized with guest mode transitions.Signed-off-by Jim Mattson <[email protected]>---
arch/x86/kvm/svm/nested.c | 6 +++--- arch/x86/kvm/svm/pmu.c | 12 ++++++++++++ arch/x86/kvm/svm/svm.c | 2 ++ arch/x86/kvm/svm/svm.h | 17 +++++++++++++++++ 4 files changed, 34 insertions(+), 3 deletions(-)diff --git
a/arch/x86/kvm/svm/nested.cb/arch/x86/kvm/svm/nested.cindexde90b104a0dd..a7d1901f256b100644
---a/arch/x86/kvm/svm/nested.c
+++b/arch/x86/kvm/svm/nested.c
@@ -757,7 +757,7 @@ static void nested_vmcb02_prepare_control(structvcpu_svm*svm,nested_svm_transition_tlb_flush(vcpu);/* Enter Guest-Mode */
-enter_guest_mode(vcpu);
+svm_enter_guest_mode(vcpu);FWIW, I think this name is a bit confusing because we also have
enter_svm_guest_mode(). So we end up with:
enter_svm_guest_mode()->nested_vmcb02_prepare_control()->svm_enter_guest_mode()->enter_guest_mode()I actually have another proposed change [1] that moves
enter_guest_mode()directly intoenter_svm_guest_mode(), so the sequence would end up being:
Quoted 7 lines
Quoted 2 lines
enter_svm_guest_mode()->svm_enter_guest_mode()->enter_guest_mode()Yes, that is confusing. What if I renamed the existing function to something like
svm_nested_switch_to_vmcb02()?Alternatively, I could go back to introducing a new
PMU_OP, call it from {enter,leave}_guest_mode(), and drop the wrappers.
We could just call amd_pmu_refresh_host_guest_eventsel_hw() every time we call enter_guest_mode() and leave_guest_mode(), which is more error-prone but there's already other things in that category.
We could also call it from svm_switch_vmcb(), which will add some calls to extra places but I assume that would be fine?
I personally prefer the former tbh, as it's otherwise easy to miss.
Quoted 5 lines
Quoted 4 lines
Re: [PATCH v2 3/5] KVM: x86/pmu: Refresh Host-Only/Guest-Only eventsel at nested transitions
Quoted 58 lines · Yosry Ahmed
Quoted 54 lines · Jim Mattson
Quoted 39 lines · Yosry Ahmed
On Thu, Jan 29, 2026 at 03:28:08PM -0800, Jim Mattson wrote:
Addamd_pmu_refresh_host_guest_eventsel_hw()to recalculateeventsel_hwfor all PMCs based on the current vCPU state. This is needed because Host-Only and Guest-Only counters must be enabled/disabled at:- SVME changes: When EFER.SVME is modified, counters with Guest-Only bits need their hardware enable state updated.
- Nested transitions: When entering or leaving guest mode, Host-Only counters should be disabled/enabled and Guest-Only counters should be enabled/disabled accordingly.
Introduce
svm_enter_guest_mode()andsvm_leave_guest_mode()wrappers that call enter_guest_mode()/leave_guest_mode() followed by the PMU refresh, ensuring the PMU state stays synchronized with guest mode transitions.Signed-off-by Jim Mattson <[email protected]>---
arch/x86/kvm/svm/nested.c | 6 +++--- arch/x86/kvm/svm/pmu.c | 12 ++++++++++++ arch/x86/kvm/svm/svm.c | 2 ++ arch/x86/kvm/svm/svm.h | 17 +++++++++++++++++ 4 files changed, 34 insertions(+), 3 deletions(-)diff --git
a/arch/x86/kvm/svm/nested.cb/arch/x86/kvm/svm/nested.cindexde90b104a0dd..a7d1901f256b100644
---a/arch/x86/kvm/svm/nested.c
+++b/arch/x86/kvm/svm/nested.c
@@ -757,7 +757,7 @@ static void nested_vmcb02_prepare_control(structvcpu_svm*svm,nested_svm_transition_tlb_flush(vcpu);/* Enter Guest-Mode */
-enter_guest_mode(vcpu);
+svm_enter_guest_mode(vcpu);FWIW, I think this name is a bit confusing because we also have
enter_svm_guest_mode(). So we end up with:Quoted 9 lines
enter_svm_guest_mode()->nested_vmcb02_prepare_control()->svm_enter_guest_mode()->enter_guest_mode()I actually have another proposed change [1] that moves
enter_guest_mode()directly intoenter_svm_guest_mode(), so the sequence would end up being:
enter_svm_guest_mode()->svm_enter_guest_mode()->enter_guest_mode()Yes, that is confusing. What if I renamed the existing function to something like
svm_nested_switch_to_vmcb02()?
Quoted 8 lines
Quoted 2 lines
Alternatively, I could go back to introducing a new
PMU_OP, call it from {enter,leave}_guest_mode(), and drop the wrappers.We could just call
amd_pmu_refresh_host_guest_eventsel_hw()every time we callenter_guest_mode()andleave_guest_mode(), which is more error-prone but there's already other things in that category.We could also call it from
svm_switch_vmcb(), which will add some calls to extra places but I assume that would be fine?I personally prefer the former tbh, as it's otherwise easy to miss.
I'm not a fan of replicating code sequences. Maybe instead of a new PMU_OP, I could introduce a new KVM_X86_OP, which would be conceptually more general, even though the current usage would be the same.
Quoted 5 lines
Quoted 5 lines
Quoted 4 lines
PATCH v2 4/5 KVM: x86/pmu: Allow Host-Only/Guest-Only bits with nSVM and mediated PMU
In reply to Jim MattsonIf the vCPU advertises SVM and uses the mediated PMU, allow the guest to set the Host-Only and Guest-Only bits in the event selector MSRs.
--- arch/x86/kvm/svm/pmu.c | 3 +++ 1 file changed, 3 insertions(+)
arch/x86/kvm/svm/pmu.c +3 -0
@@ -243,6 +243,9 @@ static void amd_pmu_refresh(struct kvm_vcpu *vcpu) pmu->counter_bitmask[KVM_PMC_GP ] =BIT_ULL (48 ) -1 ; pmu->reserved_bits =0xfffffff000280000ull ; +if (guest_cpu_cap_has (vcpu,X86_FEATURE_SVM ) && +kvm_vcpu_has_mediated_pmu (vcpu)) + pmu->reserved_bits &= ~AMD64_EVENTSEL_HOST_GUEST_MASK ; pmu->raw_event_mask =AMD64_RAW_EVENT_MASK ;/* not applicable to AMD; but clean them to prevent any fall out */ pmu->counter_bitmask[KVM_PMC_FIXED ] =0 ;
Signature · 1 line
2.53.0.rc1.225.gd81095ad13-goog
PATCH v2 5/5 KVM: selftests: x86: Add svm_pmu_host_guest_test for Host-Only/Guest-Only bits
In reply to Jim MattsonAdd a selftest to verify KVM correctly virtualizes the AMD PMU Host-Only (bit 41) and Guest-Only (bit 40) event selector bits across all relevant SVM state transitions.
The test programs 4 PMCs simultaneously with all combinations of the Host-Only and Guest-Only bits, then verifies correct counting behavior:
1. SVME=0: all counters count (Host-Only/Guest-Only bits ignored)
2. Set SVME=1: Host-Only and neither/both count; Guest-Only stops
3. VMRUN to L2: Guest-Only and neither/both count; Host-Only stops
4. VMEXIT to L1: Host-Only and neither/both count; Guest-Only stops
5. Clear SVME=0: all counters count (bits ignored again)
--- tools/testing/selftests/kvm/Makefile.kvm | 1 + tools/testing/selftests/kvm/include/x86/pmu.h | 6 + .../kvm/x86/svm_pmu_host_guest_test.c | 199 ++++++++++++++++++ 3 files changed, 206 insertions(+) create mode 100644 tools/testing/selftests/kvm/x86/svm_pmu_host_guest_test.c
tools/testing/selftests/kvm/Makefile.kvm +1 -0
@@ -112,6 +112,7 @@ TEST_GEN_PROGS_x86 += x86/svm_vmcall_test TEST_GEN_PROGS_x86 += x86/svm_int_ctl_test TEST_GEN_PROGS_x86 += x86/svm_nested_shutdown_test TEST_GEN_PROGS_x86 += x86/svm_nested_soft_inject_test +TEST_GEN_PROGS_x86 += x86/svm_pmu_host_guest_test TEST_GEN_PROGS_x86 += x86/tsc_scaling_sync TEST_GEN_PROGS_x86 += x86/sync_regs_test TEST_GEN_PROGS_x86 += x86/ucna_injection_test
tools/testing/selftests/kvm/include/x86/pmu.h +6 -0
@@ -38,6 +38,12 @@#define ARCH_PERFMON_EVENTSEL_INV BIT_ULL(23)#define ARCH_PERFMON_EVENTSEL_CMASK GENMASK_ULL(31, 24) +/* +* These are AMD-specific bits. +*/ +#define AMD64_EVENTSEL_GUESTONLY BIT_ULL(40) +#define AMD64_EVENTSEL_HOSTONLY BIT_ULL(41) +/* RDPMC control flags, Intel only. */ #define INTEL_RDPMC_METRICS BIT_ULL(29)#define INTEL_RDPMC_FIXED BIT_ULL(30)
tools/testing/selftests/kvm/x86/svm_pmu_host_guest_test.c new file +199 -0
199 lines not on this page · raw message
Signature · 1 line
2.53.0.rc1.225.gd81095ad13-goog