KVM: selftests: aarch64: Introduce pmu_event_filter_test
v3 cover KVM: selftests: aarch64: Introduce pmu_event_filter_test
The test is inspired by the pmu_event_filter_test which implemented by x86. On the arm64 platform, there is the same ability to set the pmu_event_filter through the KVM_ARM_VCPU_PMU_V3_FILTER attribute. So add the test for arm64.
The series first move some pmu common code from vpmu_counter_access to lib/aarch64/vpmu.c and include/aarch64/vpmu.h, which can be used by pmu_event_filter_test. Then fix a bug related to the [enable|disable]_counter, and at last, implement the test itself.
Changelog:
----------v2->v3:
- Check the pmceid in guest code instead of pmu event count since different hardware may have different event count result, check pmceid makes it stable
on different platform. [Eric]
- Some typo fixed and commit message improved.
v1->v2:
- Improve the commit message. [Eric]
- Fix the bug in [enable|disable]_counter. [Raghavendra & Marc]
- Add the check if kvm has attr KVM_ARM_VCPU_PMU_V3_FILTER.
- Add if host pmu support the test event throught pmceid0.
- Split the test_invalid_filter() to another patch. [Eric]
v1: https://lore.kernel.org/all/[email protected]/
v2: https://lore.kernel.org/all/[email protected]/
Shaoqin Huang (5):
KVM: selftests: aarch64: Make the [create|destroy]_vpmu_vm() public
KVM: selftests: aarch64: Move pmu helper functions into vpmu.h
KVM: selftests: aarch64: Fix the buggy [enable|disable]_counter
KVM: selftests: aarch64: Introduce pmu_event_filter_test
KVM: selftests: aarch64: Add invalid filter test in
pmu_event_filter_test
tools/testing/selftests/kvm/Makefile | 2 + .../kvm/aarch64/pmu_event_filter_test.c | 255 ++++++++++++++++++ .../kvm/aarch64/vpmu_counter_access.c | 218 ++------------- .../selftests/kvm/include/aarch64/vpmu.h | 135 ++++++++++ .../testing/selftests/kvm/lib/aarch64/vpmu.c | 74 +++++ 5 files changed, 490 insertions(+), 194 deletions(-) create mode 100644 tools/testing/selftests/kvm/aarch64/pmu_event_filter_test.c create mode 100644 tools/testing/selftests/kvm/include/aarch64/vpmu.h create mode 100644 tools/testing/selftests/kvm/lib/aarch64/vpmu.c
Signature · 1 line
2.40.1
PATCH v3 1/5 KVM: selftests: aarch64: Make the [create|destroy]_vpmu_vm() public
Move the implementation of [create|destroy]_vpmu_vm() into lib/aarch64/pmu.c and export their declaration in a header so they can be reused by other tests.
The sync exception handler install is test specific so we move it out of the helper function.
No functional change intended.
--- tools/testing/selftests/kvm/Makefile | 1 + .../kvm/aarch64/vpmu_counter_access.c | 100 +++++------------- .../selftests/kvm/include/aarch64/vpmu.h | 16 +++ .../testing/selftests/kvm/lib/aarch64/vpmu.c | 64 +++++++++++ 4 files changed, 105 insertions(+), 76 deletions(-) create mode 100644 tools/testing/selftests/kvm/include/aarch64/vpmu.h create mode 100644 tools/testing/selftests/kvm/lib/aarch64/vpmu.c
tools/testing/selftests/kvm/Makefile +1 -0
@@ -57,6 +57,7 @@ LIBKVM_aarch64 += lib/aarch64/processor.c LIBKVM_aarch64 += lib/aarch64/spinlock.c LIBKVM_aarch64 += lib/aarch64/ucall.c LIBKVM_aarch64 += lib/aarch64/vgic.c +LIBKVM_aarch64 += lib/aarch64/vpmu.c LIBKVM_s390x += lib/s390x/diag318_test_handler.c LIBKVM_s390x += lib/s390x/processor.c
tools/testing/selftests/kvm/aarch64/vpmu_counter_access.c +24 -76
171 lines not on this page · raw message
tools/testing/selftests/kvm/include/aarch64/vpmu.h new file +16 -0
@@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#include <kvm_util.h> + +#define GICD_BASE_GPA 0x8000000ULL +#define GICR_BASE_GPA 0x80A0000ULL + +struct vpmu_vm { +struct kvm_vm *vm; +struct kvm_vcpu *vcpu; +int gic_fd; +}; + +struct vpmu_vm *create_vpmu_vm (void *guest_code); + +void destroy_vpmu_vm (struct vpmu_vm *vpmu_vm);
tools/testing/selftests/kvm/lib/aarch64/vpmu.c new file +64 -0
64 lines not on this page · raw message
Signature · 1 line
2.40.1
PATCH v3 2/5 KVM: selftests: aarch64: Move pmu helper functions into vpmu.h
In reply to Shaoqin HuangMove those pmu helper functions into include/aarch64/vpmu.h, thus it can be used by other pmu test.
No functional change intended.
--- .../kvm/aarch64/vpmu_counter_access.c | 118 ----------------- .../selftests/kvm/include/aarch64/vpmu.h | 119 ++++++++++++++++++ 2 files changed, 119 insertions(+), 118 deletions(-)
tools/testing/selftests/kvm/aarch64/vpmu_counter_access.c +0 -118
@@ -20,12 +20,6 @@#include <perf/arm_pmuv3.h> #include <linux/bitfield.h> -/* The max number of the PMU event counters (excluding the cycle counter) */ -#define ARMV8_PMU_MAX_GENERAL_COUNTERS (ARMV8_PMU_MAX_COUNTERS - 1) - -/* The cycle counter bit position that's common among the PMU registers */ -#define ARMV8_PMU_CYCLE_IDX 31 -static struct vpmu_vm *vpmu_vm;struct pmreg_sets {
@@ -35,118 +29,6 @@ struct pmreg_sets {#define PMREG_SET (set, clr) {.set_reg_id = set, .clr_reg_id = clr} -static uint64_t get_pmcr_n (uint64_t pmcr) -{ -return (pmcr >>ARMV8_PMU_PMCR_N_SHIFT ) &ARMV8_PMU_PMCR_N_MASK ; -} - -static void set_pmcr_n (uint64_t *pmcr,uint64_t pmcr_n) -{ - *pmcr = *pmcr & ~(ARMV8_PMU_PMCR_N_MASK <<ARMV8_PMU_PMCR_N_SHIFT ); - *pmcr |= (pmcr_n <<ARMV8_PMU_PMCR_N_SHIFT ); -} - -static uint64_t get_counters_mask (uint64_t n) -{ -uint64_t mask =BIT (ARMV8_PMU_CYCLE_IDX ); - -if (n) - mask |=GENMASK (n -1 ,0 ); -return mask; -} - -/* Read PMEVTCNTR<n>_EL0 through PMXEVCNTR_EL0 */ -static inline unsigned long read_sel_evcntr (int sel) -{ -write_sysreg (sel, pmselr_el0); -isb (); -return read_sysreg (pmxevcntr_el0); -} - -/* Write PMEVTCNTR<n>_EL0 through PMXEVCNTR_EL0 */ -static inline void write_sel_evcntr (int sel,unsigned long val) -{ -write_sysreg (sel, pmselr_el0); -isb (); -write_sysreg (val, pmxevcntr_el0); -isb (); -} - -/* Read PMEVTYPER<n>_EL0 through PMXEVTYPER_EL0 */ -static inline unsigned long read_sel_evtyper (int sel) -{ -write_sysreg (sel, pmselr_el0); -isb (); -return read_sysreg (pmxevtyper_el0); -} - -/* Write PMEVTYPER<n>_EL0 through PMXEVTYPER_EL0 */ -static inline void write_sel_evtyper (int sel,unsigned long val) -{ -write_sysreg (sel, pmselr_el0); -isb (); -write_sysreg (val, pmxevtyper_el0); -isb (); -} - -static inline void enable_counter (int idx) -{ -uint64_t v =read_sysreg (pmcntenset_el0); - -write_sysreg (BIT (idx) | v, pmcntenset_el0); -isb (); -} - -static inline void disable_counter (int idx) -{ -uint64_t v =read_sysreg (pmcntenset_el0); - -write_sysreg (BIT (idx) | v, pmcntenclr_el0); -isb (); -} - -static void pmu_disable_reset (void ) -{ -uint64_t pmcr =read_sysreg (pmcr_el0); - -/* Reset all counters, disabling them */ - pmcr &= ~ARMV8_PMU_PMCR_E ; -write_sysreg (pmcr |ARMV8_PMU_PMCR_P , pmcr_el0); -isb (); -} - -#define RETURN_READ_PMEVCNTRN (n) \ - return read_sysreg(pmevcntr##n##_el0) -static unsigned long read_pmevcntrn (int n) -{ -PMEVN_SWITCH (n,RETURN_READ_PMEVCNTRN ); -return 0 ; -} - -#define WRITE_PMEVCNTRN (n) \ - write_sysreg(val, pmevcntr##n##_el0) -static void write_pmevcntrn (int n,unsigned long val) -{ -PMEVN_SWITCH (n,WRITE_PMEVCNTRN ); -isb (); -} - -#define READ_PMEVTYPERN (n) \ - return read_sysreg(pmevtyper##n##_el0) -static unsigned long read_pmevtypern (int n) -{ -PMEVN_SWITCH (n,READ_PMEVTYPERN ); -return 0 ; -} - -#define WRITE_PMEVTYPERN (n) \ - write_sysreg(val, pmevtyper##n##_el0) -static void write_pmevtypern (int n,unsigned long val) -{ -PMEVN_SWITCH (n,WRITE_PMEVTYPERN ); -isb (); -} -/* * The pmc_accessor structure has pointers to PMEV{CNTR,TYPER}<n>_EL0 * accessors that test cases will use. Each of the accessors will
tools/testing/selftests/kvm/include/aarch64/vpmu.h +119 -0
132 lines not on this page · raw message
Signature · 1 line
2.40.1
PATCH v3 3/5 KVM: selftests: aarch64: Fix the buggy [enable|disable]_counter
In reply to Shaoqin HuangIn general, the set/clr registers should always be used in their write form, never in a RMW form (imagine an interrupt disabling a counter between the read and the write...).
The current implementation of [enable|disable]_counter both use the RMW form, fix them by directly write to the set/clr registers.
At the same time, it also fix the buggy disable_counter() which would end up disabling all the counters.
--- tools/testing/selftests/kvm/include/aarch64/vpmu.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
tools/testing/selftests/kvm/include/aarch64/vpmu.h +2 -6
@@ -78,17 +78,13 @@ static inline void write_sel_evtyper(int sel, unsigned long val)static inline void enable_counter (int idx) { -uint64_t v =read_sysreg (pmcntenset_el0); - -write_sysreg (BIT (idx) | v, pmcntenset_el0); +write_sysreg (BIT (idx), pmcntenset_el0);isb (); }static inline void disable_counter (int idx) { -uint64_t v =read_sysreg (pmcntenset_el0); - -write_sysreg (BIT (idx) | v, pmcntenclr_el0); +write_sysreg (BIT (idx), pmcntenclr_el0);isb (); }
Signature · 1 line
2.40.1
PATCH v3 4/5 KVM: selftests: aarch64: Introduce pmu_event_filter_test
In reply to Shaoqin HuangIntroduce pmu_event_filter_test for arm64 platforms. The test configures PMUv3 for a vCPU, and sets different pmu event filters for the vCPU, and check if the guest can see those events which user allow and can't use those events which use deny.
This test refactor the create_vpmu_vm() and make it a wrapper for __create_vpmu_vm(), which allows some extra init code before KVM_ARM_VCPU_PMU_V3_INIT.
And this test use the KVM_ARM_VCPU_PMU_V3_FILTER attribute to set the pmu event filter in KVM. And choose to filter two common event branches_retired and instructions_retired, and let the guest to check if it see the right pmceid register.
--- tools/testing/selftests/kvm/Makefile | 1 + .../kvm/aarch64/pmu_event_filter_test.c | 219 ++++++++++++++++++ .../selftests/kvm/include/aarch64/vpmu.h | 4 + .../testing/selftests/kvm/lib/aarch64/vpmu.c | 14 +- 4 files changed, 236 insertions(+), 2 deletions(-) create mode 100644 tools/testing/selftests/kvm/aarch64/pmu_event_filter_test.c
tools/testing/selftests/kvm/Makefile +1 -0
@@ -155,6 +155,7 @@ TEST_GEN_PROGS_aarch64 += aarch64/arch_timer TEST_GEN_PROGS_aarch64 += aarch64/debug-exceptions TEST_GEN_PROGS_aarch64 += aarch64/hypercalls TEST_GEN_PROGS_aarch64 += aarch64/page_fault_test +TEST_GEN_PROGS_aarch64 += aarch64/pmu_event_filter_test TEST_GEN_PROGS_aarch64 += aarch64/psci_test TEST_GEN_PROGS_aarch64 += aarch64/set_id_regs TEST_GEN_PROGS_aarch64 += aarch64/smccc_filter
tools/testing/selftests/kvm/aarch64/pmu_event_filter_test.c new file +219 -0
219 lines not on this page · raw message
tools/testing/selftests/kvm/include/aarch64/vpmu.h +4 -0
@@ -18,6 +18,10 @@ struct vpmu_vm {int gic_fd; }; +struct vpmu_vm *__create_vpmu_vm (void *guest_code, +void (*init_pmu)(struct vpmu_vm *vm,void *arg), +void *arg); +struct vpmu_vm *create_vpmu_vm (void *guest_code);void destroy_vpmu_vm (struct vpmu_vm *vpmu_vm);
tools/testing/selftests/kvm/lib/aarch64/vpmu.c +12 -2
@@ -7,8 +7,9 @@#include <vpmu.h> #include <perf/arm_pmuv3.h> -/* Create a VM that has one vCPU with PMUv3 configured. */ -struct vpmu_vm *create_vpmu_vm (void *guest_code) +struct vpmu_vm *__create_vpmu_vm (void *guest_code, +void (*init_pmu)(struct vpmu_vm *vm,void *arg), +void *arg) {struct kvm_vcpu_init init;uint8_t pmuver;
@@ -50,12 +51,21 @@ struct vpmu_vm *create_vpmu_vm(void *guest_code) "Unexpected PMUVER (0x%x) on the vCPU with PMUv3", pmuver);/* Initialize vPMU */ +if (init_pmu) +init_pmu (vpmu_vm, arg); +vcpu_ioctl (vpmu_vm->vcpu,KVM_SET_DEVICE_ATTR , &irq_attr);vcpu_ioctl (vpmu_vm->vcpu,KVM_SET_DEVICE_ATTR , &init_attr);return vpmu_vm; } +/* Create a VM that has one vCPU with PMUv3 configured. */ +struct vpmu_vm *create_vpmu_vm (void *guest_code) +{ +return __create_vpmu_vm (guest_code,NULL ,NULL ); +} +void destroy_vpmu_vm (struct vpmu_vm *vpmu_vm) {close (vpmu_vm->gic_fd);
Signature · 1 line
2.40.1
PATCH v3 5/5 KVM: selftests: aarch64: Add invalid filter test in pmu_event_filter_test
In reply to Shaoqin HuangAdd the invalid filter test includes sets the filter beyond the event space and sets the invalid action to double check if the KVM_ARM_VCPU_PMU_V3_FILTER will return the expected error.
--- .../kvm/aarch64/pmu_event_filter_test.c | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+)
tools/testing/selftests/kvm/aarch64/pmu_event_filter_test.c +36 -0
@@ -7,6 +7,7 @@* This test checks if the guest only see the limited pmu event that userspace * sets, if the guest can use those events which user allow, and if the guest * can't use those events which user deny. +* It also checks that setting invalid filter ranges return the expected error. * This test runs only when KVM_CAP_ARM_PMU_V3, KVM_ARM_VCPU_PMU_V3_FILTER * is supported on the host. */
@@ -183,6 +184,39 @@ static void for_each_test(void)run_test (t); } +static void set_invalid_filter (struct vpmu_vm *vm,void *arg) +{ +struct kvm_pmu_event_filter invalid; +struct kvm_device_attr attr = { + .group =KVM_ARM_VCPU_PMU_V3_CTRL , + .attr =KVM_ARM_VCPU_PMU_V3_FILTER , + .addr = (uint64_t )&invalid, + }; +int ret =0 ; + +/* The max event number is (1 << 16), set a range largeer than it. */ + invalid =__DEFINE_FILTER (BIT (15 ),BIT (15 )+1 ,0 ); + ret =__vcpu_ioctl (vm->vcpu,KVM_SET_DEVICE_ATTR , &attr); +TEST_ASSERT (ret && errno ==EINVAL ,"Set Invalid filter range " +"ret = %d, errno = %d (expected ret = -1, errno = EINVAL)" , + ret, errno); + + ret =0 ; + +/* Set the Invalid action. */ + invalid =__DEFINE_FILTER (0 ,1 ,3 ); + ret =__vcpu_ioctl (vm->vcpu,KVM_SET_DEVICE_ATTR , &attr); +TEST_ASSERT (ret && errno ==EINVAL ,"Set Invalid filter action " +"ret = %d, errno = %d (expected ret = -1, errno = EINVAL)" , + ret, errno); +} + +static void test_invalid_filter (void ) +{ + vpmu_vm =__create_vpmu_vm (guest_code, set_invalid_filter,NULL ); +destroy_vpmu_vm (vpmu_vm); +} +static bool kvm_supports_pmu_event_filter (void ) {int r;
@@ -216,4 +250,6 @@ int main(void)TEST_REQUIRE (host_pmu_supports_events ()); for_each_test(); + +test_invalid_filter (); }
Signature · 1 line
2.40.1
Hi Shaoqin,
Quoted 8 lines · Shaoqin Huang
The test is inspired by the
pmu_event_filter_testwhich implemented by x86. On the arm64 platform, there is the same ability to set thepmu_event_filterthrough theKVM_ARM_VCPU_PMU_V3_FILTERattribute. So add the test for arm64.The series first move some pmu common code from
vpmu_counter_accesstolib/aarch64/vpmu.candinclude/aarch64/vpmu.h, which can be used bypmu_event_filter_test. Then fix a bug related to the [enable|disable]_counter, and at last, implement the test itself.
which branch does it apply on? I fail to apply on top on main.
Or can you provide a branch?
Eric
Quoted 37 lines
Changelog:
----------v2->v3:
- Check the pmceid in guest code instead of pmu event count since different hardware may have different event count result, check pmceid makes it stable
on different platform. [Eric]
- Some typo fixed and commit message improved.
v1->v2:
- Improve the commit message. [Eric]
- Fix the bug in [enable|disable]_counter. [Raghavendra & Marc]
- Add the check if kvm has attrKVM_ARM_VCPU_PMU_V3_FILTER.
- Add if host pmu support the test event throught pmceid0.
- Split thetest_invalid_filter()to another patch. [Eric]v1: https://lore.kernel.org/all/[email protected]/
v2: https://lore.kernel.org/all/[email protected]/Shaoqin Huang (5):
KVM: selftests: aarch64: Make the [create|destroy]_vpmu_vm() public
KVM: selftests: aarch64: Move pmu helper functions intovpmu.h
KVM: selftests: aarch64: Fix the buggy [enable|disable]_counter
KVM: selftests: aarch64: Introducepmu_event_filter_test
KVM: selftests: aarch64: Add invalid filter test in
pmu_event_filter_testtools/testing/selftests/kvm/Makefile | 2 + .../kvm/aarch64/pmu_event_filter_test.c | 255 ++++++++++++++++++ .../kvm/aarch64/vpmu_counter_access.c | 218 ++------------- .../selftests/kvm/include/aarch64/vpmu.h | 135 ++++++++++ .../testing/selftests/kvm/lib/aarch64/vpmu.c | 74 +++++ 5 files changed, 490 insertions(+), 194 deletions(-) create mode 100644 tools/testing/selftests/kvm/aarch64/pmu_event_filter_test.c create mode 100644 tools/testing/selftests/kvm/include/aarch64/vpmu.h create mode 100644 tools/testing/selftests/kvm/lib/aarch64/vpmu.c
Hi Eric,
Quoted 7 lines · Eric Auger
Hi Shaoqin,
Quoted 4 lines · Shaoqin Huang
The test is inspired by the
pmu_event_filter_testwhich implemented by x86. On the arm64 platform, there is the same ability to set thepmu_event_filterthrough theKVM_ARM_VCPU_PMU_V3_FILTERattribute. So add the test for arm64.
Quoted 7 lines
Quoted 4 lines
The series first move some pmu common code from
vpmu_counter_accesstolib/aarch64/vpmu.candinclude/aarch64/vpmu.h, which can be used bypmu_event_filter_test. Then fix a bug related to the [enable|disable]_counter, and at last, implement the test itself.which branch does it apply on? I fail to apply on top on main.
Or can you provide a branch?
This was based on v6.7.
Quoted 40 lines
Eric
Quoted 37 lines
Changelog:
----------v2->v3:
- Check the pmceid in guest code instead of pmu event count since different hardware may have different event count result, check pmceid makes it stable
on different platform. [Eric]
- Some typo fixed and commit message improved.
v1->v2:
- Improve the commit message. [Eric]
- Fix the bug in [enable|disable]_counter. [Raghavendra & Marc]
- Add the check if kvm has attrKVM_ARM_VCPU_PMU_V3_FILTER.
- Add if host pmu support the test event throught pmceid0.
- Split thetest_invalid_filter()to another patch. [Eric]v1: https://lore.kernel.org/all/[email protected]/
v2: https://lore.kernel.org/all/[email protected]/Shaoqin Huang (5):
KVM: selftests: aarch64: Make the [create|destroy]_vpmu_vm() public
KVM: selftests: aarch64: Move pmu helper functions intovpmu.h
KVM: selftests: aarch64: Fix the buggy [enable|disable]_counter
KVM: selftests: aarch64: Introducepmu_event_filter_test
KVM: selftests: aarch64: Add invalid filter test in
pmu_event_filter_testtools/testing/selftests/kvm/Makefile | 2 + .../kvm/aarch64/pmu_event_filter_test.c | 255 ++++++++++++++++++ .../kvm/aarch64/vpmu_counter_access.c | 218 ++------------- .../selftests/kvm/include/aarch64/vpmu.h | 135 ++++++++++ .../testing/selftests/kvm/lib/aarch64/vpmu.c | 74 +++++ 5 files changed, 490 insertions(+), 194 deletions(-)create mode 100644
tools/testing/selftests/kvm/aarch64/pmu_event_filter_test.ccreate mode 100644tools/testing/selftests/kvm/include/aarch64/vpmu.hcreate mode 100644tools/testing/selftests/kvm/lib/aarch64/vpmu.c
Signature · 1 line
Shaoqin