Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
tests/qtest: enable tests for virtio-scmi
We don't have a virtio-scmi implementation in QEMU and only support a
vhost-user backend.  This is very similar to virtio-gpio and we add the same
set of tests, just passing some vhost-user messages over the control socket.

Signed-off-by: Milan Zamazal <mzamazal@redhat.com>
Acked-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20230628100524.342666-4-mzamazal@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
  • Loading branch information
mz-pdm authored and mstsirkin committed Jul 10, 2023
1 parent c46b20c commit b6f53ae
Show file tree
Hide file tree
Showing 5 changed files with 254 additions and 0 deletions.
1 change: 1 addition & 0 deletions MAINTAINERS
Expand Up @@ -2222,6 +2222,7 @@ R: mzamazal@redhat.com
S: Supported
F: hw/virtio/vhost-user-scmi*
F: include/hw/virtio/vhost-user-scmi.h
F: tests/qtest/libqos/virtio-scmi.*

virtio-crypto
M: Gonglei <arei.gonglei@huawei.com>
Expand Down
1 change: 1 addition & 0 deletions tests/qtest/libqos/meson.build
Expand Up @@ -46,6 +46,7 @@ libqos_srcs = files(
'virtio-serial.c',
'virtio-iommu.c',
'virtio-gpio.c',
'virtio-scmi.c',
'generic-pcihost.c',

# qgraph machines:
Expand Down
174 changes: 174 additions & 0 deletions tests/qtest/libqos/virtio-scmi.c
@@ -0,0 +1,174 @@
/*
* virtio-scmi nodes for testing
*
* SPDX-FileCopyrightText: Linaro Ltd
* SPDX-FileCopyrightText: Red Hat, Inc.
* SPDX-License-Identifier: GPL-2.0-or-later
*
* Based on virtio-gpio.c, doing basically the same thing.
*/

#include "qemu/osdep.h"
#include "standard-headers/linux/virtio_config.h"
#include "../libqtest.h"
#include "qemu/module.h"
#include "qgraph.h"
#include "virtio-scmi.h"

static QGuestAllocator *alloc;

static void virtio_scmi_cleanup(QVhostUserSCMI *scmi)
{
QVirtioDevice *vdev = scmi->vdev;
int i;

for (i = 0; i < 2; i++) {
qvirtqueue_cleanup(vdev->bus, scmi->queues[i], alloc);
}
g_free(scmi->queues);
}

/*
* This handles the VirtIO setup from the point of view of the driver
* frontend and therefore doesn't present any vhost specific features
* and in fact masks of the re-used bit.
*/
static void virtio_scmi_setup(QVhostUserSCMI *scmi)
{
QVirtioDevice *vdev = scmi->vdev;
uint64_t features;
int i;

features = qvirtio_get_features(vdev);
features &= ~QVIRTIO_F_BAD_FEATURE;
qvirtio_set_features(vdev, features);

scmi->queues = g_new(QVirtQueue *, 2);
for (i = 0; i < 2; i++) {
scmi->queues[i] = qvirtqueue_setup(vdev, alloc, i);
}
qvirtio_set_driver_ok(vdev);
}

static void *qvirtio_scmi_get_driver(QVhostUserSCMI *v_scmi,
const char *interface)
{
if (!g_strcmp0(interface, "vhost-user-scmi")) {
return v_scmi;
}
if (!g_strcmp0(interface, "virtio")) {
return v_scmi->vdev;
}

g_assert_not_reached();
}

static void *qvirtio_scmi_device_get_driver(void *object,
const char *interface)
{
QVhostUserSCMIDevice *v_scmi = object;
return qvirtio_scmi_get_driver(&v_scmi->scmi, interface);
}

/* virtio-scmi (mmio) */
static void qvirtio_scmi_device_destructor(QOSGraphObject *obj)
{
QVhostUserSCMIDevice *scmi_dev = (QVhostUserSCMIDevice *) obj;
virtio_scmi_cleanup(&scmi_dev->scmi);
}

static void qvirtio_scmi_device_start_hw(QOSGraphObject *obj)
{
QVhostUserSCMIDevice *scmi_dev = (QVhostUserSCMIDevice *) obj;
virtio_scmi_setup(&scmi_dev->scmi);
}

static void *virtio_scmi_device_create(void *virtio_dev,
QGuestAllocator *t_alloc,
void *addr)
{
QVhostUserSCMIDevice *virtio_device = g_new0(QVhostUserSCMIDevice, 1);
QVhostUserSCMI *interface = &virtio_device->scmi;

interface->vdev = virtio_dev;
alloc = t_alloc;

virtio_device->obj.get_driver = qvirtio_scmi_device_get_driver;
virtio_device->obj.start_hw = qvirtio_scmi_device_start_hw;
virtio_device->obj.destructor = qvirtio_scmi_device_destructor;

return &virtio_device->obj;
}

/* virtio-scmi-pci */
static void qvirtio_scmi_pci_destructor(QOSGraphObject *obj)
{
QVhostUserSCMIPCI *scmi_pci = (QVhostUserSCMIPCI *) obj;
QOSGraphObject *pci_vobj = &scmi_pci->pci_vdev.obj;

virtio_scmi_cleanup(&scmi_pci->scmi);
qvirtio_pci_destructor(pci_vobj);
}

static void qvirtio_scmi_pci_start_hw(QOSGraphObject *obj)
{
QVhostUserSCMIPCI *scmi_pci = (QVhostUserSCMIPCI *) obj;
QOSGraphObject *pci_vobj = &scmi_pci->pci_vdev.obj;

qvirtio_pci_start_hw(pci_vobj);
virtio_scmi_setup(&scmi_pci->scmi);
}

static void *qvirtio_scmi_pci_get_driver(void *object, const char *interface)
{
QVhostUserSCMIPCI *v_scmi = object;

if (!g_strcmp0(interface, "pci-device")) {
return v_scmi->pci_vdev.pdev;
}
return qvirtio_scmi_get_driver(&v_scmi->scmi, interface);
}

static void *virtio_scmi_pci_create(void *pci_bus, QGuestAllocator *t_alloc,
void *addr)
{
QVhostUserSCMIPCI *virtio_spci = g_new0(QVhostUserSCMIPCI, 1);
QVhostUserSCMI *interface = &virtio_spci->scmi;
QOSGraphObject *obj = &virtio_spci->pci_vdev.obj;

virtio_pci_init(&virtio_spci->pci_vdev, pci_bus, addr);
interface->vdev = &virtio_spci->pci_vdev.vdev;
alloc = t_alloc;

obj->get_driver = qvirtio_scmi_pci_get_driver;
obj->start_hw = qvirtio_scmi_pci_start_hw;
obj->destructor = qvirtio_scmi_pci_destructor;

return obj;
}

static void virtio_scmi_register_nodes(void)
{
QPCIAddress addr = {
.devfn = QPCI_DEVFN(4, 0),
};

QOSGraphEdgeOptions edge_opts = { };

/* vhost-user-scmi-device */
edge_opts.extra_device_opts = "id=scmi,chardev=chr-vhost-user-test "
"-global virtio-mmio.force-legacy=false";
qos_node_create_driver("vhost-user-scmi-device",
virtio_scmi_device_create);
qos_node_consumes("vhost-user-scmi-device", "virtio-bus", &edge_opts);
qos_node_produces("vhost-user-scmi-device", "vhost-user-scmi");

/* virtio-scmi-pci */
edge_opts.extra_device_opts = "id=scmi,addr=04.0,chardev=chr-vhost-user-test";
add_qpci_address(&edge_opts, &addr);
qos_node_create_driver("vhost-user-scmi-pci", virtio_scmi_pci_create);
qos_node_consumes("vhost-user-scmi-pci", "pci-bus", &edge_opts);
qos_node_produces("vhost-user-scmi-pci", "vhost-user-scmi");
}

libqos_init(virtio_scmi_register_nodes);
34 changes: 34 additions & 0 deletions tests/qtest/libqos/virtio-scmi.h
@@ -0,0 +1,34 @@
/*
* virtio-scmi structures
*
* SPDX-FileCopyrightText: Red Hat, Inc.
* SPDX-License-Identifier: GPL-2.0-or-later
*/

#ifndef TESTS_LIBQOS_VIRTIO_SCMI_H
#define TESTS_LIBQOS_VIRTIO_SCMI_H

#include "qgraph.h"
#include "virtio.h"
#include "virtio-pci.h"

typedef struct QVhostUserSCMI QVhostUserSCMI;
typedef struct QVhostUserSCMIPCI QVhostUserSCMIPCI;
typedef struct QVhostUserSCMIDevice QVhostUserSCMIDevice;

struct QVhostUserSCMI {
QVirtioDevice *vdev;
QVirtQueue **queues;
};

struct QVhostUserSCMIPCI {
QVirtioPCIDevice pci_vdev;
QVhostUserSCMI scmi;
};

struct QVhostUserSCMIDevice {
QOSGraphObject obj;
QVhostUserSCMI scmi;
};

#endif
44 changes: 44 additions & 0 deletions tests/qtest/vhost-user-test.c
Expand Up @@ -33,6 +33,7 @@
#include "standard-headers/linux/virtio_ids.h"
#include "standard-headers/linux/virtio_net.h"
#include "standard-headers/linux/virtio_gpio.h"
#include "standard-headers/linux/virtio_scmi.h"

#ifdef CONFIG_LINUX
#include <sys/vfs.h>
Expand Down Expand Up @@ -145,6 +146,7 @@ enum {
enum {
VHOST_USER_NET,
VHOST_USER_GPIO,
VHOST_USER_SCMI,
};

typedef struct TestServer {
Expand Down Expand Up @@ -1157,3 +1159,45 @@ static void register_vhost_gpio_test(void)
"vhost-user-gpio", test_read_guest_mem, &opts);
}
libqos_init(register_vhost_gpio_test);

static uint64_t vu_scmi_get_features(TestServer *s)
{
return 0x1ULL << VIRTIO_F_VERSION_1 |
0x1ULL << VIRTIO_SCMI_F_P2A_CHANNELS |
0x1ULL << VHOST_USER_F_PROTOCOL_FEATURES;
}

static void vu_scmi_get_protocol_features(TestServer *s, CharBackend *chr,
VhostUserMsg *msg)
{
msg->flags |= VHOST_USER_REPLY_MASK;
msg->size = sizeof(m.payload.u64);
msg->payload.u64 = 1ULL << VHOST_USER_PROTOCOL_F_MQ;

qemu_chr_fe_write_all(chr, (uint8_t *)msg, VHOST_USER_HDR_SIZE + msg->size);
}

static struct vhost_user_ops g_vu_scmi_ops = {
.type = VHOST_USER_SCMI,

.append_opts = append_vhost_gpio_opts,

.get_features = vu_scmi_get_features,
.set_features = vu_net_set_features,
.get_protocol_features = vu_scmi_get_protocol_features,
};

static void register_vhost_scmi_test(void)
{
QOSGraphTestOptions opts = {
.before = vhost_user_test_setup,
.subprocess = true,
.arg = &g_vu_scmi_ops,
};

qemu_add_opts(&qemu_chardev_opts);

qos_add_test("scmi/read-guest-mem/memfile",
"vhost-user-scmi", test_read_guest_mem, &opts);
}
libqos_init(register_vhost_scmi_test);

0 comments on commit b6f53ae

Please sign in to comment.