For the beginning, just test 'hv-passthrough' and a couple of custom
Hyper-V enlightenments configurations through QMP. Later, it would
be great to complement this by checking CPUID values from within the
guest.
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
---
MAINTAINERS | 1 +
tests/qtest/hyperv-test.c | 221 ++++++++++++++++++++++++++++++++++++++
tests/qtest/meson.build | 3 +-
3 files changed, 224 insertions(+), 1 deletion(-)
create mode 100644 tests/qtest/hyperv-test.c
diff --git a/MAINTAINERS b/MAINTAINERS
index 7d9cd2904264..6345bad461e8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1545,6 +1545,7 @@ F: hw/isa/apm.c
F: include/hw/isa/apm.h
F: tests/unit/test-x86-cpuid.c
F: tests/qtest/test-x86-cpuid-compat.c
+F: tests/qtest/hyperv-test.c
PC Chipset
M: Michael S. Tsirkin <mst@redhat.com>
diff --git a/tests/qtest/hyperv-test.c b/tests/qtest/hyperv-test.c
new file mode 100644
index 000000000000..88f7a19e4a85
--- /dev/null
+++ b/tests/qtest/hyperv-test.c
@@ -0,0 +1,221 @@
+/*
+ * Hyper-V emulation CPU feature test cases
+ *
+ * Copyright (c) 2021 Red Hat Inc.
+ * Authors:
+ * Vitaly Kuznetsov <vkuznets@redhat.com>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+#include <linux/kvm.h>
+#include <sys/ioctl.h>
+
+#include "qemu/osdep.h"
+#include "qemu/bitops.h"
+#include "libqos/libqtest.h"
+#include "qapi/qmp/qdict.h"
+#include "qapi/qmp/qjson.h"
+
+#define MACHINE_KVM "-machine pc-q35-5.2 -accel kvm "
+#define QUERY_HEAD "{ 'execute': 'query-cpu-model-expansion', " \
+ " 'arguments': { 'type': 'full', "
+#define QUERY_TAIL "}}"
+
+static bool kvm_enabled(QTestState *qts)
+{
+ QDict *resp, *qdict;
+ bool enabled;
+
+ resp = qtest_qmp(qts, "{ 'execute': 'query-kvm' }");
+ g_assert(qdict_haskey(resp, "return"));
+ qdict = qdict_get_qdict(resp, "return");
+ g_assert(qdict_haskey(qdict, "enabled"));
+ enabled = qdict_get_bool(qdict, "enabled");
+ qobject_unref(resp);
+
+ return enabled;
+}
+
+static bool kvm_has_sys_hyperv_cpuid(void)
+{
+ int fd = open("/dev/kvm", O_RDWR);
+ int ret;
+
+ g_assert(fd > 0);
+
+ ret = ioctl(fd, KVM_CHECK_EXTENSION, KVM_CAP_SYS_HYPERV_CPUID);
+
+ close(fd);
+
+ return ret > 0;
+}
+
+static QDict *do_query_no_props(QTestState *qts, const char *cpu_type)
+{
+ return qtest_qmp(qts, QUERY_HEAD "'model': { 'name': %s }"
+ QUERY_TAIL, cpu_type);
+}
+
+static bool resp_has_props(QDict *resp)
+{
+ QDict *qdict;
+
+ g_assert(resp);
+
+ if (!qdict_haskey(resp, "return")) {
+ return false;
+ }
+ qdict = qdict_get_qdict(resp, "return");
+
+ if (!qdict_haskey(qdict, "model")) {
+ return false;
+ }
+ qdict = qdict_get_qdict(qdict, "model");
+
+ return qdict_haskey(qdict, "props");
+}
+
+static QDict *resp_get_props(QDict *resp)
+{
+ QDict *qdict;
+
+ g_assert(resp);
+ g_assert(resp_has_props(resp));
+
+ qdict = qdict_get_qdict(resp, "return");
+ qdict = qdict_get_qdict(qdict, "model");
+ qdict = qdict_get_qdict(qdict, "props");
+
+ return qdict;
+}
+
+static bool resp_get_feature(QDict *resp, const char *feature)
+{
+ QDict *props;
+
+ g_assert(resp);
+ g_assert(resp_has_props(resp));
+ props = resp_get_props(resp);
+ g_assert(qdict_get(props, feature));
+ return qdict_get_bool(props, feature);
+}
+
+#define assert_has_feature(qts, cpu_type, feature) \
+({ \
+ QDict *_resp = do_query_no_props(qts, cpu_type); \
+ g_assert(_resp); \
+ g_assert(resp_has_props(_resp)); \
+ g_assert(qdict_get(resp_get_props(_resp), feature)); \
+ qobject_unref(_resp); \
+})
+
+#define resp_assert_feature(resp, feature, expected_value) \
+({ \
+ QDict *_props; \
+ \
+ g_assert(_resp); \
+ g_assert(resp_has_props(_resp)); \
+ _props = resp_get_props(_resp); \
+ g_assert(qdict_get(_props, feature)); \
+ g_assert(qdict_get_bool(_props, feature) == (expected_value)); \
+})
+
+#define assert_feature(qts, cpu_type, feature, expected_value) \
+({ \
+ QDict *_resp; \
+ \
+ _resp = do_query_no_props(qts, cpu_type); \
+ g_assert(_resp); \
+ resp_assert_feature(_resp, feature, expected_value); \
+ qobject_unref(_resp); \
+})
+
+#define assert_has_feature_enabled(qts, cpu_type, feature) \
+ assert_feature(qts, cpu_type, feature, true)
+
+#define assert_has_feature_disabled(qts, cpu_type, feature) \
+ assert_feature(qts, cpu_type, feature, false)
+
+static void test_assert_hyperv_all_but_evmcs(QTestState *qts)
+{
+ assert_has_feature_enabled(qts, "host", "hv-relaxed");
+ assert_has_feature_enabled(qts, "host", "hv-vapic");
+ assert_has_feature_enabled(qts, "host", "hv-vpindex");
+ assert_has_feature_enabled(qts, "host", "hv-runtime");
+ assert_has_feature_enabled(qts, "host", "hv-crash");
+ assert_has_feature_enabled(qts, "host", "hv-time");
+ assert_has_feature_enabled(qts, "host", "hv-synic");
+ assert_has_feature_enabled(qts, "host", "hv-stimer");
+ assert_has_feature_enabled(qts, "host", "hv-tlbflush");
+ assert_has_feature_enabled(qts, "host", "hv-ipi");
+ assert_has_feature_enabled(qts, "host", "hv-reset");
+ assert_has_feature_enabled(qts, "host", "hv-frequencies");
+ assert_has_feature_enabled(qts, "host", "hv-reenlightenment");
+ assert_has_feature_enabled(qts, "host", "hv-stimer-direct");
+}
+
+static void test_query_cpu_hv_all_but_evmcs(const void *data)
+{
+ QTestState *qts;
+
+ qts = qtest_init(MACHINE_KVM "-cpu host,hv-relaxed,hv-vapic,hv-vpindex,"
+ "hv-runtime,hv-crash,hv-time,hv-synic,hv-stimer,"
+ "hv-tlbflush,hv-ipi,hv-reset,hv-frequencies,"
+ "hv-reenlightenment,hv-stimer-direct");
+
+ test_assert_hyperv_all_but_evmcs(qts);
+
+ qtest_quit(qts);
+}
+
+static void test_query_cpu_hv_custom(const void *data)
+{
+ QTestState *qts;
+
+ qts = qtest_init(MACHINE_KVM "-cpu host,hv-vpindex");
+
+ assert_has_feature_enabled(qts, "host", "hv-vpindex");
+ assert_has_feature_disabled(qts, "host", "hv-synic");
+
+ qtest_quit(qts);
+}
+
+static void test_query_cpu_hv_passthrough(const void *data)
+{
+ QTestState *qts;
+ QDict *resp;
+
+ qts = qtest_init(MACHINE_KVM "-cpu host,hv-passthrough");
+ if (!kvm_enabled(qts)) {
+ qtest_quit(qts);
+ return;
+ }
+
+ test_assert_hyperv_all_but_evmcs(qts);
+
+ resp = do_query_no_props(qts, "host");
+ if (resp_get_feature(resp, "vmx")) {
+ assert_has_feature_enabled(qts, "host", "hv-evmcs");
+ } else {
+ assert_has_feature_disabled(qts, "host", "hv-evmcs");
+ }
+
+ qtest_quit(qts);
+}
+
+int main(int argc, char **argv)
+{
+ g_test_init(&argc, &argv, NULL);
+
+ qtest_add_data_func("/hyperv/hv-all-but-evmcs",
+ NULL, test_query_cpu_hv_all_but_evmcs);
+ qtest_add_data_func("/hyperv/hv-custom",
+ NULL, test_query_cpu_hv_custom);
+ if (kvm_has_sys_hyperv_cpuid()) {
+ qtest_add_data_func("/hyperv/hv-passthrough",
+ NULL, test_query_cpu_hv_passthrough);
+ }
+
+ return g_test_run();
+}
diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
index c3a223a83d6a..958a88d0c8b4 100644
--- a/tests/qtest/meson.build
+++ b/tests/qtest/meson.build
@@ -83,7 +83,8 @@ qtests_i386 = \
'vmgenid-test',
'migration-test',
'test-x86-cpuid-compat',
- 'numa-test']
+ 'numa-test',
+ 'hyperv-test']
dbus_daemon = find_program('dbus-daemon', required: false)
if dbus_daemon.found() and config_host.has_key('GDBUS_CODEGEN')
--
2.31.1
On Tue, Jun 08, 2021 at 02:08:17PM +0200, Vitaly Kuznetsov wrote:
> For the beginning, just test 'hv-passthrough' and a couple of custom
> Hyper-V enlightenments configurations through QMP. Later, it would
> be great to complement this by checking CPUID values from within the
> guest.
>
> Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
[...]
> +static bool kvm_has_sys_hyperv_cpuid(void)
> +{
> + int fd = open("/dev/kvm", O_RDWR);
> + int ret;
> +
> + g_assert(fd > 0);
This crashes when /dev/kvm doesn't exist. See:
https://gitlab.com/ehabkost/qemu/-/jobs/1404084459
I'm removing it from the queue.
--
Eduardo
On Thu, 8 Jul 2021 17:02:22 -0400
Eduardo Habkost <ehabkost@redhat.com> wrote:
> On Tue, Jun 08, 2021 at 02:08:17PM +0200, Vitaly Kuznetsov wrote:
> > For the beginning, just test 'hv-passthrough' and a couple of custom
> > Hyper-V enlightenments configurations through QMP. Later, it would
> > be great to complement this by checking CPUID values from within the
> > guest.
> >
> > Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
> [...]
> > +static bool kvm_has_sys_hyperv_cpuid(void)
> > +{
> > + int fd = open("/dev/kvm", O_RDWR);
> > + int ret;
> > +
> > + g_assert(fd > 0);
>
> This crashes when /dev/kvm doesn't exist. See:
> https://gitlab.com/ehabkost/qemu/-/jobs/1404084459
maybe reuse qtest_has_accel()
https://lists.gnu.org/archive/html/qemu-devel/2021-06/msg06864.html
instead of op encoding it.
> I'm removing it from the queue.
>
Igor Mammedov <imammedo@redhat.com> writes:
> On Thu, 8 Jul 2021 17:02:22 -0400
> Eduardo Habkost <ehabkost@redhat.com> wrote:
>
>> On Tue, Jun 08, 2021 at 02:08:17PM +0200, Vitaly Kuznetsov wrote:
>> > For the beginning, just test 'hv-passthrough' and a couple of custom
>> > Hyper-V enlightenments configurations through QMP. Later, it would
>> > be great to complement this by checking CPUID values from within the
>> > guest.
>> >
>> > Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
>> [...]
>> > +static bool kvm_has_sys_hyperv_cpuid(void)
>> > +{
>> > + int fd = open("/dev/kvm", O_RDWR);
>> > + int ret;
>> > +
>> > + g_assert(fd > 0);
>>
g_assert() was an overkill, just 'return false' would do.
>> This crashes when /dev/kvm doesn't exist. See:
>> https://gitlab.com/ehabkost/qemu/-/jobs/1404084459
>
> maybe reuse qtest_has_accel()
> https://lists.gnu.org/archive/html/qemu-devel/2021-06/msg06864.html
>
> instead of op encoding it.
The purpose of this function is to check if KVM_CAP_SYS_HYPERV_CPUID is
supported by KVM. It is certainly unsupported when KVM is not present
:-) but an ioctl() is needed when it is.
We already have a similar check in tests/qtest/migration-test.c where we
test for KVM_CAP_DIRTY_LOG_RING, maybe we can create a library function
but we don't seem to have any KVM-specific stuff in qtest at this moment
...
>> I'm removing it from the queue.
I'll fix g_assert() and send as a separate patch if it's fine.
--
Vitaly
On Fri, 16 Jul 2021 14:12:06 +0200
Vitaly Kuznetsov <vkuznets@redhat.com> wrote:
> Igor Mammedov <imammedo@redhat.com> writes:
>
> > On Thu, 8 Jul 2021 17:02:22 -0400
> > Eduardo Habkost <ehabkost@redhat.com> wrote:
> >
> >> On Tue, Jun 08, 2021 at 02:08:17PM +0200, Vitaly Kuznetsov wrote:
> >> > For the beginning, just test 'hv-passthrough' and a couple of custom
> >> > Hyper-V enlightenments configurations through QMP. Later, it would
> >> > be great to complement this by checking CPUID values from within the
> >> > guest.
> >> >
> >> > Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
> >> [...]
> >> > +static bool kvm_has_sys_hyperv_cpuid(void)
> >> > +{
> >> > + int fd = open("/dev/kvm", O_RDWR);
> >> > + int ret;
> >> > +
> >> > + g_assert(fd > 0);
> >>
>
> g_assert() was an overkill, just 'return false' would do.
>
> >> This crashes when /dev/kvm doesn't exist. See:
> >> https://gitlab.com/ehabkost/qemu/-/jobs/1404084459
> >
> > maybe reuse qtest_has_accel()
> > https://lists.gnu.org/archive/html/qemu-devel/2021-06/msg06864.html
> >
> > instead of op encoding it.
>
> The purpose of this function is to check if KVM_CAP_SYS_HYPERV_CPUID is
> supported by KVM. It is certainly unsupported when KVM is not present
> :-) but an ioctl() is needed when it is.
>
> We already have a similar check in tests/qtest/migration-test.c where we
> test for KVM_CAP_DIRTY_LOG_RING, maybe we can create a library function
> but we don't seem to have any KVM-specific stuff in qtest at this moment
qtest_has_accel() is a such library function
in the same series see https://lists.gnu.org/archive/html/qemu-devel/2021-06/msg06878.html
which replaces custom kvm probing in tests/qtest/migration-test.c
> ...
>
> >> I'm removing it from the queue.
>
> I'll fix g_assert() and send as a separate patch if it's fine.
>
On Tue, Jun 08, 2021 at 02:08:17PM +0200, Vitaly Kuznetsov wrote: > For the beginning, just test 'hv-passthrough' and a couple of custom > Hyper-V enlightenments configurations through QMP. Later, it would > be great to complement this by checking CPUID values from within the > guest. > > Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com> Acked-by: Eduardo Habkost <ehabkost@redhat.com> -- Eduardo
© 2016 - 2025 Red Hat, Inc.