net/virtio-user: add multiple queues in vhost-user adapter

This patch mainly adds method in vhost user adapter to communicate
enable/disable queues messages with vhost user backend, aka,
VHOST_USER_SET_VRING_ENABLE.

Signed-off-by: Jianfeng Tan <jianfeng.tan@intel.com>
Acked-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>

diff --git a/drivers/net/virtio/virtio_user/vhost.h b/drivers/net/virtio/virtio_user/vhost.h
index 4e04ede..897042f 100644 (file)
--- a/drivers/net/virtio/virtio_user/vhost.h
+++ b/drivers/net/virtio/virtio_user/vhost.h
@@ -136,6 +136,11 @@ struct vhost_user_msg {
 /* The version of the protocol we support */
 #define VHOST_USER_VERSION    0x1
 
+#define VHOST_USER_F_PROTOCOL_FEATURES 30
+#define VHOST_USER_MQ (1ULL << VHOST_USER_F_PROTOCOL_FEATURES)
+
 int vhost_user_sock(int vhostfd, uint64_t req, void *arg);
 int vhost_user_setup(const char *path);
+int vhost_user_enable_queue_pair(int vhostfd, uint16_t pair_idx, int enable);
+
 #endif

diff --git a/drivers/net/virtio/virtio_user/vhost_user.c b/drivers/net/virtio/virtio_user/vhost_user.c
index 2b34cac..95e80f8 100644 (file)
--- a/drivers/net/virtio/virtio_user/vhost_user.c
+++ b/drivers/net/virtio/virtio_user/vhost_user.c
@@ -235,6 +235,7 @@ static const char * const vhost_msg_strings[] = {
        [VHOST_USER_SET_VRING_ADDR] = "VHOST_USER_SET_VRING_ADDR",
        [VHOST_USER_SET_VRING_KICK] = "VHOST_USER_SET_VRING_KICK",
        [VHOST_USER_SET_MEM_TABLE] = "VHOST_USER_SET_MEM_TABLE",
+       [VHOST_USER_SET_VRING_ENABLE] = "VHOST_USER_SET_VRING_ENABLE",
        NULL,
 };
 
@@ -287,6 +288,7 @@ vhost_user_sock(int vhostfd, uint64_t req, void *arg)
 
        case VHOST_USER_SET_VRING_NUM:
        case VHOST_USER_SET_VRING_BASE:
+       case VHOST_USER_SET_VRING_ENABLE:
                memcpy(&msg.payload.state, arg, sizeof(msg.payload.state));
                msg.size = sizeof(m.payload.state);
                break;
@@ -403,3 +405,22 @@ vhost_user_setup(const char *path)
 
        return fd;
 }
+
+int
+vhost_user_enable_queue_pair(int vhostfd, uint16_t pair_idx, int enable)
+{
+       int i;
+
+       for (i = 0; i < 2; ++i) {
+               struct vhost_vring_state state = {
+                       .index = pair_idx * 2 + i,
+                       .num   = enable,
+               };
+
+               if (vhost_user_sock(vhostfd,
+                                   VHOST_USER_SET_VRING_ENABLE, &state))
+                       return -1;
+       }
+
+       return 0;
+}