ethdev: add probing finish function

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

diff --git a/drivers/net/failsafe/failsafe.c b/drivers/net/failsafe/failsafe.c
index 7b2cdbb..b35471d 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,
@@ -113,16 +115,45 @@ fs_hotplug_alarm(void *arg)
                        break;
        /* if we have non-probed device */
        if (i != PRIV(dev)->subs_tail) {
+               if (fs_lock(dev, 1) != 0)
+                       goto reinstall;
                ret = failsafe_eth_dev_state_sync(dev);
+               fs_unlock(dev, 1);
                if (ret)
                        ERROR("Unable to synchronize sub_device state");
        }
        failsafe_dev_remove(dev);
+reinstall:
        ret = failsafe_hotplug_alarm_install(dev);
        if (ret)
                ERROR("Unable to set up next alarm");
 }
 
+static int
+fs_mutex_init(struct fs_priv *priv)
+{
+       int ret;
+       pthread_mutexattr_t attr;
+
+       ret = pthread_mutexattr_init(&attr);
+       if (ret) {
+               ERROR("Cannot initiate mutex attributes - %s", strerror(ret));
+               return ret;
+       }
+       /* Allow mutex relocks for the thread holding the mutex. */
+       ret = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
+       if (ret) {
+               ERROR("Cannot set mutex type - %s", strerror(ret));
+               return ret;
+       }
+       ret = pthread_mutex_init(&priv->hotplug_mutex, &attr);
+       if (ret) {
+               ERROR("Cannot initiate mutex - %s", strerror(ret));
+               return ret;
+       }
+       return 0;
+}
+
 static int
 fs_eth_dev_create(struct rte_vdev_device *vdev)
 {
@@ -174,6 +205,9 @@ fs_eth_dev_create(struct rte_vdev_device *vdev)
        snprintf(priv->my_owner.name, sizeof(priv->my_owner.name),
                 FAILSAFE_OWNER_NAME);
        ret = failsafe_eal_init(dev);
+       if (ret)
+               goto free_args;
+       ret = fs_mutex_init(priv);
        if (ret)
                goto free_args;
        ret = failsafe_hotplug_alarm_install(dev);
@@ -192,7 +226,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 {
@@ -225,7 +259,10 @@ 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);
 free_args:
        failsafe_args_free(dev);
 free_subs:
@@ -250,6 +287,9 @@ fs_rte_eth_free(const char *name)
                ERROR("Error while uninitializing sub-EAL");
        failsafe_args_free(dev);
        fs_sub_device_free(dev);
+       ret = pthread_mutex_destroy(&PRIV(dev)->hotplug_mutex);
+       if (ret)
+               ERROR("Error while destroying hotplug mutex");
        rte_free(PRIV(dev));
        rte_eth_dev_release_port(dev);
        return ret;
@@ -259,10 +299,25 @@ 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;
+               rte_eth_dev_probing_finish(eth_dev);
+               return 0;
+       }
+
        return fs_eth_dev_create(vdev);
 }
 
@@ -283,3 +338,12 @@ 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)
+{
+       failsafe_logtype = rte_log_register("pmd.net.failsafe");
+       if (failsafe_logtype >= 0)
+               rte_log_set_level(failsafe_logtype, RTE_LOG_NOTICE);
+}