net/mlx5: make VLAN network interface thread safe

[dpdk.git] / drivers / net / ring / rte_eth_ring.c

diff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c
index 733c898..d6115ab 100644 (file)
--- a/drivers/net/ring/rte_eth_ring.c
+++ b/drivers/net/ring/rte_eth_ring.c
@@ -16,6 +16,7 @@
 #define ETH_RING_ACTION_CREATE         "CREATE"
 #define ETH_RING_ACTION_ATTACH         "ATTACH"
 #define ETH_RING_INTERNAL_ARG          "internal"
+#define ETH_RING_INTERNAL_ARG_MAX_LEN  19 /* "0x..16chars..\0" */
 
 static const char *valid_arguments[] = {
        ETH_RING_NUMA_NODE_ACTION_ARG,
@@ -105,10 +106,12 @@ eth_dev_start(struct rte_eth_dev *dev)
        return 0;
 }
 
-static void
+static int
 eth_dev_stop(struct rte_eth_dev *dev)
 {
+       dev->data->dev_started = 0;
        dev->data->dev_link.link_status = ETH_LINK_DOWN;
+       return 0;
 }
 
 static int
@@ -160,6 +163,8 @@ eth_dev_info(struct rte_eth_dev *dev,
        dev_info->max_mac_addrs = 1;
        dev_info->max_rx_pktlen = (uint32_t)-1;
        dev_info->max_rx_queues = (uint16_t)internals->max_rx_queues;
+       dev_info->rx_offload_capa = DEV_RX_OFFLOAD_SCATTER;
+       dev_info->tx_offload_capa = DEV_TX_OFFLOAD_MULTI_SEGS;
        dev_info->max_tx_queues = (uint16_t)internals->max_tx_queues;
        dev_info->min_rx_bufsize = 0;
 
@@ -226,7 +231,39 @@ static int
 eth_link_update(struct rte_eth_dev *dev __rte_unused,
                int wait_to_complete __rte_unused) { return 0; }
 
+static int
+eth_dev_close(struct rte_eth_dev *dev)
+{
+       struct pmd_internals *internals = NULL;
+       struct ring_queue *r = NULL;
+       uint16_t i;
+       int ret;
+
+       if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+               return 0;
+
+       ret = eth_dev_stop(dev);
+
+       internals = dev->data->dev_private;
+       if (internals->action == DEV_CREATE) {
+               /*
+                * it is only necessary to delete the rings in rx_queues because
+                * they are the same used in tx_queues
+                */
+               for (i = 0; i < dev->data->nb_rx_queues; i++) {
+                       r = dev->data->rx_queues[i];
+                       rte_ring_free(r->rng);
+               }
+       }
+
+       /* mac_addrs must not be freed alone because part of dev_private */
+       dev->data->mac_addrs = NULL;
+
+       return ret;
+}
+
 static const struct eth_dev_ops ops = {
+       .dev_close = eth_dev_close,
        .dev_start = eth_dev_start,
        .dev_stop = eth_dev_stop,
        .dev_set_link_up = eth_dev_set_link_up,
@@ -324,9 +361,9 @@ do_eth_dev_ring_create(const char *name,
        data->mac_addrs = &internals->address;
        data->promiscuous = 1;
        data->all_multicast = 1;
+       data->dev_flags |= RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS;
 
        eth_dev->dev_ops = &ops;
-       data->kdrv = RTE_KDRV_NONE;
        data->numa_node = numa_node;
 
        /* finally assign rx and tx ops */
@@ -539,8 +576,21 @@ parse_internal_args(const char *key __rte_unused, const char *value,
 {
        struct ring_internal_args **internal_args = data;
        void *args;
+       int ret, n;
+
+       /* make sure 'value' is valid pointer length */
+       if (strnlen(value, ETH_RING_INTERNAL_ARG_MAX_LEN) >=
+                       ETH_RING_INTERNAL_ARG_MAX_LEN) {
+               PMD_LOG(ERR, "Error parsing internal args, argument is too long");
+               return -1;
+       }
 
-       sscanf(value, "%p", &args);
+       ret = sscanf(value, "%p%n", &args, &n);
+       if (ret == 0 || (size_t)n != strlen(value)) {
+               PMD_LOG(ERR, "Error parsing internal args");
+
+               return -1;
+       }
 
        *internal_args = args;
 
@@ -659,9 +709,6 @@ rte_pmd_ring_remove(struct rte_vdev_device *dev)
 {
        const char *name = rte_vdev_device_name(dev);
        struct rte_eth_dev *eth_dev = NULL;
-       struct pmd_internals *internals = NULL;
-       struct ring_queue *r = NULL;
-       uint16_t i;
 
        PMD_LOG(INFO, "Un-Initializing pmd_ring for %s", name);
 
@@ -671,24 +718,9 @@ rte_pmd_ring_remove(struct rte_vdev_device *dev)
        /* find an ethdev entry */
        eth_dev = rte_eth_dev_allocated(name);
        if (eth_dev == NULL)
-               return -ENODEV;
+               return 0; /* port already released */
 
-       eth_dev_stop(eth_dev);
-
-       internals = eth_dev->data->dev_private;
-       if (internals->action == DEV_CREATE) {
-               /*
-                * it is only necessary to delete the rings in rx_queues because
-                * they are the same used in tx_queues
-                */
-               for (i = 0; i < eth_dev->data->nb_rx_queues; i++) {
-                       r = eth_dev->data->rx_queues[i];
-                       rte_ring_free(r->rng);
-               }
-       }
-
-       /* mac_addrs must not be freed alone because part of dev_private */
-       eth_dev->data->mac_addrs = NULL;
+       eth_dev_close(eth_dev);
        rte_eth_dev_release_port(eth_dev);
        return 0;
 }