net/bnxt: fix lock init and destroy

Invoking init/uninit locks in init_resources and uninit_resources
would end up initializing and destroying locks on every port start
stop which is not desired.
Move the 2 routines to dev_init and dev_close respectively as
locks need to be initialized and destroyed only once during the
lifetime of the driver.

Fixes: 1cb3d39a48f7 ("net/bnxt: synchronize between flow related functions")
Cc: stable@dpdk.org
Signed-off-by: Somnath Kotur <somnath.kotur@broadcom.com>
Reviewed-by: Ajit Khaparde <ajit.khaparde@broadcom.com>

diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index ef6b611..bd7bcbd 100644 (file)
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -1440,6 +1440,18 @@ static int bnxt_dev_stop_op(struct rte_eth_dev *eth_dev)
        return 0;
 }
 
+static void
+bnxt_uninit_locks(struct bnxt *bp)
+{
+       pthread_mutex_destroy(&bp->flow_lock);
+       pthread_mutex_destroy(&bp->def_cp_lock);
+       pthread_mutex_destroy(&bp->health_check_lock);
+       if (bp->rep_info) {
+               pthread_mutex_destroy(&bp->rep_info->vfr_lock);
+               pthread_mutex_destroy(&bp->rep_info->vfr_start_lock);
+       }
+}
+
 static int bnxt_dev_close_op(struct rte_eth_dev *eth_dev)
 {
        struct bnxt *bp = eth_dev->data->dev_private;
@@ -1465,6 +1477,7 @@ static int bnxt_dev_close_op(struct rte_eth_dev *eth_dev)
        bnxt_free_link_info(bp);
        bnxt_free_pf_info(bp);
        bnxt_free_parent_info(bp);
+       bnxt_uninit_locks(bp);
 
        rte_memzone_free((const struct rte_memzone *)bp->tx_mem_zone);
        bp->tx_mem_zone = NULL;
@@ -4832,10 +4845,6 @@ static int bnxt_init_resources(struct bnxt *bp, bool reconfig_dev)
                return rc;
        }
 
-       rc = bnxt_init_locks(bp);
-       if (rc)
-               return rc;
-
        return 0;
 }
 
@@ -5322,6 +5331,10 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev, void *params __rte_unused)
        if (rc)
                goto error_free;
 
+       rc = bnxt_init_locks(bp);
+       if (rc)
+               goto error_free;
+
        rc = bnxt_init_resources(bp, false);
        if (rc)
                goto error_free;
@@ -5413,18 +5426,6 @@ bnxt_free_error_recovery_info(struct bnxt *bp)
        bp->fw_cap &= ~BNXT_FW_CAP_ERROR_RECOVERY;
 }
 
-static void
-bnxt_uninit_locks(struct bnxt *bp)
-{
-       pthread_mutex_destroy(&bp->flow_lock);
-       pthread_mutex_destroy(&bp->def_cp_lock);
-       pthread_mutex_destroy(&bp->health_check_lock);
-       if (bp->rep_info) {
-               pthread_mutex_destroy(&bp->rep_info->vfr_lock);
-               pthread_mutex_destroy(&bp->rep_info->vfr_start_lock);
-       }
-}
-
 static int
 bnxt_uninit_resources(struct bnxt *bp, bool reconfig_dev)
 {
@@ -5446,7 +5447,6 @@ bnxt_uninit_resources(struct bnxt *bp, bool reconfig_dev)
 
        bnxt_uninit_ctx_mem(bp);
 
-       bnxt_uninit_locks(bp);
        bnxt_free_flow_stats_info(bp);
        bnxt_free_rep_info(bp);
        rte_free(bp->ptp_cfg);