net/i40e: fix multi-process shared data

[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 83c5502..1faf38a 100644 (file)
--- a/drivers/net/ring/rte_eth_ring.c
+++ b/drivers/net/ring/rte_eth_ring.c
@@ -4,7 +4,7 @@
 
 #include "rte_eth_ring.h"
 #include <rte_mbuf.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 #include <rte_string_fns.h>
@@ -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,
@@ -61,7 +62,7 @@ static struct rte_eth_link pmd_link = {
        .link_autoneg = ETH_LINK_FIXED,
 };
 
-RTE_LOG_REGISTER(eth_ring_logtype, pmd.net.ring, NOTICE);
+RTE_LOG_REGISTER_DEFAULT(eth_ring_logtype, NOTICE);
 
 #define PMD_LOG(level, fmt, args...) \
        rte_log(RTE_LOG_ ## level, eth_ring_logtype, \
@@ -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
@@ -234,11 +237,12 @@ 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;
 
-       eth_dev_stop(dev);
+       ret = eth_dev_stop(dev);
 
        internals = dev->data->dev_private;
        if (internals->action == DEV_CREATE) {
@@ -255,7 +259,7 @@ eth_dev_close(struct rte_eth_dev *dev)
        /* mac_addrs must not be freed alone because part of dev_private */
        dev->data->mac_addrs = NULL;
 
-       return 0;
+       return ret;
 }
 
 static const struct eth_dev_ops ops = {
@@ -357,6 +361,7 @@ 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->numa_node = numa_node;
@@ -571,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;
+       }
+
+       ret = sscanf(value, "%p%n", &args, &n);
+       if (ret == 0 || (size_t)n != strlen(value)) {
+               PMD_LOG(ERR, "Error parsing internal args");
 
-       sscanf(value, "%p", &args);
+               return -1;
+       }
 
        *internal_args = args;
 
@@ -597,6 +615,23 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev)
 
        PMD_LOG(INFO, "Initializing pmd_ring for %s", name);
 
+       if (rte_eal_process_type() == RTE_PROC_SECONDARY) {
+               eth_dev = rte_eth_dev_attach_secondary(name);
+               if (!eth_dev) {
+                       PMD_LOG(ERR, "Failed to probe %s", name);
+                       return -1;
+               }
+               eth_dev->dev_ops = &ops;
+               eth_dev->device = &dev->device;
+
+               eth_dev->rx_pkt_burst = eth_ring_rx;
+               eth_dev->tx_pkt_burst = eth_ring_tx;
+
+               rte_eth_dev_probing_finish(eth_dev);
+
+               return 0;
+       }
+
        if (params == NULL || params[0] == '\0') {
                ret = eth_dev_ring_create(name, dev, rte_socket_id(), DEV_CREATE,
                                &eth_dev);
@@ -611,7 +646,7 @@ rte_pmd_ring_probe(struct rte_vdev_device *dev)
 
                if (!kvlist) {
                        PMD_LOG(INFO,
-                               "Ignoring unsupported parameters when creatingrings-backed ethernet device");
+                               "Ignoring unsupported parameters when creating rings-backed ethernet device");
                        ret = eth_dev_ring_create(name, dev, rte_socket_id(),
                                                  DEV_CREATE, &eth_dev);
                        if (ret == -1) {