diff mbox series

[v9,3/3] KVM: selftests: aarch64: Add invalid filter test in pmu_event_filter_test

Message ID 20240613082345.132336-4-shahuang@redhat.com (mailing list archive)
State New, archived
Headers show
Series KVM: selftests: aarch64: Introduce pmu_event_filter_test | expand

Commit Message

Shaoqin Huang June 13, 2024, 8:23 a.m. UTC 
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.

Reviewed-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Shaoqin Huang <shahuang@redhat.com>
---
 .../kvm/aarch64/pmu_event_filter_test.c       | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)

Comments

Raghavendra Rao Ananta June 18, 2024, 12:01 a.m. UTC | #1 
Hi Shaoqin,

On Thu, Jun 13, 2024 at 1:27 AM Shaoqin Huang <shahuang@redhat.com> 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.
>
> Reviewed-by: Eric Auger <eric.auger@redhat.com>
> Signed-off-by: Shaoqin Huang <shahuang@redhat.com>
> ---
>  .../kvm/aarch64/pmu_event_filter_test.c       | 37 +++++++++++++++++++
>  1 file changed, 37 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 fb0fde1ed436..13b2f354c39b 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.
>   */
> @@ -178,6 +179,40 @@ static void destroy_vpmu_vm(void)
>         kvm_vm_free(vpmu_vm.vm);
>  }
>
> +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);
> +       __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. */
nit: s/largeer/larger

Also, perhaps not in this series, but we can also check for -EBUSY
situations such as setting a (valid) filter after
KVM_ARM_VCPU_PMU_V3_INIT and after the vCPUs have started.

Besides that, Reviewed-by: Raghavendra Rao Ananta <rananta@google.com>

- Raghavendra



> +       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. */
> +       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 void run_test(struct test_desc *t)
>  {
>         pr_info("Test: %s\n", t->name);
> @@ -300,4 +335,6 @@ int main(void)
>         TEST_REQUIRE(kvm_pmu_support_events());
>
>         run_tests();
> +
> +       test_invalid_filter();
>  }
> --
> 2.40.1
>
>
Shaoqin Huang June 18, 2024, 7:23 a.m. UTC | #2 
On 6/18/24 08:01, Raghavendra Rao Ananta wrote:
> Hi Shaoqin,
> 
> On Thu, Jun 13, 2024 at 1:27 AM Shaoqin Huang <shahuang@redhat.com> 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.
>>
>> Reviewed-by: Eric Auger <eric.auger@redhat.com>
>> Signed-off-by: Shaoqin Huang <shahuang@redhat.com>
>> ---
>>   .../kvm/aarch64/pmu_event_filter_test.c       | 37 +++++++++++++++++++
>>   1 file changed, 37 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 fb0fde1ed436..13b2f354c39b 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.
>>    */
>> @@ -178,6 +179,40 @@ static void destroy_vpmu_vm(void)
>>          kvm_vm_free(vpmu_vm.vm);
>>   }
>>
>> +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);
>> +       __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. */
> nit: s/largeer/larger
> 
> Also, perhaps not in this series, but we can also check for -EBUSY
> situations such as setting a (valid) filter after
> KVM_ARM_VCPU_PMU_V3_INIT and after the vCPUs have started.
> 

That's also a great test, we can add it in the future.

> Besides that, Reviewed-by: Raghavendra Rao Ananta <rananta@google.com>

Thanks a lot for your reviewing.

> 
> - Raghavendra
> 
> 
> 
>> +       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. */
>> +       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 void run_test(struct test_desc *t)
>>   {
>>          pr_info("Test: %s\n", t->name);
>> @@ -300,4 +335,6 @@ int main(void)
>>          TEST_REQUIRE(kvm_pmu_support_events());
>>
>>          run_tests();
>> +
>> +       test_invalid_filter();
>>   }
>> --
>> 2.40.1
>>
>>
>
diff mbox series

Patch

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 fb0fde1ed436..13b2f354c39b 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.
  */
@@ -178,6 +179,40 @@  static void destroy_vpmu_vm(void)
 	kvm_vm_free(vpmu_vm.vm);
 }
 
+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);
+	__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. */
+	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. */
+	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 void run_test(struct test_desc *t)
 {
 	pr_info("Test: %s\n", t->name);
@@ -300,4 +335,6 @@  int main(void)
 	TEST_REQUIRE(kvm_pmu_support_events());
 
 	run_tests();
+
+	test_invalid_filter();
 }