net/mlx5: fix MPLS item validation

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

diff --git a/drivers/net/failsafe/failsafe.c b/drivers/net/failsafe/failsafe.c
index 3a747c2..06e859e 100644 (file)
--- a/drivers/net/failsafe/failsafe.c
+++ b/drivers/net/failsafe/failsafe.c
@@ -71,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) {
@@ -204,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.
@@ -259,15 +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;
 }
@@ -281,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");
@@ -289,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;
 }
@@ -313,6 +331,8 @@ rte_pmd_failsafe_probe(struct rte_vdev_device *vdev)
                }
                /* 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;
        }
 
@@ -337,9 +357,7 @@ 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);
-static void
-failsafe_init_log(void)
+RTE_INIT(failsafe_init_log)
 {
        failsafe_logtype = rte_log_register("pmd.net.failsafe");
        if (failsafe_logtype >= 0)