Emulation/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2025-04-02 11:11:48 -04:00
Code Issues Projects Releases Packages Wiki Activity

tests/qtest: add multi-queue test case to vhost-user-blk-test

Browse source 
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20210309094106.196911-4-stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20210322092327.150720-3-stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Stefan Hajnoczi 2021-03-22 09:23:26 +00:00 • committed by Kevin Wolf
parent 806952026d
commit 9c4e99e879
1 changed files with 76 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

81
tests/qtest/vhost-user-blk-test.c
View file

@ -569,6 +569,67 @@ static void pci_hotplug(void *obj, void *data, QGuestAllocator *t_alloc)
qpci_unplug_acpi_device_test(qts, "drv1", PCI_SLOT_HP);
}
static void multiqueue(void *obj, void *data, QGuestAllocator *t_alloc)
{
QVirtioPCIDevice *pdev1 = obj;
QVirtioDevice *dev1 = &pdev1->vdev;
QVirtioPCIDevice *pdev8;
QVirtioDevice *dev8;
QTestState *qts = pdev1->pdev->bus->qts;
uint64_t features;
uint16_t num_queues;
/*
* The primary device has 1 queue and VIRTIO_BLK_F_MQ is not enabled. The
* VIRTIO specification allows VIRTIO_BLK_F_MQ to be enabled when there is
* only 1 virtqueue, but --device vhost-user-blk-pci doesn't do this (which
* is also spec-compliant).
*/
features = qvirtio_get_features(dev1);
g_assert_cmpint(features & (1u << VIRTIO_BLK_F_MQ), ==, 0);
features = features & ~(QVIRTIO_F_BAD_FEATURE |
(1u << VIRTIO_RING_F_INDIRECT_DESC) |
(1u << VIRTIO_F_NOTIFY_ON_EMPTY) |
(1u << VIRTIO_BLK_F_SCSI));
qvirtio_set_features(dev1, features);
/* Hotplug a secondary device with 8 queues */
qtest_qmp_device_add(qts, "vhost-user-blk-pci", "drv1",
"{'addr': %s, 'chardev': 'char2', 'num-queues': 8}",
stringify(PCI_SLOT_HP) ".0");
pdev8 = virtio_pci_new(pdev1->pdev->bus,
&(QPCIAddress) {
.devfn = QPCI_DEVFN(PCI_SLOT_HP, 0)
});
g_assert_nonnull(pdev8);
g_assert_cmpint(pdev8->vdev.device_type, ==, VIRTIO_ID_BLOCK);
qos_object_start_hw(&pdev8->obj);
dev8 = &pdev8->vdev;
features = qvirtio_get_features(dev8);
g_assert_cmpint(features & (1u << VIRTIO_BLK_F_MQ),
==,
(1u << VIRTIO_BLK_F_MQ));
features = features & ~(QVIRTIO_F_BAD_FEATURE |
(1u << VIRTIO_RING_F_INDIRECT_DESC) |
(1u << VIRTIO_F_NOTIFY_ON_EMPTY) |
(1u << VIRTIO_BLK_F_SCSI) |
(1u << VIRTIO_BLK_F_MQ));
qvirtio_set_features(dev8, features);
num_queues = qvirtio_config_readw(dev8,
offsetof(struct virtio_blk_config, num_queues));
g_assert_cmpint(num_queues, ==, 8);
qvirtio_pci_device_disable(pdev8);
qos_object_destroy(&pdev8->obj);
/* unplug secondary disk */
qpci_unplug_acpi_device_test(qts, "drv1", PCI_SLOT_HP);
}
/*
* Check that setting the vring addr on a non-existent virtqueue does
* not crash.
@ -688,7 +749,8 @@ static void quit_storage_daemon(void *data)
g_free(data);
}
static void start_vhost_user_blk(GString *cmd_line, int vus_instances)
static void start_vhost_user_blk(GString *cmd_line, int vus_instances,
int num_queues)
{
const char *vhost_user_blk_bin = qtest_qemu_storage_daemon_binary();
int i;
@ -713,8 +775,8 @@ static void start_vhost_user_blk(GString *cmd_line, int vus_instances)
g_string_append_printf(storage_daemon_command,
"--blockdev driver=file,node-name=disk%d,filename=%s "
"--export type=vhost-user-blk,id=disk%d,addr.type=unix,addr.path=%s,"
"node-name=disk%i,writable=on ",
i, img_path, i, sock_path, i);
"node-name=disk%i,writable=on,num-queues=%d ",
i, img_path, i, sock_path, i, num_queues);
g_string_append_printf(cmd_line, "-chardev socket,id=char%d,path=%s ",
i + 1, sock_path);
@ -748,7 +810,7 @@ static void start_vhost_user_blk(GString *cmd_line, int vus_instances)
static void *vhost_user_blk_test_setup(GString *cmd_line, void *arg)
{
start_vhost_user_blk(cmd_line, 1);
start_vhost_user_blk(cmd_line, 1, 1);
return arg;
}
@ -762,7 +824,13 @@ static void *vhost_user_blk_test_setup(GString *cmd_line, void *arg)
static void *vhost_user_blk_hotplug_test_setup(GString *cmd_line, void *arg)
{
/* "-chardev socket,id=char2" is used for pci_hotplug*/
start_vhost_user_blk(cmd_line, 2);
start_vhost_user_blk(cmd_line, 2, 1);
return arg;
}
static void *vhost_user_blk_multiqueue_test_setup(GString *cmd_line, void *arg)
{
start_vhost_user_blk(cmd_line, 2, 8);
return arg;
}
@ -789,6 +857,9 @@ static void register_vhost_user_blk_test(void)
opts.before = vhost_user_blk_hotplug_test_setup;
qos_add_test("hotplug", "vhost-user-blk-pci", pci_hotplug, &opts);
opts.before = vhost_user_blk_multiqueue_test_setup;
qos_add_test("multiqueue", "vhost-user-blk-pci", multiqueue, &opts);
}
libqos_init(register_vhost_user_blk_test);