| Message ID | 20220704163538.31165-1-gautammenghani201@gmail.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | selftests/kvm: Add error messages before skipping tests in vm_xsave_req_perm() | expand |
On Mon, Jul 04, 2022, Gautam Menghani wrote: > Add messages in the checks that are performed before making a request > with ARCH_REQ_XCOMP_GUEST_PERM. > > Signed-off-by: Gautam Menghani <gautammenghani201@gmail.com> > --- > tools/testing/selftests/kvm/lib/x86_64/processor.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/tools/testing/selftests/kvm/lib/x86_64/processor.c b/tools/testing/selftests/kvm/lib/x86_64/processor.c > index ead7011ee8f6..c74e846661b7 100644 > --- a/tools/testing/selftests/kvm/lib/x86_64/processor.c > +++ b/tools/testing/selftests/kvm/lib/x86_64/processor.c > @@ -643,11 +643,15 @@ void vm_xsave_req_perm(int bit) > if (rc == -1 && (errno == ENXIO || errno == EINVAL)) > exit(KSFT_SKIP); > TEST_ASSERT(rc == 0, "KVM_GET_DEVICE_ATTR(0, KVM_X86_XCOMP_GUEST_SUPP) error: %ld", rc); > - if (!(bitmask & (1ULL << bit))) > + if (!(bitmask & (1ULL << bit))) { > + print_skip("Userspace address of attr data is blank"); > exit(KSFT_SKIP); > + } > > - if (!is_xfd_supported()) > + if (!is_xfd_supported()) { > + print_skip("XFD is not supported"); > exit(KSFT_SKIP); > + } This is no longer necessary as of commit 7ed397d107d4 ("KVM: selftests: Add TEST_REQUIRE macros to reduce skipping copy+paste"), which will automagically print the missing requirement before calling exit(). Thanks much for the patch though!
diff --git a/tools/testing/selftests/kvm/lib/x86_64/processor.c b/tools/testing/selftests/kvm/lib/x86_64/processor.c index ead7011ee8f6..c74e846661b7 100644 --- a/tools/testing/selftests/kvm/lib/x86_64/processor.c +++ b/tools/testing/selftests/kvm/lib/x86_64/processor.c @@ -643,11 +643,15 @@ void vm_xsave_req_perm(int bit) if (rc == -1 && (errno == ENXIO || errno == EINVAL)) exit(KSFT_SKIP); TEST_ASSERT(rc == 0, "KVM_GET_DEVICE_ATTR(0, KVM_X86_XCOMP_GUEST_SUPP) error: %ld", rc); - if (!(bitmask & (1ULL << bit))) + if (!(bitmask & (1ULL << bit))) { + print_skip("Userspace address of attr data is blank"); exit(KSFT_SKIP); + } - if (!is_xfd_supported()) + if (!is_xfd_supported()) { + print_skip("XFD is not supported"); exit(KSFT_SKIP); + } rc = syscall(SYS_arch_prctl, ARCH_REQ_XCOMP_GUEST_PERM, bit);
Add messages in the checks that are performed before making a request with ARCH_REQ_XCOMP_GUEST_PERM. Signed-off-by: Gautam Menghani <gautammenghani201@gmail.com> --- tools/testing/selftests/kvm/lib/x86_64/processor.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)