| Message ID | 20210713203742.29680-3-drjones@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | KVM: selftests: a couple fixes | expand |
On 2021-07-13 21:37, Andrew Jones wrote: > We reworked get-reg-list to make it easier to enable optional register > sublists by parametrizing their vcpu feature flags as well as making > other generalizations. That was all to make sure we enable the PMU > registers when we want to test them. Somehow we forgot to actually > include the PMU feature flag in the PMU sublist description though! > Do that now. Ah! :D > > Fixes: 313673bad871 ("KVM: arm64: selftests: get-reg-list: Split base > and pmu registers") > Signed-off-by: Andrew Jones <drjones@redhat.com> > --- > tools/testing/selftests/kvm/aarch64/get-reg-list.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/tools/testing/selftests/kvm/aarch64/get-reg-list.c > b/tools/testing/selftests/kvm/aarch64/get-reg-list.c > index a16c8f05366c..cc898181faab 100644 > --- a/tools/testing/selftests/kvm/aarch64/get-reg-list.c > +++ b/tools/testing/selftests/kvm/aarch64/get-reg-list.c > @@ -1019,7 +1019,8 @@ static __u64 sve_rejects_set[] = { > #define VREGS_SUBLIST \ > { "vregs", .regs = vregs, .regs_n = ARRAY_SIZE(vregs), } > #define PMU_SUBLIST \ > - { "pmu", .regs = pmu_regs, .regs_n = ARRAY_SIZE(pmu_regs), } > + { "pmu", .capability = KVM_CAP_ARM_PMU_V3, .feature = > KVM_ARM_VCPU_PMU_V3, \ > + .regs = pmu_regs, .regs_n = ARRAY_SIZE(pmu_regs), } > #define SVE_SUBLIST \ > { "sve", .capability = KVM_CAP_ARM_SVE, .feature = KVM_ARM_VCPU_SVE, > .finalize = true, \ > .regs = sve_regs, .regs_n = ARRAY_SIZE(sve_regs), \ Good timing, I'm queuing fixes. I'll pick those in a moment. Thanks, M.
diff --git a/tools/testing/selftests/kvm/aarch64/get-reg-list.c b/tools/testing/selftests/kvm/aarch64/get-reg-list.c index a16c8f05366c..cc898181faab 100644 --- a/tools/testing/selftests/kvm/aarch64/get-reg-list.c +++ b/tools/testing/selftests/kvm/aarch64/get-reg-list.c @@ -1019,7 +1019,8 @@ static __u64 sve_rejects_set[] = { #define VREGS_SUBLIST \ { "vregs", .regs = vregs, .regs_n = ARRAY_SIZE(vregs), } #define PMU_SUBLIST \ - { "pmu", .regs = pmu_regs, .regs_n = ARRAY_SIZE(pmu_regs), } + { "pmu", .capability = KVM_CAP_ARM_PMU_V3, .feature = KVM_ARM_VCPU_PMU_V3, \ + .regs = pmu_regs, .regs_n = ARRAY_SIZE(pmu_regs), } #define SVE_SUBLIST \ { "sve", .capability = KVM_CAP_ARM_SVE, .feature = KVM_ARM_VCPU_SVE, .finalize = true, \ .regs = sve_regs, .regs_n = ARRAY_SIZE(sve_regs), \
We reworked get-reg-list to make it easier to enable optional register sublists by parametrizing their vcpu feature flags as well as making other generalizations. That was all to make sure we enable the PMU registers when we want to test them. Somehow we forgot to actually include the PMU feature flag in the PMU sublist description though! Do that now. Fixes: 313673bad871 ("KVM: arm64: selftests: get-reg-list: Split base and pmu registers") Signed-off-by: Andrew Jones <drjones@redhat.com> --- tools/testing/selftests/kvm/aarch64/get-reg-list.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)