net/virtio: add virtio-user vring address ops

This patch introduces a new callback for setting
vrings addresses.

Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Reviewed-by: Chenbo Xia <chenbo.xia@intel.com>

diff --git a/drivers/net/virtio/virtio_user/vhost.h b/drivers/net/virtio/virtio_user/vhost.h
index 94c5245..19040df 100644 (file)
--- a/drivers/net/virtio/virtio_user/vhost.h
+++ b/drivers/net/virtio/virtio_user/vhost.h
@@ -120,6 +120,7 @@ struct virtio_user_backend_ops {
        int (*get_vring_base)(struct virtio_user_dev *dev, struct vhost_vring_state *state);
        int (*set_vring_call)(struct virtio_user_dev *dev, struct vhost_vring_file *file);
        int (*set_vring_kick)(struct virtio_user_dev *dev, struct vhost_vring_file *file);
+       int (*set_vring_addr)(struct virtio_user_dev *dev, struct vhost_vring_addr *addr);
        int (*send_request)(struct virtio_user_dev *dev,
                            enum vhost_user_request req,
                            void *arg);

diff --git a/drivers/net/virtio/virtio_user/vhost_kernel.c b/drivers/net/virtio/virtio_user/vhost_kernel.c
index bdef436..48eeb77 100644 (file)
--- a/drivers/net/virtio/virtio_user/vhost_kernel.c
+++ b/drivers/net/virtio/virtio_user/vhost_kernel.c
@@ -294,9 +294,30 @@ vhost_kernel_set_vring_call(struct virtio_user_dev *dev, struct vhost_vring_file
        return vhost_kernel_set_vring_file(dev, VHOST_SET_VRING_CALL, file);
 }
 
+static int
+vhost_kernel_set_vring_addr(struct virtio_user_dev *dev, struct vhost_vring_addr *addr)
+{
+       int ret, fd;
+       unsigned int index = addr->index;
+
+       /* Convert from queue index to queue-pair & offset */
+       fd = dev->vhostfds[addr->index / 2];
+       addr->index %= 2;
+
+       ret = vhost_kernel_ioctl(fd, VHOST_SET_VRING_ADDR, addr);
+       if (ret < 0) {
+               PMD_DRV_LOG(ERR, "Failed to set vring address");
+               return -1;
+       }
+
+       /* restore index back to queue index */
+       addr->index = index;
+
+       return 0;
+}
+
 static uint64_t vhost_req_user_to_kernel[] = {
        [VHOST_USER_RESET_OWNER] = VHOST_RESET_OWNER,
-       [VHOST_USER_SET_VRING_ADDR] = VHOST_SET_VRING_ADDR,
 };
 
 static int
@@ -308,20 +329,12 @@ vhost_kernel_send_request(struct virtio_user_dev *dev,
        unsigned int i;
        uint64_t req_kernel;
        int vhostfd;
-       unsigned int queue_sel;
 
        PMD_DRV_LOG(INFO, "%s", vhost_msg_strings[req]);
 
        req_kernel = vhost_req_user_to_kernel[req];
 
        switch (req_kernel) {
-       case VHOST_SET_VRING_ADDR:
-               queue_sel = *(unsigned int *)arg;
-               vhostfd = dev->vhostfds[queue_sel / 2];
-               *(unsigned int *)arg = queue_sel % 2;
-               PMD_DRV_LOG(DEBUG, "vhostfd=%d, index=%u",
-                           vhostfd, *(unsigned int *)arg);
-               break;
        default:
                vhostfd = -1;
        }
@@ -473,6 +486,7 @@ struct virtio_user_backend_ops virtio_ops_kernel = {
        .get_vring_base = vhost_kernel_get_vring_base,
        .set_vring_call = vhost_kernel_set_vring_call,
        .set_vring_kick = vhost_kernel_set_vring_kick,
+       .set_vring_addr = vhost_kernel_set_vring_addr,
        .send_request = vhost_kernel_send_request,
        .enable_qp = vhost_kernel_enable_queue_pair
 };

diff --git a/drivers/net/virtio/virtio_user/vhost_user.c b/drivers/net/virtio/virtio_user/vhost_user.c
index ccb4048..9ff49d2 100644 (file)
--- a/drivers/net/virtio/virtio_user/vhost_user.c
+++ b/drivers/net/virtio/virtio_user/vhost_user.c
@@ -538,11 +538,32 @@ vhost_user_set_vring_kick(struct virtio_user_dev *dev, struct vhost_vring_file *
        return vhost_user_set_vring_file(dev, VHOST_USER_SET_VRING_KICK, file);
 }
 
+
+static int
+vhost_user_set_vring_addr(struct virtio_user_dev *dev, struct vhost_vring_addr *addr)
+{
+       int ret;
+       struct vhost_user_msg msg = {
+               .request = VHOST_USER_SET_VRING_ADDR,
+               .flags = VHOST_USER_VERSION,
+               .size = sizeof(*addr),
+               .payload.addr = *addr,
+       };
+
+       ret = vhost_user_write(dev->vhostfd, &msg, NULL, 0);
+       if (ret < 0) {
+               PMD_DRV_LOG(ERR, "Failed to send vring addresses");
+               return -1;
+       }
+
+       return 0;
+}
+
+
 static struct vhost_user_msg m;
 
 const char * const vhost_msg_strings[] = {
        [VHOST_USER_RESET_OWNER] = "VHOST_RESET_OWNER",
-       [VHOST_USER_SET_VRING_ADDR] = "VHOST_SET_VRING_ADDR",
        [VHOST_USER_SET_STATUS] = "VHOST_SET_STATUS",
        [VHOST_USER_GET_STATUS] = "VHOST_GET_STATUS",
 };
@@ -610,11 +631,6 @@ vhost_user_sock(struct virtio_user_dev *dev,
                fds[fd_num++] = *((int *)arg);
                break;
 
-       case VHOST_USER_SET_VRING_ADDR:
-               memcpy(&msg.payload.addr, arg, sizeof(msg.payload.addr));
-               msg.size = sizeof(m.payload.addr);
-               break;
-
        case VHOST_USER_SET_VRING_ERR:
                file = arg;
                msg.payload.u64 = file->index & VHOST_USER_VRING_IDX_MASK;
@@ -787,6 +803,7 @@ struct virtio_user_backend_ops virtio_ops_user = {
        .get_vring_base = vhost_user_get_vring_base,
        .set_vring_call = vhost_user_set_vring_call,
        .set_vring_kick = vhost_user_set_vring_kick,
+       .set_vring_addr = vhost_user_set_vring_addr,
        .send_request = vhost_user_sock,
        .enable_qp = vhost_user_enable_queue_pair
 };

diff --git a/drivers/net/virtio/virtio_user/vhost_vdpa.c b/drivers/net/virtio/virtio_user/vhost_vdpa.c
index 304a808..1ec6bb2 100644 (file)
--- a/drivers/net/virtio/virtio_user/vhost_vdpa.c
+++ b/drivers/net/virtio/virtio_user/vhost_vdpa.c
@@ -38,7 +38,6 @@
 
 static uint64_t vhost_req_user_to_vdpa[] = {
        [VHOST_USER_RESET_OWNER] = VHOST_RESET_OWNER,
-       [VHOST_USER_SET_VRING_ADDR] = VHOST_SET_VRING_ADDR,
        [VHOST_USER_SET_STATUS] = VHOST_VDPA_SET_STATUS,
        [VHOST_USER_GET_STATUS] = VHOST_VDPA_GET_STATUS,
 };
@@ -374,6 +373,12 @@ vhost_vdpa_set_vring_kick(struct virtio_user_dev *dev, struct vhost_vring_file *
        return vhost_vdpa_ioctl(dev->vhostfd, VHOST_SET_VRING_KICK, file);
 }
 
+static int
+vhost_vdpa_set_vring_addr(struct virtio_user_dev *dev, struct vhost_vring_addr *addr)
+{
+       return vhost_vdpa_ioctl(dev->vhostfd, VHOST_SET_VRING_ADDR, addr);
+}
+
 /* with below features, vhost vdpa does not need to do the checksum and TSO,
  * these info will be passed to virtio_user through virtio net header.
  */
@@ -484,6 +489,7 @@ struct virtio_user_backend_ops virtio_ops_vdpa = {
        .get_vring_base = vhost_vdpa_get_vring_base,
        .set_vring_call = vhost_vdpa_set_vring_call,
        .set_vring_kick = vhost_vdpa_set_vring_kick,
+       .set_vring_addr = vhost_vdpa_set_vring_addr,
        .send_request = vhost_vdpa_send_request,
        .enable_qp = vhost_vdpa_enable_queue_pair,
        .dma_map = vhost_vdpa_dma_map_batch,

diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c
index 4383e40..7e365d0 100644 (file)
--- a/drivers/net/virtio/virtio_user/virtio_user_dev.c
+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c
@@ -81,7 +81,7 @@ virtio_user_kick_queue(struct virtio_user_dev *dev, uint32_t queue_sel)
                state.num |= (1 << 15);
        dev->ops->set_vring_base(dev, &state);
 
-       dev->ops->send_request(dev, VHOST_USER_SET_VRING_ADDR, &addr);
+       dev->ops->set_vring_addr(dev, &addr);
 
        /* Of all per virtqueue MSGs, make sure VHOST_USER_SET_VRING_KICK comes
         * lastly because vhost depends on this msg to judge if