OSDN Git Service

KVM: selftests: Add flags when creating a pmu event filter
authorAaron Lewis <aaronlewis@google.com>
Tue, 20 Dec 2022 16:12:34 +0000 (16:12 +0000)
committerSean Christopherson <seanjc@google.com>
Tue, 24 Jan 2023 18:06:13 +0000 (10:06 -0800)
Now that the flags field can be non-zero, pass it in when creating a
pmu event filter.

This is needed in preparation for testing masked events.

No functional change intended.

Signed-off-by: Aaron Lewis <aaronlewis@google.com>
Link: https://lore.kernel.org/r/20221220161236.555143-6-aaronlewis@google.com
Signed-off-by: Sean Christopherson <seanjc@google.com>
tools/testing/selftests/kvm/x86_64/pmu_event_filter_test.c

index 2de98fc..d50c8c1 100644 (file)
@@ -198,14 +198,15 @@ static struct kvm_pmu_event_filter *alloc_pmu_event_filter(uint32_t nevents)
 
 
 static struct kvm_pmu_event_filter *
-create_pmu_event_filter(const uint64_t event_list[],
-                       int nevents, uint32_t action)
+create_pmu_event_filter(const uint64_t event_list[], int nevents,
+                       uint32_t action, uint32_t flags)
 {
        struct kvm_pmu_event_filter *f;
        int i;
 
        f = alloc_pmu_event_filter(nevents);
        f->action = action;
+       f->flags = flags;
        for (i = 0; i < nevents; i++)
                f->events[i] = event_list[i];
 
@@ -216,7 +217,7 @@ static struct kvm_pmu_event_filter *event_filter(uint32_t action)
 {
        return create_pmu_event_filter(event_list,
                                       ARRAY_SIZE(event_list),
-                                      action);
+                                      action, 0);
 }
 
 /*
@@ -263,7 +264,7 @@ static void test_amd_deny_list(struct kvm_vcpu *vcpu)
        struct kvm_pmu_event_filter *f;
        uint64_t count;
 
-       f = create_pmu_event_filter(&event, 1, KVM_PMU_EVENT_DENY);
+       f = create_pmu_event_filter(&event, 1, KVM_PMU_EVENT_DENY, 0);
        count = test_with_filter(vcpu, f);
 
        free(f);