net/liquidio: fix jumbo frame flag condition for MTU set

[dpdk.git] / drivers / net / virtio / virtio_user_ethdev.c

diff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c
index 38b49ba..241808c 100644 (file)
--- a/drivers/net/virtio/virtio_user_ethdev.c
+++ b/drivers/net/virtio/virtio_user_ethdev.c
@@ -6,7 +6,9 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <linux/major.h>
 #include <sys/stat.h>
+#include <sys/sysmacros.h>
 #include <sys/socket.h>
 
 #include <rte_malloc.h>
@@ -65,8 +67,7 @@ virtio_user_reset_queues_packed(struct rte_eth_dev *dev)
 static int
 virtio_user_server_reconnect(struct virtio_user_dev *dev)
 {
-       int ret;
-       int connectfd;
+       int ret, connectfd, old_status;
        struct rte_eth_dev *eth_dev = &rte_eth_devices[dev->port_id];
        struct virtio_hw *hw = eth_dev->data->dev_private;
        uint64_t protocol_features;
@@ -76,6 +77,14 @@ virtio_user_server_reconnect(struct virtio_user_dev *dev)
                return -1;
 
        dev->vhostfd = connectfd;
+       old_status = vtpci_get_status(hw);
+
+       vtpci_reset(hw);
+
+       vtpci_set_status(hw, VIRTIO_CONFIG_STATUS_ACK);
+
+       vtpci_set_status(hw, VIRTIO_CONFIG_STATUS_DRIVER);
+
        if (dev->ops->send_request(dev, VHOST_USER_GET_FEATURES,
                                   &dev->device_features) < 0) {
                PMD_INIT_LOG(ERR, "get_features failed: %s",
@@ -90,6 +99,9 @@ virtio_user_server_reconnect(struct virtio_user_dev *dev)
                                        &protocol_features))
                        return -1;
 
+               /* Offer VHOST_USER_PROTOCOL_F_STATUS */
+               dev->protocol_features |=
+                       (1ULL << VHOST_USER_PROTOCOL_F_STATUS);
                dev->protocol_features &= protocol_features;
 
                if (dev->ops->send_request(dev,
@@ -111,14 +123,17 @@ virtio_user_server_reconnect(struct virtio_user_dev *dev)
 
        /* For packed ring, resetting queues is required in reconnection. */
        if (vtpci_packed_queue(hw) &&
-          (vtpci_get_status(hw) & VIRTIO_CONFIG_STATUS_DRIVER_OK)) {
+          (old_status & VIRTIO_CONFIG_STATUS_DRIVER_OK)) {
                PMD_INIT_LOG(NOTICE, "Packets on the fly will be dropped"
                                " when packed ring reconnecting.");
                virtio_user_reset_queues_packed(eth_dev);
        }
 
-       ret = virtio_user_start_device(dev);
-       if (ret < 0)
+       vtpci_set_status(hw, VIRTIO_CONFIG_STATUS_FEATURES_OK);
+
+       /* Start the device */
+       vtpci_set_status(hw, VIRTIO_CONFIG_STATUS_DRIVER_OK);
+       if (!dev->started)
                return -1;
 
        if (dev->queue_pairs > 1) {
@@ -166,6 +181,11 @@ virtio_user_delayed_handler(void *param)
                if (dev->vhostfd >= 0) {
                        close(dev->vhostfd);
                        dev->vhostfd = -1;
+                       /* Until the featuers are negotiated again, don't assume
+                        * the backend supports VHOST_USER_PROTOCOL_F_STATUS
+                        */
+                       dev->protocol_features &=
+                               ~(1ULL << VHOST_USER_PROTOCOL_F_STATUS);
                }
                eth_dev->intr_handle->fd = dev->listenfd;
                rte_intr_callback_register(eth_dev->intr_handle,
@@ -267,13 +287,17 @@ static void
 virtio_user_set_status(struct virtio_hw *hw, uint8_t status)
 {
        struct virtio_user_dev *dev = virtio_user_get_dev(hw);
+       uint8_t old_status = dev->status;
 
+       if (status & VIRTIO_CONFIG_STATUS_FEATURES_OK &&
+                       ~old_status & VIRTIO_CONFIG_STATUS_FEATURES_OK)
+               virtio_user_dev_set_features(dev);
        if (status & VIRTIO_CONFIG_STATUS_DRIVER_OK)
                virtio_user_start_device(dev);
        else if (status == VIRTIO_CONFIG_STATUS_RESET)
                virtio_user_reset(hw);
-       dev->status = status;
-       virtio_user_send_status_update(dev, status);
+
+       virtio_user_dev_set_status(dev, status);
 }
 
 static uint8_t
@@ -281,7 +305,7 @@ virtio_user_get_status(struct virtio_hw *hw)
 {
        struct virtio_user_dev *dev = virtio_user_get_dev(hw);
 
-       virtio_user_update_status(dev);
+       virtio_user_dev_update_status(dev);
 
        return dev->status;
 }
@@ -519,17 +543,58 @@ get_integer_arg(const char *key __rte_unused,
        return -errno;
 }
 
+static uint32_t
+vdpa_dynamic_major_num(void)
+{
+       FILE *fp;
+       char *line = NULL;
+       size_t size;
+       char name[11];
+       bool found = false;
+       uint32_t num;
+
+       fp = fopen("/proc/devices", "r");
+       if (fp == NULL) {
+               PMD_INIT_LOG(ERR, "Cannot open /proc/devices: %s",
+                            strerror(errno));
+               return UNNAMED_MAJOR;
+       }
+
+       while (getline(&line, &size, fp) > 0) {
+               char *stripped = line + strspn(line, " ");
+               if ((sscanf(stripped, "%u %10s", &num, name) == 2) &&
+                   (strncmp(name, "vhost-vdpa", 10) == 0)) {
+                       found = true;
+                       break;
+               }
+       }
+       fclose(fp);
+       return found ? num : UNNAMED_MAJOR;
+}
+
 static enum virtio_user_backend_type
 virtio_user_backend_type(const char *path)
 {
        struct stat sb;
 
-       if (stat(path, &sb) == -1)
+       if (stat(path, &sb) == -1) {
+               if (errno == ENOENT)
+                       return VIRTIO_USER_BACKEND_VHOST_USER;
+
+               PMD_INIT_LOG(ERR, "Stat fails: %s (%s)\n", path,
+                            strerror(errno));
                return VIRTIO_USER_BACKEND_UNKNOWN;
+       }
 
-       return S_ISSOCK(sb.st_mode) ?
-               VIRTIO_USER_BACKEND_VHOST_USER :
-               VIRTIO_USER_BACKEND_VHOST_KERNEL;
+       if (S_ISSOCK(sb.st_mode)) {
+               return VIRTIO_USER_BACKEND_VHOST_USER;
+       } else if (S_ISCHR(sb.st_mode)) {
+               if (major(sb.st_rdev) == MISC_MAJOR)
+                       return VIRTIO_USER_BACKEND_VHOST_KERNEL;
+               if (major(sb.st_rdev) == vdpa_dynamic_major_num())
+                       return VIRTIO_USER_BACKEND_VHOST_VDPA;
+       }
+       return VIRTIO_USER_BACKEND_UNKNOWN;
 }
 
 static struct rte_eth_dev *
@@ -653,7 +718,8 @@ virtio_user_pmd_probe(struct rte_vdev_device *dev)
                        path);
                goto end;
        }
-
+       PMD_INIT_LOG(INFO, "Backend type detected: %s",
+                    virtio_user_backend_strings[backend_type]);
 
        if (rte_kvargs_count(kvlist, VIRTIO_USER_ARG_INTERFACE_NAME) == 1) {
                if (backend_type != VIRTIO_USER_BACKEND_VHOST_KERNEL) {
@@ -790,7 +856,7 @@ virtio_user_pmd_probe(struct rte_vdev_device *dev)
 
        if (vectorized) {
                if (packed_vq) {
-#if defined(CC_AVX512_SUPPORT)
+#if defined(CC_AVX512_SUPPORT) || defined(RTE_ARCH_ARM)
                        hw->use_vec_rx = 1;
                        hw->use_vec_tx = 1;
 #else
@@ -837,9 +903,7 @@ virtio_user_pmd_remove(struct rte_vdev_device *vdev)
                return rte_eth_dev_release_port(eth_dev);
 
        /* make sure the device is stopped, queues freed */
-       rte_eth_dev_close(eth_dev->data->port_id);
-
-       return 0;
+       return rte_eth_dev_close(eth_dev->data->port_id);
 }
 
 static int virtio_user_pmd_dma_map(struct rte_vdev_device *vdev, void *addr,