| Message ID | 20211210164620.11636-3-michael.roth@amd.com |
|---|---|
| State | Accepted |
| Commit | 96c1a6285568d31a8125c36974a140fccbe548af |
| Headers | show |
| Series | KVM: selftests: Add support for test-selectable ucall implementations | expand |
On Fri, Dec 10, 2021 at 10:46:12AM -0600, Michael Roth wrote: > Now that core kvm_util declarations have special home in > kvm_util_base.h, move ucall-related declarations out into a separate > header. > > Signed-off-by: Michael Roth <michael.roth@amd.com> > --- > .../testing/selftests/kvm/include/kvm_util.h | 1 + > .../selftests/kvm/include/kvm_util_base.h | 49 --------------- > .../selftests/kvm/include/ucall_common.h | 59 +++++++++++++++++++ > 3 files changed, 60 insertions(+), 49 deletions(-) > create mode 100644 tools/testing/selftests/kvm/include/ucall_common.h > > diff --git a/tools/testing/selftests/kvm/include/kvm_util.h b/tools/testing/selftests/kvm/include/kvm_util.h > index c860ced3888d..c9286811a4cb 100644 > --- a/tools/testing/selftests/kvm/include/kvm_util.h > +++ b/tools/testing/selftests/kvm/include/kvm_util.h > @@ -8,5 +8,6 @@ > #define SELFTEST_KVM_UTIL_H > > #include "kvm_util_base.h" > +#include "ucall_common.h" > > #endif /* SELFTEST_KVM_UTIL_H */ Now that kvm_util.h is looking like a "libkvm.h", then we can do some more header cleanups to make that official. After this series is merged I'll send a series that - removes unnecessary includes from kvm_util_common.h and other headers - renames kvm_util.h to libkvm.h - also includes guest_modes.h and test_util.h from libkvm.h - simplify the includes of all unit tests since they'll be including libkvm.h - probably move include/sparsebit.h to lib, since no unit test needs it Thanks, drew > diff --git a/tools/testing/selftests/kvm/include/kvm_util_base.h b/tools/testing/selftests/kvm/include/kvm_util_base.h > index 8fb6aeff5469..4e2946ba3ff7 100644 > --- a/tools/testing/selftests/kvm/include/kvm_util_base.h > +++ b/tools/testing/selftests/kvm/include/kvm_util_base.h > @@ -360,55 +360,6 @@ int vm_create_device(struct kvm_vm *vm, struct kvm_create_device *cd); > > void assert_on_unhandled_exception(struct kvm_vm *vm, uint32_t vcpuid); > > -/* Common ucalls */ > -enum { > - UCALL_NONE, > - UCALL_SYNC, > - UCALL_ABORT, > - UCALL_DONE, > - UCALL_UNHANDLED, > -}; > - > -#define UCALL_MAX_ARGS 6 > - > -struct ucall { > - uint64_t cmd; > - uint64_t args[UCALL_MAX_ARGS]; > -}; > - > -void ucall_init(struct kvm_vm *vm, void *arg); > -void ucall_uninit(struct kvm_vm *vm); > -void ucall(uint64_t cmd, int nargs, ...); > -uint64_t get_ucall(struct kvm_vm *vm, uint32_t vcpu_id, struct ucall *uc); > - > -#define GUEST_SYNC_ARGS(stage, arg1, arg2, arg3, arg4) \ > - ucall(UCALL_SYNC, 6, "hello", stage, arg1, arg2, arg3, arg4) > -#define GUEST_SYNC(stage) ucall(UCALL_SYNC, 2, "hello", stage) > -#define GUEST_DONE() ucall(UCALL_DONE, 0) > -#define __GUEST_ASSERT(_condition, _condstr, _nargs, _args...) do { \ > - if (!(_condition)) \ > - ucall(UCALL_ABORT, 2 + _nargs, \ > - "Failed guest assert: " \ > - _condstr, __LINE__, _args); \ > -} while (0) > - > -#define GUEST_ASSERT(_condition) \ > - __GUEST_ASSERT(_condition, #_condition, 0, 0) > - > -#define GUEST_ASSERT_1(_condition, arg1) \ > - __GUEST_ASSERT(_condition, #_condition, 1, (arg1)) > - > -#define GUEST_ASSERT_2(_condition, arg1, arg2) \ > - __GUEST_ASSERT(_condition, #_condition, 2, (arg1), (arg2)) > - > -#define GUEST_ASSERT_3(_condition, arg1, arg2, arg3) \ > - __GUEST_ASSERT(_condition, #_condition, 3, (arg1), (arg2), (arg3)) > - > -#define GUEST_ASSERT_4(_condition, arg1, arg2, arg3, arg4) \ > - __GUEST_ASSERT(_condition, #_condition, 4, (arg1), (arg2), (arg3), (arg4)) > - > -#define GUEST_ASSERT_EQ(a, b) __GUEST_ASSERT((a) == (b), #a " == " #b, 2, a, b) > - > int vm_get_stats_fd(struct kvm_vm *vm); > int vcpu_get_stats_fd(struct kvm_vm *vm, uint32_t vcpuid); > > diff --git a/tools/testing/selftests/kvm/include/ucall_common.h b/tools/testing/selftests/kvm/include/ucall_common.h > new file mode 100644 > index 000000000000..9eecc9d40b79 > --- /dev/null > +++ b/tools/testing/selftests/kvm/include/ucall_common.h > @@ -0,0 +1,59 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > +/* > + * tools/testing/selftests/kvm/include/kvm_util.h > + * > + * Copyright (C) 2018, Google LLC. > + */ > +#ifndef SELFTEST_KVM_UCALL_COMMON_H > +#define SELFTEST_KVM_UCALL_COMMON_H > + > +/* Common ucalls */ > +enum { > + UCALL_NONE, > + UCALL_SYNC, > + UCALL_ABORT, > + UCALL_DONE, > + UCALL_UNHANDLED, > +}; > + > +#define UCALL_MAX_ARGS 6 > + > +struct ucall { > + uint64_t cmd; > + uint64_t args[UCALL_MAX_ARGS]; > +}; > + > +void ucall_init(struct kvm_vm *vm, void *arg); > +void ucall_uninit(struct kvm_vm *vm); > +void ucall(uint64_t cmd, int nargs, ...); > +uint64_t get_ucall(struct kvm_vm *vm, uint32_t vcpu_id, struct ucall *uc); > + > +#define GUEST_SYNC_ARGS(stage, arg1, arg2, arg3, arg4) \ > + ucall(UCALL_SYNC, 6, "hello", stage, arg1, arg2, arg3, arg4) > +#define GUEST_SYNC(stage) ucall(UCALL_SYNC, 2, "hello", stage) > +#define GUEST_DONE() ucall(UCALL_DONE, 0) > +#define __GUEST_ASSERT(_condition, _condstr, _nargs, _args...) do { \ > + if (!(_condition)) \ > + ucall(UCALL_ABORT, 2 + _nargs, \ > + "Failed guest assert: " \ > + _condstr, __LINE__, _args); \ > +} while (0) > + > +#define GUEST_ASSERT(_condition) \ > + __GUEST_ASSERT(_condition, #_condition, 0, 0) > + > +#define GUEST_ASSERT_1(_condition, arg1) \ > + __GUEST_ASSERT(_condition, #_condition, 1, (arg1)) > + > +#define GUEST_ASSERT_2(_condition, arg1, arg2) \ > + __GUEST_ASSERT(_condition, #_condition, 2, (arg1), (arg2)) > + > +#define GUEST_ASSERT_3(_condition, arg1, arg2, arg3) \ > + __GUEST_ASSERT(_condition, #_condition, 3, (arg1), (arg2), (arg3)) > + > +#define GUEST_ASSERT_4(_condition, arg1, arg2, arg3, arg4) \ > + __GUEST_ASSERT(_condition, #_condition, 4, (arg1), (arg2), (arg3), (arg4)) > + > +#define GUEST_ASSERT_EQ(a, b) __GUEST_ASSERT((a) == (b), #a " == " #b, 2, a, b) > + > +#endif /* SELFTEST_KVM_UCALL_COMMON_H */ > -- > 2.25.1 >
diff --git a/tools/testing/selftests/kvm/include/kvm_util.h b/tools/testing/selftests/kvm/include/kvm_util.h index c860ced3888d..c9286811a4cb 100644 --- a/tools/testing/selftests/kvm/include/kvm_util.h +++ b/tools/testing/selftests/kvm/include/kvm_util.h @@ -8,5 +8,6 @@ #define SELFTEST_KVM_UTIL_H #include "kvm_util_base.h" +#include "ucall_common.h" #endif /* SELFTEST_KVM_UTIL_H */ diff --git a/tools/testing/selftests/kvm/include/kvm_util_base.h b/tools/testing/selftests/kvm/include/kvm_util_base.h index 8fb6aeff5469..4e2946ba3ff7 100644 --- a/tools/testing/selftests/kvm/include/kvm_util_base.h +++ b/tools/testing/selftests/kvm/include/kvm_util_base.h @@ -360,55 +360,6 @@ int vm_create_device(struct kvm_vm *vm, struct kvm_create_device *cd); void assert_on_unhandled_exception(struct kvm_vm *vm, uint32_t vcpuid); -/* Common ucalls */ -enum { - UCALL_NONE, - UCALL_SYNC, - UCALL_ABORT, - UCALL_DONE, - UCALL_UNHANDLED, -}; - -#define UCALL_MAX_ARGS 6 - -struct ucall { - uint64_t cmd; - uint64_t args[UCALL_MAX_ARGS]; -}; - -void ucall_init(struct kvm_vm *vm, void *arg); -void ucall_uninit(struct kvm_vm *vm); -void ucall(uint64_t cmd, int nargs, ...); -uint64_t get_ucall(struct kvm_vm *vm, uint32_t vcpu_id, struct ucall *uc); - -#define GUEST_SYNC_ARGS(stage, arg1, arg2, arg3, arg4) \ - ucall(UCALL_SYNC, 6, "hello", stage, arg1, arg2, arg3, arg4) -#define GUEST_SYNC(stage) ucall(UCALL_SYNC, 2, "hello", stage) -#define GUEST_DONE() ucall(UCALL_DONE, 0) -#define __GUEST_ASSERT(_condition, _condstr, _nargs, _args...) do { \ - if (!(_condition)) \ - ucall(UCALL_ABORT, 2 + _nargs, \ - "Failed guest assert: " \ - _condstr, __LINE__, _args); \ -} while (0) - -#define GUEST_ASSERT(_condition) \ - __GUEST_ASSERT(_condition, #_condition, 0, 0) - -#define GUEST_ASSERT_1(_condition, arg1) \ - __GUEST_ASSERT(_condition, #_condition, 1, (arg1)) - -#define GUEST_ASSERT_2(_condition, arg1, arg2) \ - __GUEST_ASSERT(_condition, #_condition, 2, (arg1), (arg2)) - -#define GUEST_ASSERT_3(_condition, arg1, arg2, arg3) \ - __GUEST_ASSERT(_condition, #_condition, 3, (arg1), (arg2), (arg3)) - -#define GUEST_ASSERT_4(_condition, arg1, arg2, arg3, arg4) \ - __GUEST_ASSERT(_condition, #_condition, 4, (arg1), (arg2), (arg3), (arg4)) - -#define GUEST_ASSERT_EQ(a, b) __GUEST_ASSERT((a) == (b), #a " == " #b, 2, a, b) - int vm_get_stats_fd(struct kvm_vm *vm); int vcpu_get_stats_fd(struct kvm_vm *vm, uint32_t vcpuid); diff --git a/tools/testing/selftests/kvm/include/ucall_common.h b/tools/testing/selftests/kvm/include/ucall_common.h new file mode 100644 index 000000000000..9eecc9d40b79 --- /dev/null +++ b/tools/testing/selftests/kvm/include/ucall_common.h @@ -0,0 +1,59 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * tools/testing/selftests/kvm/include/kvm_util.h + * + * Copyright (C) 2018, Google LLC. + */ +#ifndef SELFTEST_KVM_UCALL_COMMON_H +#define SELFTEST_KVM_UCALL_COMMON_H + +/* Common ucalls */ +enum { + UCALL_NONE, + UCALL_SYNC, + UCALL_ABORT, + UCALL_DONE, + UCALL_UNHANDLED, +}; + +#define UCALL_MAX_ARGS 6 + +struct ucall { + uint64_t cmd; + uint64_t args[UCALL_MAX_ARGS]; +}; + +void ucall_init(struct kvm_vm *vm, void *arg); +void ucall_uninit(struct kvm_vm *vm); +void ucall(uint64_t cmd, int nargs, ...); +uint64_t get_ucall(struct kvm_vm *vm, uint32_t vcpu_id, struct ucall *uc); + +#define GUEST_SYNC_ARGS(stage, arg1, arg2, arg3, arg4) \ + ucall(UCALL_SYNC, 6, "hello", stage, arg1, arg2, arg3, arg4) +#define GUEST_SYNC(stage) ucall(UCALL_SYNC, 2, "hello", stage) +#define GUEST_DONE() ucall(UCALL_DONE, 0) +#define __GUEST_ASSERT(_condition, _condstr, _nargs, _args...) do { \ + if (!(_condition)) \ + ucall(UCALL_ABORT, 2 + _nargs, \ + "Failed guest assert: " \ + _condstr, __LINE__, _args); \ +} while (0) + +#define GUEST_ASSERT(_condition) \ + __GUEST_ASSERT(_condition, #_condition, 0, 0) + +#define GUEST_ASSERT_1(_condition, arg1) \ + __GUEST_ASSERT(_condition, #_condition, 1, (arg1)) + +#define GUEST_ASSERT_2(_condition, arg1, arg2) \ + __GUEST_ASSERT(_condition, #_condition, 2, (arg1), (arg2)) + +#define GUEST_ASSERT_3(_condition, arg1, arg2, arg3) \ + __GUEST_ASSERT(_condition, #_condition, 3, (arg1), (arg2), (arg3)) + +#define GUEST_ASSERT_4(_condition, arg1, arg2, arg3, arg4) \ + __GUEST_ASSERT(_condition, #_condition, 4, (arg1), (arg2), (arg3), (arg4)) + +#define GUEST_ASSERT_EQ(a, b) __GUEST_ASSERT((a) == (b), #a " == " #b, 2, a, b) + +#endif /* SELFTEST_KVM_UCALL_COMMON_H */
Now that core kvm_util declarations have special home in kvm_util_base.h, move ucall-related declarations out into a separate header. Signed-off-by: Michael Roth <michael.roth@amd.com> --- .../testing/selftests/kvm/include/kvm_util.h | 1 + .../selftests/kvm/include/kvm_util_base.h | 49 --------------- .../selftests/kvm/include/ucall_common.h | 59 +++++++++++++++++++ 3 files changed, 60 insertions(+), 49 deletions(-) create mode 100644 tools/testing/selftests/kvm/include/ucall_common.h