Commit ed0a8d92 authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Michael S. Tsirkin
Browse files

tests: add a simple /vhost-user/multiqueue test 



This test just checks that 2 virtio-net queues can be setup over
vhost-user and waits for them to be started.

Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 5d443f5a

tests/Makefile.include

+1 −1
Original line number Diff line number Diff line
@@ -656,7 +656,7 @@ tests/usb-hcd-ehci-test$(EXESUF): tests/usb-hcd-ehci-test.o $(libqos-usb-obj-y) 
tests/usb-hcd-xhci-test$(EXESUF): tests/usb-hcd-xhci-test.o $(libqos-usb-obj-y)

tests/pc-cpu-test$(EXESUF): tests/pc-cpu-test.o

tests/postcopy-test$(EXESUF): tests/postcopy-test.o

tests/vhost-user-test$(EXESUF): tests/vhost-user-test.o qemu-char.o qemu-timer.o $(qtest-obj-y) $(test-io-obj-y) $(libqos-virtio-obj-y)

tests/vhost-user-test$(EXESUF): tests/vhost-user-test.o qemu-char.o qemu-timer.o $(qtest-obj-y) $(test-io-obj-y) $(libqos-virtio-obj-y) $(libqos-pc-obj-y)

tests/qemu-iotests/socket_scm_helper$(EXESUF): tests/qemu-iotests/socket_scm_helper.o

tests/test-qemu-opts$(EXESUF): tests/test-qemu-opts.o $(test-util-obj-y)

tests/test-write-threshold$(EXESUF): tests/test-write-threshold.o $(test-block-obj-y)

tests/vhost-user-test.c

+106 −3
Original line number Diff line number Diff line
@@ -20,6 +20,11 @@ 
#include "libqos/pci-pc.h"

#include "libqos/virtio-pci.h"



#include "libqos/pci-pc.h"

#include "libqos/virtio-pci.h"

#include "libqos/malloc-pc.h"

#include "hw/virtio/virtio-net.h"



#include <linux/vhost.h>

#include <linux/virtio_ids.h>

#include <linux/virtio_net.h>
@@ -50,6 +55,7 @@ 
#define VHOST_MEMORY_MAX_NREGIONS    8



#define VHOST_USER_F_PROTOCOL_FEATURES 30

#define VHOST_USER_PROTOCOL_F_MQ 0

#define VHOST_USER_PROTOCOL_F_LOG_SHMFD 1



#define VHOST_LOG_PAGE 0x1000
@@ -72,6 +78,7 @@ typedef enum VhostUserRequest { 
    VHOST_USER_SET_VRING_ERR = 14,

    VHOST_USER_GET_PROTOCOL_FEATURES = 15,

    VHOST_USER_SET_PROTOCOL_FEATURES = 16,

    VHOST_USER_GET_QUEUE_NUM = 17,

    VHOST_USER_SET_VRING_ENABLE = 18,

    VHOST_USER_MAX

} VhostUserRequest;
@@ -136,6 +143,7 @@ typedef struct TestServer { 
    int log_fd;

    uint64_t rings;

    bool test_fail;

    int queues;

} TestServer;



static const char *tmpfs;
@@ -281,6 +289,9 @@ static void chr_read(void *opaque, const uint8_t *buf, int size) 
        msg.size = sizeof(m.payload.u64);

        msg.payload.u64 = 0x1ULL << VHOST_F_LOG_ALL |

            0x1ULL << VHOST_USER_F_PROTOCOL_FEATURES;

        if (s->queues > 1) {

            msg.payload.u64 |= 0x1ULL << VIRTIO_NET_F_MQ;

        }

        p = (uint8_t *) &msg;

        qemu_chr_fe_write_all(chr, p, VHOST_USER_HDR_SIZE + msg.size);

        break;
@@ -295,6 +306,9 @@ static void chr_read(void *opaque, const uint8_t *buf, int size) 
        msg.flags |= VHOST_USER_REPLY_MASK;

        msg.size = sizeof(m.payload.u64);

        msg.payload.u64 = 1 << VHOST_USER_PROTOCOL_F_LOG_SHMFD;

        if (s->queues > 1) {

            msg.payload.u64 |= 1 << VHOST_USER_PROTOCOL_F_MQ;

        }

        p = (uint8_t *) &msg;

        qemu_chr_fe_write_all(chr, p, VHOST_USER_HDR_SIZE + msg.size);

        break;
@@ -307,7 +321,7 @@ static void chr_read(void *opaque, const uint8_t *buf, int size) 
        p = (uint8_t *) &msg;

        qemu_chr_fe_write_all(chr, p, VHOST_USER_HDR_SIZE + msg.size);



        assert(msg.payload.state.index < 2);

        assert(msg.payload.state.index < s->queues * 2);

        s->rings &= ~(0x1ULL << msg.payload.state.index);

        break;
@@ -347,10 +361,18 @@ static void chr_read(void *opaque, const uint8_t *buf, int size) 
        break;



    case VHOST_USER_SET_VRING_BASE:

        assert(msg.payload.state.index < 2);

        assert(msg.payload.state.index < s->queues * 2);

        s->rings |= 0x1ULL << msg.payload.state.index;

        break;



    case VHOST_USER_GET_QUEUE_NUM:

        msg.flags |= VHOST_USER_REPLY_MASK;

        msg.size = sizeof(m.payload.u64);

        msg.payload.u64 = s->queues;

        p = (uint8_t *) &msg;

        qemu_chr_fe_write_all(chr, p, VHOST_USER_HDR_SIZE + msg.size);

        break;



    default:

        break;

    }
@@ -397,6 +419,7 @@ static TestServer *test_server_new(const gchar *name) 
    g_cond_init(&server->data_cond);



    server->log_fd = -1;

    server->queues = 1;



    return server;

}
@@ -648,7 +671,6 @@ static void test_migrate(void) 
    global_qtest = global;

}



#ifdef CONFIG_HAS_GLIB_SUBPROCESS_TESTS

static void wait_for_rings_started(TestServer *s, size_t count)

{

    gint64 end_time;
@@ -666,6 +688,7 @@ static void wait_for_rings_started(TestServer *s, size_t count) 
    g_mutex_unlock(&s->data_mutex);

}



#ifdef CONFIG_HAS_GLIB_SUBPROCESS_TESTS

static gboolean

reconnect_cb(gpointer user_data)

{
@@ -753,6 +776,85 @@ static void test_connect_fail(void) 


#endif



static QVirtioPCIDevice *virtio_net_pci_init(QPCIBus *bus, int slot)

{

    QVirtioPCIDevice *dev;



    dev = qvirtio_pci_device_find(bus, VIRTIO_ID_NET);

    g_assert(dev != NULL);

    g_assert_cmphex(dev->vdev.device_type, ==, VIRTIO_ID_NET);



    qvirtio_pci_device_enable(dev);

    qvirtio_reset(&qvirtio_pci, &dev->vdev);

    qvirtio_set_acknowledge(&qvirtio_pci, &dev->vdev);

    qvirtio_set_driver(&qvirtio_pci, &dev->vdev);



    return dev;

}



static void driver_init(const QVirtioBus *bus, QVirtioDevice *dev)

{

    uint32_t features;



    features = qvirtio_get_features(bus, dev);

    features = features & ~(QVIRTIO_F_BAD_FEATURE |

                            (1u << VIRTIO_RING_F_INDIRECT_DESC) |

                            (1u << VIRTIO_RING_F_EVENT_IDX));

    qvirtio_set_features(bus, dev, features);



    qvirtio_set_driver_ok(bus, dev);

}



#define PCI_SLOT                0x04



static void test_multiqueue(void)

{

    const int queues = 2;

    TestServer *s = test_server_new("mq");

    QVirtioPCIDevice *dev;

    QPCIBus *bus;

    QVirtQueuePCI *vq[queues * 2];

    QGuestAllocator *alloc;

    char *cmd;

    int i;



    s->queues = queues;

    test_server_listen(s);



    cmd = g_strdup_printf(QEMU_CMD_MEM QEMU_CMD_CHR QEMU_CMD_NETDEV ",queues=%d "

                          "-device virtio-net-pci,netdev=net0,mq=on,vectors=%d",

                          512, 512, root, s->chr_name,

                          s->socket_path, "", s->chr_name,

                          queues, queues * 2 + 2);

    qtest_start(cmd);

    g_free(cmd);



    bus = qpci_init_pc();

    dev = virtio_net_pci_init(bus, PCI_SLOT);



    alloc = pc_alloc_init();

    for (i = 0; i < queues * 2; i++) {

        vq[i] = (QVirtQueuePCI *)qvirtqueue_setup(&qvirtio_pci, &dev->vdev,

                                              alloc, i);

    }



    driver_init(&qvirtio_pci, &dev->vdev);

    wait_for_rings_started(s, queues * 2);



    /* End test */

    for (i = 0; i < queues * 2; i++) {

        qvirtqueue_cleanup(&qvirtio_pci, &vq[i]->vq, alloc);

    }

    pc_alloc_uninit(alloc);

    qvirtio_pci_device_disable(dev);

    g_free(dev->pdev);

    g_free(dev);

    qpci_free_pc(bus);

    qtest_end();



    test_server_free(s);

}



int main(int argc, char **argv)

{

    QTestState *s = NULL;
@@ -798,6 +900,7 @@ int main(int argc, char **argv) 


    qtest_add_data_func("/vhost-user/read-guest-mem", server, read_guest_mem);

    qtest_add_func("/vhost-user/migrate", test_migrate);

    qtest_add_func("/vhost-user/multiqueue", test_multiqueue);

#ifdef CONFIG_HAS_GLIB_SUBPROCESS_TESTS

    qtest_add_func("/vhost-user/reconnect/subprocess",

                   test_reconnect_subprocess);