net/virtio: move vhost-vDPA data to its backend

As done earlier for Vhost-user and Vhost-kernel, this
patch moves the Vhost-vDPA specific data to its backend
file.

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_vdpa.c b/drivers/net/virtio/virtio_user/vhost_vdpa.c
index 5e3778b..e2d6d35 100644 (file)
--- a/drivers/net/virtio/virtio_user/vhost_vdpa.c
+++ b/drivers/net/virtio/virtio_user/vhost_vdpa.c
@@ -13,6 +13,11 @@
 #include "vhost.h"
 #include "virtio_user_dev.h"
 
+struct vhost_vdpa_data {
+       int vhostfd;
+       uint64_t protocol_features;
+};
+
 #define VHOST_VDPA_SUPPORTED_BACKEND_FEATURES          \
        (1ULL << VHOST_BACKEND_F_IOTLB_MSG_V2   |       \
        1ULL << VHOST_BACKEND_F_IOTLB_BATCH)
@@ -88,27 +93,34 @@ vhost_vdpa_ioctl(int fd, uint64_t request, void *arg)
 static int
 vhost_vdpa_set_owner(struct virtio_user_dev *dev)
 {
-       return vhost_vdpa_ioctl(dev->vhostfd, VHOST_SET_OWNER, NULL);
+       struct vhost_vdpa_data *data = dev->backend_data;
+
+       return vhost_vdpa_ioctl(data->vhostfd, VHOST_SET_OWNER, NULL);
 }
 
 static int
 vhost_vdpa_get_protocol_features(struct virtio_user_dev *dev, uint64_t *features)
 {
-       return vhost_vdpa_ioctl(dev->vhostfd, VHOST_GET_BACKEND_FEATURES, features);
+       struct vhost_vdpa_data *data = dev->backend_data;
+
+       return vhost_vdpa_ioctl(data->vhostfd, VHOST_GET_BACKEND_FEATURES, features);
 }
 
 static int
 vhost_vdpa_set_protocol_features(struct virtio_user_dev *dev, uint64_t features)
 {
-       return vhost_vdpa_ioctl(dev->vhostfd, VHOST_SET_BACKEND_FEATURES, &features);
+       struct vhost_vdpa_data *data = dev->backend_data;
+
+       return vhost_vdpa_ioctl(data->vhostfd, VHOST_SET_BACKEND_FEATURES, &features);
 }
 
 static int
 vhost_vdpa_get_features(struct virtio_user_dev *dev, uint64_t *features)
 {
+       struct vhost_vdpa_data *data = dev->backend_data;
        int ret;
 
-       ret = vhost_vdpa_ioctl(dev->vhostfd, VHOST_GET_FEATURES, features);
+       ret = vhost_vdpa_ioctl(data->vhostfd, VHOST_GET_FEATURES, features);
        if (ret) {
                PMD_DRV_LOG(ERR, "Failed to get features");
                return -1;
@@ -118,15 +130,15 @@ vhost_vdpa_get_features(struct virtio_user_dev *dev, uint64_t *features)
        *features &= ~(1ULL << VIRTIO_NET_F_MQ);
 
        /* Negotiated vDPA backend features */
-       ret = vhost_vdpa_get_protocol_features(dev, &dev->protocol_features);
+       ret = vhost_vdpa_get_protocol_features(dev, &data->protocol_features);
        if (ret < 0) {
                PMD_DRV_LOG(ERR, "Failed to get backend features");
                return -1;
        }
 
-       dev->protocol_features &= VHOST_VDPA_SUPPORTED_BACKEND_FEATURES;
+       data->protocol_features &= VHOST_VDPA_SUPPORTED_BACKEND_FEATURES;
 
-       ret = vhost_vdpa_set_protocol_features(dev, dev->protocol_features);
+       ret = vhost_vdpa_set_protocol_features(dev, data->protocol_features);
        if (ret < 0) {
                PMD_DRV_LOG(ERR, "Failed to set backend features");
                return -1;
@@ -138,21 +150,24 @@ vhost_vdpa_get_features(struct virtio_user_dev *dev, uint64_t *features)
 static int
 vhost_vdpa_set_features(struct virtio_user_dev *dev, uint64_t features)
 {
+       struct vhost_vdpa_data *data = dev->backend_data;
+
        /* WORKAROUND */
        features |= 1ULL << VIRTIO_F_IOMMU_PLATFORM;
 
-       return vhost_vdpa_ioctl(dev->vhostfd, VHOST_SET_FEATURES, &features);
+       return vhost_vdpa_ioctl(data->vhostfd, VHOST_SET_FEATURES, &features);
 }
 
 static int
 vhost_vdpa_iotlb_batch_begin(struct virtio_user_dev *dev)
 {
+       struct vhost_vdpa_data *data = dev->backend_data;
        struct vhost_msg msg = {};
 
-       if (!(dev->protocol_features & (1ULL << VHOST_BACKEND_F_IOTLB_BATCH)))
+       if (!(data->protocol_features & (1ULL << VHOST_BACKEND_F_IOTLB_BATCH)))
                return 0;
 
-       if (!(dev->protocol_features & (1ULL << VHOST_BACKEND_F_IOTLB_MSG_V2))) {
+       if (!(data->protocol_features & (1ULL << VHOST_BACKEND_F_IOTLB_MSG_V2))) {
                PMD_DRV_LOG(ERR, "IOTLB_MSG_V2 not supported by the backend.");
                return -1;
        }
@@ -160,7 +175,7 @@ vhost_vdpa_iotlb_batch_begin(struct virtio_user_dev *dev)
        msg.type = VHOST_IOTLB_MSG_V2;
        msg.iotlb.type = VHOST_IOTLB_BATCH_BEGIN;
 
-       if (write(dev->vhostfd, &msg, sizeof(msg)) != sizeof(msg)) {
+       if (write(data->vhostfd, &msg, sizeof(msg)) != sizeof(msg)) {
                PMD_DRV_LOG(ERR, "Failed to send IOTLB batch begin (%s)",
                                strerror(errno));
                return -1;
@@ -172,12 +187,13 @@ vhost_vdpa_iotlb_batch_begin(struct virtio_user_dev *dev)
 static int
 vhost_vdpa_iotlb_batch_end(struct virtio_user_dev *dev)
 {
+       struct vhost_vdpa_data *data = dev->backend_data;
        struct vhost_msg msg = {};
 
-       if (!(dev->protocol_features & (1ULL << VHOST_BACKEND_F_IOTLB_BATCH)))
+       if (!(data->protocol_features & (1ULL << VHOST_BACKEND_F_IOTLB_BATCH)))
                return 0;
 
-       if (!(dev->protocol_features & (1ULL << VHOST_BACKEND_F_IOTLB_MSG_V2))) {
+       if (!(data->protocol_features & (1ULL << VHOST_BACKEND_F_IOTLB_MSG_V2))) {
                PMD_DRV_LOG(ERR, "IOTLB_MSG_V2 not supported by the backend.");
                return -1;
        }
@@ -185,7 +201,7 @@ vhost_vdpa_iotlb_batch_end(struct virtio_user_dev *dev)
        msg.type = VHOST_IOTLB_MSG_V2;
        msg.iotlb.type = VHOST_IOTLB_BATCH_END;
 
-       if (write(dev->vhostfd, &msg, sizeof(msg)) != sizeof(msg)) {
+       if (write(data->vhostfd, &msg, sizeof(msg)) != sizeof(msg)) {
                PMD_DRV_LOG(ERR, "Failed to send IOTLB batch end (%s)",
                                strerror(errno));
                return -1;
@@ -198,9 +214,10 @@ static int
 vhost_vdpa_dma_map(struct virtio_user_dev *dev, void *addr,
                                  uint64_t iova, size_t len)
 {
+       struct vhost_vdpa_data *data = dev->backend_data;
        struct vhost_msg msg = {};
 
-       if (!(dev->protocol_features & (1ULL << VHOST_BACKEND_F_IOTLB_MSG_V2))) {
+       if (!(data->protocol_features & (1ULL << VHOST_BACKEND_F_IOTLB_MSG_V2))) {
                PMD_DRV_LOG(ERR, "IOTLB_MSG_V2 not supported by the backend.");
                return -1;
        }
@@ -215,7 +232,7 @@ vhost_vdpa_dma_map(struct virtio_user_dev *dev, void *addr,
        PMD_DRV_LOG(DEBUG, "%s: iova: 0x%" PRIx64 ", addr: %p, len: 0x%zx",
                        __func__, iova, addr, len);
 
-       if (write(dev->vhostfd, &msg, sizeof(msg)) != sizeof(msg)) {
+       if (write(data->vhostfd, &msg, sizeof(msg)) != sizeof(msg)) {
                PMD_DRV_LOG(ERR, "Failed to send IOTLB update (%s)",
                                strerror(errno));
                return -1;
@@ -228,9 +245,10 @@ static int
 vhost_vdpa_dma_unmap(struct virtio_user_dev *dev, __rte_unused void *addr,
                                  uint64_t iova, size_t len)
 {
+       struct vhost_vdpa_data *data = dev->backend_data;
        struct vhost_msg msg = {};
 
-       if (!(dev->protocol_features & (1ULL << VHOST_BACKEND_F_IOTLB_MSG_V2))) {
+       if (!(data->protocol_features & (1ULL << VHOST_BACKEND_F_IOTLB_MSG_V2))) {
                PMD_DRV_LOG(ERR, "IOTLB_MSG_V2 not supported by the backend.");
                return -1;
        }
@@ -243,7 +261,7 @@ vhost_vdpa_dma_unmap(struct virtio_user_dev *dev, __rte_unused void *addr,
        PMD_DRV_LOG(DEBUG, "%s: iova: 0x%" PRIx64 ", len: 0x%zx",
                        __func__, iova, len);
 
-       if (write(dev->vhostfd, &msg, sizeof(msg)) != sizeof(msg)) {
+       if (write(data->vhostfd, &msg, sizeof(msg)) != sizeof(msg)) {
                PMD_DRV_LOG(ERR, "Failed to send IOTLB invalidate (%s)",
                                strerror(errno));
                return -1;
@@ -353,55 +371,73 @@ batch_end:
 static int
 vhost_vdpa_set_vring_enable(struct virtio_user_dev *dev, struct vhost_vring_state *state)
 {
-       return vhost_vdpa_ioctl(dev->vhostfd, VHOST_VDPA_SET_VRING_ENABLE, state);
+       struct vhost_vdpa_data *data = dev->backend_data;
+
+       return vhost_vdpa_ioctl(data->vhostfd, VHOST_VDPA_SET_VRING_ENABLE, state);
 }
 
 static int
 vhost_vdpa_set_vring_num(struct virtio_user_dev *dev, struct vhost_vring_state *state)
 {
-       return vhost_vdpa_ioctl(dev->vhostfd, VHOST_SET_VRING_NUM, state);
+       struct vhost_vdpa_data *data = dev->backend_data;
+
+       return vhost_vdpa_ioctl(data->vhostfd, VHOST_SET_VRING_NUM, state);
 }
 
 static int
 vhost_vdpa_set_vring_base(struct virtio_user_dev *dev, struct vhost_vring_state *state)
 {
-       return vhost_vdpa_ioctl(dev->vhostfd, VHOST_SET_VRING_BASE, state);
+       struct vhost_vdpa_data *data = dev->backend_data;
+
+       return vhost_vdpa_ioctl(data->vhostfd, VHOST_SET_VRING_BASE, state);
 }
 
 static int
 vhost_vdpa_get_vring_base(struct virtio_user_dev *dev, struct vhost_vring_state *state)
 {
-       return vhost_vdpa_ioctl(dev->vhostfd, VHOST_GET_VRING_BASE, state);
+       struct vhost_vdpa_data *data = dev->backend_data;
+
+       return vhost_vdpa_ioctl(data->vhostfd, VHOST_GET_VRING_BASE, state);
 }
 
 static int
 vhost_vdpa_set_vring_call(struct virtio_user_dev *dev, struct vhost_vring_file *file)
 {
-       return vhost_vdpa_ioctl(dev->vhostfd, VHOST_SET_VRING_CALL, file);
+       struct vhost_vdpa_data *data = dev->backend_data;
+
+       return vhost_vdpa_ioctl(data->vhostfd, VHOST_SET_VRING_CALL, file);
 }
 
 static int
 vhost_vdpa_set_vring_kick(struct virtio_user_dev *dev, struct vhost_vring_file *file)
 {
-       return vhost_vdpa_ioctl(dev->vhostfd, VHOST_SET_VRING_KICK, file);
+       struct vhost_vdpa_data *data = dev->backend_data;
+
+       return vhost_vdpa_ioctl(data->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);
+       struct vhost_vdpa_data *data = dev->backend_data;
+
+       return vhost_vdpa_ioctl(data->vhostfd, VHOST_SET_VRING_ADDR, addr);
 }
 
 static int
 vhost_vdpa_get_status(struct virtio_user_dev *dev, uint8_t *status)
 {
-       return vhost_vdpa_ioctl(dev->vhostfd, VHOST_VDPA_GET_STATUS, status);
+       struct vhost_vdpa_data *data = dev->backend_data;
+
+       return vhost_vdpa_ioctl(data->vhostfd, VHOST_VDPA_GET_STATUS, status);
 }
 
 static int
 vhost_vdpa_set_status(struct virtio_user_dev *dev, uint8_t status)
 {
-       return vhost_vdpa_ioctl(dev->vhostfd, VHOST_VDPA_SET_STATUS, &status);
+       struct vhost_vdpa_data *data = dev->backend_data;
+
+       return vhost_vdpa_ioctl(data->vhostfd, VHOST_VDPA_SET_STATUS, &status);
 }
 
 /**
@@ -414,27 +450,49 @@ vhost_vdpa_set_status(struct virtio_user_dev *dev, uint8_t status)
 static int
 vhost_vdpa_setup(struct virtio_user_dev *dev)
 {
+       struct vhost_vdpa_data *data;
        uint32_t did = (uint32_t)-1;
 
-       dev->vhostfd = open(dev->path, O_RDWR);
-       if (dev->vhostfd < 0) {
+       data = malloc(sizeof(*data));
+       if (!data) {
+               PMD_DRV_LOG(ERR, "(%s) Faidle to allocate backend data", dev->path);
+               return -1;
+       }
+
+       data->vhostfd = open(dev->path, O_RDWR);
+       if (data->vhostfd < 0) {
                PMD_DRV_LOG(ERR, "Failed to open %s: %s\n",
                                dev->path, strerror(errno));
+               free(data);
                return -1;
        }
 
-       if (ioctl(dev->vhostfd, VHOST_VDPA_GET_DEVICE_ID, &did) < 0 ||
+       if (ioctl(data->vhostfd, VHOST_VDPA_GET_DEVICE_ID, &did) < 0 ||
                        did != VIRTIO_ID_NETWORK) {
                PMD_DRV_LOG(ERR, "Invalid vdpa device ID: %u\n", did);
+               close(data->vhostfd);
+               free(data);
                return -1;
        }
 
+       dev->backend_data = data;
+
        return 0;
 }
 
 static int
-vhost_vdpa_destroy(struct virtio_user_dev *dev __rte_unused)
+vhost_vdpa_destroy(struct virtio_user_dev *dev)
 {
+       struct vhost_vdpa_data *data = dev->backend_data;
+
+       if (!data)
+               return 0;
+
+       close(data->vhostfd);
+
+       free(data);
+       dev->backend_data = NULL;
+
        return 0;
 }
 

diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.h b/drivers/net/virtio/virtio_user/virtio_user_dev.h
index 36a9cad..8a62f7e 100644 (file)
--- a/drivers/net/virtio/virtio_user/virtio_user_dev.h
+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.h
@@ -29,10 +29,6 @@ struct virtio_user_dev {
        enum virtio_user_backend_type backend_type;
        bool            is_server;  /* server or client mode */
 
-       /* for vhost_vdpa backend */
-       int             vhostfd;
-
-       /* for both vhost_user and vhost_kernel */
        int             callfds[VIRTIO_MAX_VIRTQUEUES];
        int             kickfds[VIRTIO_MAX_VIRTQUEUES];
        int             mac_specified;
@@ -45,7 +41,6 @@ struct virtio_user_dev {
        uint64_t        device_features; /* supported features by device */
        uint64_t        frontend_features; /* enabled frontend features */
        uint64_t        unsupported_features; /* unsupported features mask */
-       uint64_t        protocol_features; /* negotiated protocol features */
        uint8_t         status;
        uint16_t        net_status;
        uint16_t        port_id;