On 2/29/24 07:56, Shaoqin Huang wrote: > Add the invalid filter test which 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. > > Signed-off-by: Shaoqin Huang <shahuang@xxxxxxxxxx> > --- > .../kvm/aarch64/pmu_event_filter_test.c | 38 +++++++++++++++++++ > 1 file changed, 38 insertions(+) > > diff --git a/tools/testing/selftests/kvm/aarch64/pmu_event_filter_test.c b/tools/testing/selftests/kvm/aarch64/pmu_event_filter_test.c > index 2dd8ea418f47..86714345ee97 100644 > --- a/tools/testing/selftests/kvm/aarch64/pmu_event_filter_test.c > +++ b/tools/testing/selftests/kvm/aarch64/pmu_event_filter_test.c > @@ -8,6 +8,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. > */ > @@ -262,6 +263,41 @@ static void run_tests(void) > run_test(t); > } > > +static void test_invalid_filter(void) > +{ > + struct kvm_pmu_event_filter invalid; > + int ret; > + > + pr_info("Test: test_invalid_filter\n"); > + > + memset(&vpmu_vm, 0, sizeof(vpmu_vm)); > + > + vpmu_vm.vm = vm_create(1); > + vpmu_vm.vcpu = vm_vcpu_add_with_vpmu(vpmu_vm.vm, 0, guest_code); > + vpmu_vm.gic_fd = vgic_v3_setup(vpmu_vm.vm, 1, 64, > + GICD_BASE_GPA, GICR_BASE_GPA); > + __TEST_REQUIRE(vpmu_vm.gic_fd >= 0, > + "Failed to create vgic-v3, skipping"); > + > + /* The max event number is (1 << 16), set a range largeer than it. */the event space is 16b on ARMv8.1 and 10b on ARMv8.0, set a range larger than 16 s/largeer/larger > + invalid = __DEFINE_FILTER(BIT(15), BIT(15) + 1, 0); > + ret = __kvm_device_attr_set(vpmu_vm.vcpu->fd, KVM_ARM_VCPU_PMU_V3_CTRL, > + KVM_ARM_VCPU_PMU_V3_FILTER, &invalid); > + TEST_ASSERT(ret && errno == EINVAL, "Set Invalid filter range " > + "ret = %d, errno = %d (expected ret = -1, errno = EINVAL)", > + ret, errno); > + > + /* Set the Invalid action. */ s/the/an > + invalid = __DEFINE_FILTER(0, 1, 3); > + ret = __kvm_device_attr_set(vpmu_vm.vcpu->fd, KVM_ARM_VCPU_PMU_V3_CTRL, > + KVM_ARM_VCPU_PMU_V3_FILTER, &invalid); > + TEST_ASSERT(ret && errno == EINVAL, "Set Invalid filter action " > + "ret = %d, errno = %d (expected ret = -1, errno = EINVAL)", > + ret, errno); > + > + destroy_vpmu_vm(); > +} > + > static bool kvm_pmu_support_events(void) > { > create_vpmu_vm(guest_get_pmceid); > @@ -284,4 +320,6 @@ int main(void) > TEST_REQUIRE(kvm_pmu_support_events()); > > run_tests(); > + > + test_invalid_filter(); > } Besides Reviewed-by: Eric Auger <eric.auger@xxxxxxxxxx> Eric