net/failsafe: replace local device with shared data

[dpdk.git] / drivers / net / failsafe / failsafe.c

diff --git a/drivers/net/failsafe/failsafe.c b/drivers/net/failsafe/failsafe.c
index c499bfb..68926ca 100644 (file)
--- a/drivers/net/failsafe/failsafe.c
+++ b/drivers/net/failsafe/failsafe.c
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright 2017 6WIND S.A.
- * Copyright 2017 Mellanox.
+ * Copyright 2017 Mellanox Technologies, Ltd
  */
 
 #include <rte_alarm.h>
@@ -13,6 +13,8 @@
 
 #include "failsafe_private.h"
 
+int failsafe_logtype;
+
 const char pmd_failsafe_driver_name[] = FAILSAFE_DRIVER_NAME;
 static const struct rte_eth_link eth_link = {
        .link_speed = ETH_SPEED_NUM_10G,
@@ -69,7 +71,7 @@ failsafe_hotplug_alarm_install(struct rte_eth_dev *dev)
                return -EINVAL;
        if (PRIV(dev)->pending_alarm)
                return 0;
-       ret = rte_eal_alarm_set(hotplug_poll * 1000,
+       ret = rte_eal_alarm_set(failsafe_hotplug_poll * 1000,
                                fs_hotplug_alarm,
                                dev);
        if (ret) {
@@ -179,7 +181,7 @@ fs_eth_dev_create(struct rte_vdev_device *vdev)
                return -1;
        }
        priv = PRIV(dev);
-       priv->dev = dev;
+       priv->data = dev->data;
        dev->dev_ops = &failsafe_ops;
        dev->data->mac_addrs = &PRIV(dev)->mac_addrs[0];
        dev->data->dev_link = eth_link;
@@ -202,19 +204,28 @@ fs_eth_dev_create(struct rte_vdev_device *vdev)
        }
        snprintf(priv->my_owner.name, sizeof(priv->my_owner.name),
                 FAILSAFE_OWNER_NAME);
+       DEBUG("Failsafe port %u owner info: %s_%016"PRIX64, dev->data->port_id,
+             priv->my_owner.name, priv->my_owner.id);
+       ret = rte_eth_dev_callback_register(RTE_ETH_ALL, RTE_ETH_EVENT_NEW,
+                                           failsafe_eth_new_event_callback,
+                                           dev);
+       if (ret) {
+               ERROR("Failed to register NEW callback");
+               goto free_args;
+       }
        ret = failsafe_eal_init(dev);
        if (ret)
-               goto free_args;
+               goto unregister_new_callback;
        ret = fs_mutex_init(priv);
        if (ret)
-               goto free_args;
+               goto unregister_new_callback;
        ret = failsafe_hotplug_alarm_install(dev);
        if (ret) {
                ERROR("Could not set up plug-in event detection");
-               goto free_args;
+               goto unregister_new_callback;
        }
        mac = &dev->data->mac_addrs[0];
-       if (mac_from_arg) {
+       if (failsafe_mac_from_arg) {
                /*
                 * If MAC address was provided as a parameter,
                 * apply to all probed slaves.
@@ -224,7 +235,7 @@ fs_eth_dev_create(struct rte_vdev_device *vdev)
                                                               mac);
                        if (ret) {
                                ERROR("Failed to set default MAC address");
-                               goto free_args;
+                               goto cancel_alarm;
                        }
                }
        } else {
@@ -257,13 +268,20 @@ fs_eth_dev_create(struct rte_vdev_device *vdev)
                .fd = -1,
                .type = RTE_INTR_HANDLE_EXT,
        };
+       rte_eth_dev_probing_finish(dev);
        return 0;
+cancel_alarm:
+       failsafe_hotplug_alarm_cancel(dev);
+unregister_new_callback:
+       rte_eth_dev_callback_unregister(RTE_ETH_ALL, RTE_ETH_EVENT_NEW,
+                                       failsafe_eth_new_event_callback, dev);
 free_args:
        failsafe_args_free(dev);
 free_subs:
        fs_sub_device_free(dev);
 free_dev:
-       rte_free(PRIV(dev));
+       /* mac_addrs must not be freed alone because part of dev_private */
+       dev->data->mac_addrs = NULL;
        rte_eth_dev_release_port(dev);
        return -1;
 }
@@ -277,6 +295,8 @@ fs_rte_eth_free(const char *name)
        dev = rte_eth_dev_allocated(name);
        if (dev == NULL)
                return -ENODEV;
+       rte_eth_dev_callback_unregister(RTE_ETH_ALL, RTE_ETH_EVENT_NEW,
+                                       failsafe_eth_new_event_callback, dev);
        ret = failsafe_eal_uninit(dev);
        if (ret)
                ERROR("Error while uninitializing sub-EAL");
@@ -285,7 +305,9 @@ fs_rte_eth_free(const char *name)
        ret = pthread_mutex_destroy(&PRIV(dev)->hotplug_mutex);
        if (ret)
                ERROR("Error while destroying hotplug mutex");
-       rte_free(PRIV(dev));
+       rte_free(PRIV(dev)->mcast_addrs);
+       /* mac_addrs must not be freed alone because part of dev_private */
+       dev->data->mac_addrs = NULL;
        rte_eth_dev_release_port(dev);
        return ret;
 }
@@ -294,10 +316,26 @@ static int
 rte_pmd_failsafe_probe(struct rte_vdev_device *vdev)
 {
        const char *name;
+       struct rte_eth_dev *eth_dev;
 
        name = rte_vdev_device_name(vdev);
        INFO("Initializing " FAILSAFE_DRIVER_NAME " for %s",
                        name);
+
+       if (rte_eal_process_type() == RTE_PROC_SECONDARY &&
+           strlen(rte_vdev_device_args(vdev)) == 0) {
+               eth_dev = rte_eth_dev_attach_secondary(name);
+               if (!eth_dev) {
+                       ERROR("Failed to probe %s", name);
+                       return -1;
+               }
+               /* TODO: request info from primary to set up Rx and Tx */
+               eth_dev->dev_ops = &failsafe_ops;
+               eth_dev->device = &vdev->device;
+               rte_eth_dev_probing_finish(eth_dev);
+               return 0;
+       }
+
        return fs_eth_dev_create(vdev);
 }
 
@@ -318,3 +356,10 @@ static struct rte_vdev_driver failsafe_drv = {
 
 RTE_PMD_REGISTER_VDEV(net_failsafe, failsafe_drv);
 RTE_PMD_REGISTER_PARAM_STRING(net_failsafe, PMD_FAILSAFE_PARAM_STRING);
+
+RTE_INIT(failsafe_init_log)
+{
+       failsafe_logtype = rte_log_register("pmd.net.failsafe");
+       if (failsafe_logtype >= 0)
+               rte_log_set_level(failsafe_logtype, RTE_LOG_NOTICE);
+}