net/bnxt: fix VLAN strip flags in SSE Rx

[dpdk.git] / drivers / net / vhost / rte_eth_vhost.c

diff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c
index 74cc736..a635889 100644 (file)
--- a/drivers/net/vhost/rte_eth_vhost.c
+++ b/drivers/net/vhost/rte_eth_vhost.c
@@ -31,6 +31,7 @@ enum {VIRTIO_RXQ, VIRTIO_TXQ, VIRTIO_QNUM};
 #define ETH_VHOST_DEQUEUE_ZERO_COPY    "dequeue-zero-copy"
 #define ETH_VHOST_IOMMU_SUPPORT                "iommu-support"
 #define ETH_VHOST_POSTCOPY_SUPPORT     "postcopy-support"
+#define ETH_VHOST_VIRTIO_NET_F_HOST_TSO "tso"
 #define VHOST_MAX_PKT_BURST 32
 
 static const char *valid_arguments[] = {
@@ -40,6 +41,7 @@ static const char *valid_arguments[] = {
        ETH_VHOST_DEQUEUE_ZERO_COPY,
        ETH_VHOST_IOMMU_SUPPORT,
        ETH_VHOST_POSTCOPY_SUPPORT,
+       ETH_VHOST_VIRTIO_NET_F_HOST_TSO,
        NULL
 };
 
@@ -216,7 +218,7 @@ static const struct vhost_xstats_name_off vhost_txport_stat_strings[] = {
 #define VHOST_NB_XSTATS_TXPORT (sizeof(vhost_txport_stat_strings) / \
                                sizeof(vhost_txport_stat_strings[0]))
 
-static void
+static int
 vhost_dev_xstats_reset(struct rte_eth_dev *dev)
 {
        struct vhost_queue *vq = NULL;
@@ -234,6 +236,8 @@ vhost_dev_xstats_reset(struct rte_eth_dev *dev)
                        continue;
                memset(&vq->stats, 0, sizeof(vq->stats));
        }
+
+       return 0;
 }
 
 static int
@@ -851,6 +855,10 @@ vring_state_changed(int vid, uint16_t vring, int enable)
        /* won't be NULL */
        state = vring_states[eth_dev->data->port_id];
        rte_spinlock_lock(&state->lock);
+       if (state->cur[vring] == enable) {
+               rte_spinlock_unlock(&state->lock);
+               return 0;
+       }
        state->cur[vring] = enable;
        state->max_vring = RTE_MAX(vring, state->max_vring);
        rte_spinlock_unlock(&state->lock);
@@ -1119,7 +1127,7 @@ eth_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
        return 0;
 }
 
-static void
+static int
 eth_stats_reset(struct rte_eth_dev *dev)
 {
        struct vhost_queue *vq;
@@ -1140,6 +1148,8 @@ eth_stats_reset(struct rte_eth_dev *dev)
                vq->stats.bytes = 0;
                vq->stats.missed_pkts = 0;
        }
+
+       return 0;
 }
 
 static void
@@ -1201,7 +1211,8 @@ static const struct eth_dev_ops ops = {
 
 static int
 eth_dev_vhost_create(struct rte_vdev_device *dev, char *iface_name,
-       int16_t queues, const unsigned int numa_node, uint64_t flags)
+       int16_t queues, const unsigned int numa_node, uint64_t flags,
+       uint64_t disable_flags)
 {
        const char *name = rte_vdev_device_name(dev);
        struct rte_eth_dev_data *data;
@@ -1273,6 +1284,12 @@ eth_dev_vhost_create(struct rte_vdev_device *dev, char *iface_name,
        if (rte_vhost_driver_register(iface_name, flags))
                goto error;
 
+       if (disable_flags) {
+               if (rte_vhost_driver_disable_features(iface_name,
+                                       disable_flags))
+                       goto error;
+       }
+
        if (rte_vhost_driver_callback_register(iface_name, &vhost_ops) < 0) {
                VHOST_LOG(ERR, "Can't register callbacks\n");
                goto error;
@@ -1285,7 +1302,7 @@ eth_dev_vhost_create(struct rte_vdev_device *dev, char *iface_name,
        }
 
        rte_eth_dev_probing_finish(eth_dev);
-       return data->port_id;
+       return 0;
 
 error:
        if (internal) {
@@ -1335,10 +1352,12 @@ rte_pmd_vhost_probe(struct rte_vdev_device *dev)
        char *iface_name;
        uint16_t queues;
        uint64_t flags = 0;
+       uint64_t disable_flags = 0;
        int client_mode = 0;
        int dequeue_zero_copy = 0;
        int iommu_support = 0;
        int postcopy_support = 0;
+       int tso = 0;
        struct rte_eth_dev *eth_dev;
        const char *name = rte_vdev_device_name(dev);
 
@@ -1420,11 +1439,26 @@ rte_pmd_vhost_probe(struct rte_vdev_device *dev)
                        flags |= RTE_VHOST_USER_POSTCOPY_SUPPORT;
        }
 
+       if (rte_kvargs_count(kvlist, ETH_VHOST_VIRTIO_NET_F_HOST_TSO) == 1) {
+               ret = rte_kvargs_process(kvlist,
+                               ETH_VHOST_VIRTIO_NET_F_HOST_TSO,
+                               &open_int, &tso);
+               if (ret < 0)
+                       goto out_free;
+
+               if (tso == 0) {
+                       disable_flags |= (1ULL << VIRTIO_NET_F_HOST_TSO4);
+                       disable_flags |= (1ULL << VIRTIO_NET_F_HOST_TSO6);
+               }
+       }
+
        if (dev->device.numa_node == SOCKET_ID_ANY)
                dev->device.numa_node = rte_socket_id();
 
-       eth_dev_vhost_create(dev, iface_name, queues, dev->device.numa_node,
-               flags);
+       ret = eth_dev_vhost_create(dev, iface_name, queues,
+                                  dev->device.numa_node, flags, disable_flags);
+       if (ret == -1)
+               VHOST_LOG(ERR, "Failed to create %s\n", name);
 
 out_free:
        rte_kvargs_free(kvlist);
@@ -1468,7 +1502,8 @@ RTE_PMD_REGISTER_PARAM_STRING(net_vhost,
        "client=<0|1> "
        "dequeue-zero-copy=<0|1> "
        "iommu-support=<0|1> "
-       "postcopy-support=<0|1>");
+       "postcopy-support=<0|1> "
+       "tso=<0|1>");
 
 RTE_INIT(vhost_init_log)
 {