net/failsafe: add probed device capture

Previous fail-safe code didn't support probed sub-devices capture and
failed when it tried to probe them.

Skip fail-safe sub-device probing when it already was probed.

Signed-off-by: Matan Azrad <matan@mellanox.com>
Acked-by: Gaetan Rivet <gaetan.rivet@6wind.com>

diff --git a/doc/guides/nics/fail_safe.rst b/doc/guides/nics/fail_safe.rst
index 5b1b47e..3f72b59 100644 (file)
--- a/doc/guides/nics/fail_safe.rst
+++ b/doc/guides/nics/fail_safe.rst
@@ -93,6 +93,14 @@ Fail-safe command line parameters
   additional sub-device parameters if need be. They will be passed on to the
   sub-device.
 
+.. note::
+
+   In case of whitelist sub-device probed by EAL, fail-safe PMD will take the device
+   as is, which means that EAL device options are taken in this case.
+   When trying to use a PCI device automatically probed in blacklist mode,
+   the syntax for the fail-safe must be with the full PCI id:
+   Domain:Bus:Device.Function. See the usage example section.
+
 - **exec(<shell command>)** parameter
 
   This parameter allows the user to provide a command to the fail-safe PMD to
@@ -169,6 +177,15 @@ This section shows some example of using **testpmd** with a fail-safe PMD.
       $RTE_TARGET/build/app/testpmd -c 0xff -n 4 --no-pci \
          --vdev='net_failsafe0,exec(echo 84:00.0)' -- -i
 
+#. Start testpmd, automatically probing the device 84:00.0 and using it with
+   the fail-safe.
+ 
+   .. code-block:: console
+ 
+      $RTE_TARGET/build/app/testpmd -c 0xff -n 4 \
+         --vdev 'net_failsafe0,dev(0000:84:00.0),dev(net_ring0)' -- -i
+
+
 Using the Fail-safe PMD from an application
 -------------------------------------------
 

diff --git a/drivers/net/failsafe/failsafe_args.c b/drivers/net/failsafe/failsafe_args.c
index a1fb3fa..b049b75 100644 (file)
--- a/drivers/net/failsafe/failsafe_args.c
+++ b/drivers/net/failsafe/failsafe_args.c
@@ -45,8 +45,6 @@
 
 #include "failsafe_private.h"
 
-#define DEVARGS_MAXLEN 4096
-
 /* Callback used when a new device is found in devargs */
 typedef int (parse_cb)(struct rte_eth_dev *dev, const char *params,
                uint8_t head);

diff --git a/drivers/net/failsafe/failsafe_eal.c b/drivers/net/failsafe/failsafe_eal.c
index 19d26f5..33a5adf 100644 (file)
--- a/drivers/net/failsafe/failsafe_eal.c
+++ b/drivers/net/failsafe/failsafe_eal.c
@@ -35,40 +35,78 @@
 
 #include "failsafe_private.h"
 
+static int
+fs_ethdev_portid_get(const char *name, uint16_t *port_id)
+{
+       uint16_t pid;
+       size_t len;
+
+       if (name == NULL) {
+               DEBUG("Null pointer is specified\n");
+               return -EINVAL;
+       }
+       len = strlen(name);
+       RTE_ETH_FOREACH_DEV(pid) {
+               if (!strncmp(name, rte_eth_devices[pid].device->name, len)) {
+                       *port_id = pid;
+                       return 0;
+               }
+       }
+       return -ENODEV;
+}
+
 static int
 fs_bus_init(struct rte_eth_dev *dev)
 {
        struct sub_device *sdev;
        struct rte_devargs *da;
        uint8_t i;
-       uint16_t j;
+       uint16_t pid;
        int ret;
 
        FOREACH_SUBDEV(sdev, i, dev) {
                if (sdev->state != DEV_PARSED)
                        continue;
                da = &sdev->devargs;
-               ret = rte_eal_hotplug_add(da->bus->name,
-                                         da->name,
-                                         da->args);
-               if (ret) {
-                       ERROR("sub_device %d probe failed %s%s%s", i,
-                             rte_errno ? "(" : "",
-                             rte_errno ? strerror(rte_errno) : "",
-                             rte_errno ? ")" : "");
-                       continue;
-               }
-               RTE_ETH_FOREACH_DEV(j) {
-                       if (strcmp(rte_eth_devices[j].device->name,
-                                   da->name) == 0) {
-                               ETH(sdev) = &rte_eth_devices[j];
-                               break;
+               if (fs_ethdev_portid_get(da->name, &pid) != 0) {
+                       ret = rte_eal_hotplug_add(da->bus->name,
+                                                 da->name,
+                                                 da->args);
+                       if (ret) {
+                               ERROR("sub_device %d probe failed %s%s%s", i,
+                                     rte_errno ? "(" : "",
+                                     rte_errno ? strerror(rte_errno) : "",
+                                     rte_errno ? ")" : "");
+                               continue;
                        }
+                       if (fs_ethdev_portid_get(da->name, &pid) != 0) {
+                               ERROR("sub_device %d init went wrong", i);
+                               return -ENODEV;
+                       }
+               } else {
+                       char devstr[DEVARGS_MAXLEN] = "";
+                       struct rte_devargs *probed_da =
+                                       rte_eth_devices[pid].device->devargs;
+
+                       /* Take control of device probed by EAL options. */
+                       free(da->args);
+                       memset(da, 0, sizeof(*da));
+                       if (probed_da != NULL)
+                               snprintf(devstr, sizeof(devstr), "%s,%s",
+                                        probed_da->name, probed_da->args);
+                       else
+                               snprintf(devstr, sizeof(devstr), "%s",
+                                        rte_eth_devices[pid].device->name);
+                       ret = rte_eal_devargs_parse(devstr, da);
+                       if (ret) {
+                               ERROR("Probed devargs parsing failed with code"
+                                     " %d", ret);
+                               return ret;
+                       }
+                       INFO("Taking control of a probed sub device"
+                             " %d named %s", i, da->name);
                }
-               if (ETH(sdev) == NULL) {
-                       ERROR("sub_device %d init went wrong", i);
-                       return -ENODEV;
-               }
+               ETH(sdev) = &rte_eth_devices[pid];
                SUB_ID(sdev) = i;
                sdev->fs_dev = dev;
                sdev->dev = ETH(sdev)->device;

diff --git a/drivers/net/failsafe/failsafe_private.h b/drivers/net/failsafe/failsafe_private.h
index 5e04ffe..9fcf72e 100644 (file)
--- a/drivers/net/failsafe/failsafe_private.h
+++ b/drivers/net/failsafe/failsafe_private.h
@@ -58,6 +58,8 @@
 #define FAILSAFE_MAX_ETHPORTS 2
 #define FAILSAFE_MAX_ETHADDR 128
 
+#define DEVARGS_MAXLEN 4096
+
 /* TYPES */
 
 struct rxq {