net/virtio: move vhost-vDPA data to its backend
[dpdk.git] / drivers / net / virtio / virtio_user / vhost_vdpa.c
index 8ebc679..e2d6d35 100644 (file)
 #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)
+
 /* vhost kernel & vdpa ioctls */
 #define VHOST_VIRTIO 0xAF
 #define VHOST_GET_FEATURES _IOR(VHOST_VIRTIO, 0x00, __u64)
 #define VHOST_SET_BACKEND_FEATURES _IOW(VHOST_VIRTIO, 0x25, __u64)
 #define VHOST_GET_BACKEND_FEATURES _IOR(VHOST_VIRTIO, 0x26, __u64)
 
-static uint64_t vhost_req_user_to_vdpa[] = {
-       [VHOST_USER_RESET_OWNER] = VHOST_RESET_OWNER,
-};
-
 /* no alignment requirement */
 struct vhost_iotlb_msg {
        uint64_t iova;
@@ -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_backend_features(struct virtio_user_dev *dev, uint64_t *features)
+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_backend_features(struct virtio_user_dev *dev, uint64_t features)
+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;
@@ -117,27 +129,45 @@ vhost_vdpa_get_features(struct virtio_user_dev *dev, uint64_t *features)
        /* Multiqueue not supported for now */
        *features &= ~(1ULL << VIRTIO_NET_F_MQ);
 
+       /* Negotiated vDPA backend 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;
+       }
+
+       data->protocol_features &= VHOST_VDPA_SUPPORTED_BACKEND_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;
+       }
+
        return 0;
 }
 
 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;
        }
@@ -145,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;
@@ -157,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;
        }
@@ -170,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;
@@ -183,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;
        }
@@ -200,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;
@@ -213,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;
        }
@@ -228,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;
@@ -338,99 +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;
 
-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);
+       return vhost_vdpa_ioctl(data->vhostfd, VHOST_VDPA_GET_STATUS, status);
 }
 
-/* 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.
- */
-#define VHOST_VDPA_GUEST_OFFLOADS_MASK \
-       ((1ULL << VIRTIO_NET_F_GUEST_CSUM) |    \
-        (1ULL << VIRTIO_NET_F_GUEST_TSO4) |    \
-        (1ULL << VIRTIO_NET_F_GUEST_TSO6) |    \
-        (1ULL << VIRTIO_NET_F_GUEST_ECN)  |    \
-        (1ULL << VIRTIO_NET_F_GUEST_UFO))
-
-#define VHOST_VDPA_HOST_OFFLOADS_MASK          \
-       ((1ULL << VIRTIO_NET_F_HOST_TSO4) |     \
-        (1ULL << VIRTIO_NET_F_HOST_TSO6) |     \
-        (1ULL << VIRTIO_NET_F_CSUM))
-
 static int
-vhost_vdpa_send_request(struct virtio_user_dev *dev,
-                  enum vhost_user_request req,
-                  void *arg)
+vhost_vdpa_set_status(struct virtio_user_dev *dev, uint8_t status)
 {
-       int ret = -1;
-       uint64_t req_vdpa;
-
-       PMD_DRV_LOG(INFO, "%s", vhost_msg_strings[req]);
+       struct vhost_vdpa_data *data = dev->backend_data;
 
-       req_vdpa = vhost_req_user_to_vdpa[req];
-
-       switch (req_vdpa) {
-       case VHOST_SET_VRING_ADDR:
-               PMD_DRV_LOG(DEBUG, "vhostfd=%d, index=%u",
-                           dev->vhostfd, *(unsigned int *)arg);
-               break;
-       default:
-               break;
-       }
-
-       ret = ioctl(dev->vhostfd, req_vdpa, arg);
-       if (ret < 0)
-               PMD_DRV_LOG(ERR, "%s failed: %s",
-                           vhost_msg_strings[req], strerror(errno));
-
-       return ret;
+       return vhost_vdpa_ioctl(data->vhostfd, VHOST_VDPA_SET_STATUS, &status);
 }
 
 /**
@@ -443,21 +450,49 @@ vhost_vdpa_send_request(struct virtio_user_dev *dev,
 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)
+{
+       struct vhost_vdpa_data *data = dev->backend_data;
+
+       if (!data)
+               return 0;
+
+       close(data->vhostfd);
+
+       free(data);
+       dev->backend_data = NULL;
+
        return 0;
 }
 
@@ -486,13 +521,35 @@ vhost_vdpa_enable_queue_pair(struct virtio_user_dev *dev,
        return 0;
 }
 
+static int
+vhost_vdpa_get_backend_features(uint64_t *features)
+{
+       *features = 0;
+
+       return 0;
+}
+
+static int
+vhost_vdpa_update_link_state(struct virtio_user_dev *dev __rte_unused)
+{
+       /* Nothing to update (for now?) */
+       return 0;
+}
+
+static int
+vhost_vdpa_get_intr_fd(struct virtio_user_dev *dev __rte_unused)
+{
+       /* No link state interrupt with Vhost-vDPA */
+       return -1;
+}
+
 struct virtio_user_backend_ops virtio_ops_vdpa = {
        .setup = vhost_vdpa_setup,
+       .destroy = vhost_vdpa_destroy,
+       .get_backend_features = vhost_vdpa_get_backend_features,
        .set_owner = vhost_vdpa_set_owner,
        .get_features = vhost_vdpa_get_features,
        .set_features = vhost_vdpa_set_features,
-       .get_protocol_features = vhost_vdpa_get_backend_features,
-       .set_protocol_features = vhost_vdpa_set_backend_features,
        .set_memory_table = vhost_vdpa_set_memory_table,
        .set_vring_num = vhost_vdpa_set_vring_num,
        .set_vring_base = vhost_vdpa_set_vring_base,
@@ -502,8 +559,9 @@ struct virtio_user_backend_ops virtio_ops_vdpa = {
        .set_vring_addr = vhost_vdpa_set_vring_addr,
        .get_status = vhost_vdpa_get_status,
        .set_status = vhost_vdpa_set_status,
-       .send_request = vhost_vdpa_send_request,
        .enable_qp = vhost_vdpa_enable_queue_pair,
        .dma_map = vhost_vdpa_dma_map_batch,
        .dma_unmap = vhost_vdpa_dma_unmap_batch,
+       .update_link_state = vhost_vdpa_update_link_state,
+       .get_intr_fd = vhost_vdpa_get_intr_fd,
 };