net/bnxt: fix multi adapter

1. removed the global flag for TruFlow global config initialization.

2. Modified the TruFlow context lock to be a global lock instead
of per context lock.

3. The ULP context list is modified to check on the ULP configuration
data so alarm handlers can operate on the correct ULP context.

These changes help in support of multiple network cards using
single DPDK application.

Fixes: d75b55121bcd ("net/bnxt: add context list for timers")
Cc: stable@dpdk.org
Signed-off-by: Kishore Padmanabha <kishore.padmanabha@broadcom.com>
Signed-off-by: Venkat Duvvuru <venkatkumar.duvvuru@broadcom.com>
Reviewed-by: Randy Schacher <stuart.schacher@broadcom.com>
Reviewed-by: Mike Baucom <michael.baucom@broadcom.com>
Reviewed-by: Ajit Khaparde <ajit.khaparde@broadcom.com>

diff --git a/drivers/net/bnxt/tf_core/tf_device_p4.c b/drivers/net/bnxt/tf_core/tf_device_p4.c
index aa55587ba82883d92c0057b0488572549bcac414..b8b3dcbb3fbd852c5d0c11298e0713e7b62c4011 100644 (file)
--- a/drivers/net/bnxt/tf_core/tf_device_p4.c
+++ b/drivers/net/bnxt/tf_core/tf_device_p4.c
@@ -243,7 +243,7 @@ tf_dev_p4_set_tcam_slice_info(struct tf *tfp,
                              enum tf_wc_num_slice num_slices_per_row)
 {
        int rc;
-       struct tf_session *tfs;
+       struct tf_session *tfs = NULL;
 
        /* Retrieve the session information */
        rc = tf_session_get_session_internal(tfp, &tfs);

diff --git a/drivers/net/bnxt/tf_core/tf_device_p58.c b/drivers/net/bnxt/tf_core/tf_device_p58.c
index 987ad2a564095c2944babd55c3e5a8fe87d2c1ed..8179287e46134217aeec63b00ca1fa71f33f34f4 100644 (file)
--- a/drivers/net/bnxt/tf_core/tf_device_p58.c
+++ b/drivers/net/bnxt/tf_core/tf_device_p58.c
@@ -354,7 +354,7 @@ tf_dev_p58_set_tcam_slice_info(struct tf *tfp,
                               enum tf_wc_num_slice num_slices_per_row)
 {
        int rc;
-       struct tf_session *tfs;
+       struct tf_session *tfs = NULL;
 
        /* Retrieve the session information */
        rc = tf_session_get_session_internal(tfp, &tfs);
@@ -401,7 +401,7 @@ tf_dev_p58_get_tcam_slice_info(struct tf *tfp,
                               uint16_t *num_slices_per_row)
 {
        int rc;
-       struct tf_session *tfs;
+       struct tf_session *tfs = NULL;
 
        /* Retrieve the session information */
        rc = tf_session_get_session_internal(tfp, &tfs);

diff --git a/drivers/net/bnxt/tf_core/tf_global_cfg.c b/drivers/net/bnxt/tf_core/tf_global_cfg.c
index 98a42b2fe6ff958895d59743e983297504d88c18..d83e7db315e01dddf5e3265ea16ec40dc28e627b 100644 (file)
--- a/drivers/net/bnxt/tf_core/tf_global_cfg.c
+++ b/drivers/net/bnxt/tf_core/tf_global_cfg.c
@@ -20,11 +20,6 @@ struct tf_global_cfg_db {
        struct tf_global_cfg_cfg *global_cfg_db[TF_DIR_MAX];
 };
 
-/**
- * Init flag, set on bind and cleared on unbind
- */
-static uint8_t init;
-
 /**
  * Get HCAPI type parameters for a single element
  */
@@ -83,11 +78,6 @@ tf_global_cfg_bind(struct tf *tfp,
 
        TF_CHECK_PARMS2(tfp, parms);
 
-       if (init) {
-               TFP_DRV_LOG(ERR, "Global Cfg DB already initialized\n");
-               return -EINVAL;
-       }
-
        cparms.nitems = 1;
        cparms.size = sizeof(struct tf_global_cfg_db);
        cparms.alignment = 0;
@@ -100,13 +90,9 @@ tf_global_cfg_bind(struct tf *tfp,
        global_cfg_db = cparms.mem_va;
        global_cfg_db->global_cfg_db[TF_DIR_RX] = parms->cfg;
        global_cfg_db->global_cfg_db[TF_DIR_TX] = parms->cfg;
-
        tf_session_set_global_db(tfp, (void *)global_cfg_db);
 
-       init = 1;
-
        TFP_DRV_LOG(INFO, "Global Cfg - initialized\n");
-
        return 0;
 }
 
@@ -118,12 +104,6 @@ tf_global_cfg_unbind(struct tf *tfp)
 
        TF_CHECK_PARMS1(tfp);
 
-       /* Bail if nothing has been initialized */
-       if (!init) {
-               TFP_DRV_LOG(INFO, "No Global Cfg DBs created\n");
-               return 0;
-       }
-
        rc = tf_session_get_global_db(tfp, (void **)&global_cfg_db_ptr);
        if (rc) {
                TFP_DRV_LOG(INFO, "global_cfg_db is not initialized\n");
@@ -131,8 +111,6 @@ tf_global_cfg_unbind(struct tf *tfp)
        }
 
        tfp_free((void *)global_cfg_db_ptr);
-       init = 0;
-
        return 0;
 }
 
@@ -147,12 +125,6 @@ tf_global_cfg_set(struct tf *tfp,
 
        TF_CHECK_PARMS3(tfp, parms, parms->config);
 
-       if (!init) {
-               TFP_DRV_LOG(ERR, "%s: No Global Cfg DBs created\n",
-                           tf_dir_2_str(parms->dir));
-               return -EINVAL;
-       }
-
        rc = tf_session_get_global_db(tfp, (void **)&global_cfg_db_ptr);
        if (rc) {
                TFP_DRV_LOG(INFO, "No global cfg DBs initialized\n");
@@ -197,13 +169,6 @@ tf_global_cfg_get(struct tf *tfp,
 
        TF_CHECK_PARMS3(tfp, parms, parms->config);
 
-       if (!init) {
-               TFP_DRV_LOG(ERR,
-                           "%s: No Global Cfg DBs created\n",
-                           tf_dir_2_str(parms->dir));
-               return -EINVAL;
-       }
-
        rc = tf_session_get_global_db(tfp, (void **)&global_cfg_db_ptr);
        if (rc) {
                TFP_DRV_LOG(INFO, "No Global cfg DBs initialized\n");

diff --git a/drivers/net/bnxt/tf_core/tf_global_cfg.h b/drivers/net/bnxt/tf_core/tf_global_cfg.h
index 3522bcc07e9570252549dd4dbe1a2ac3a717074a..c14e5e91097e68c2698adfe9edb2a9a2f7f3f736 100644 (file)
--- a/drivers/net/bnxt/tf_core/tf_global_cfg.h
+++ b/drivers/net/bnxt/tf_core/tf_global_cfg.h
@@ -93,7 +93,7 @@ struct tf_global_cfg_cfg_parms {
  *
  * Returns
  *   - (0) if successful.
- *   - (-EINVAL) on failure.
+ *   - (-ENOMEM) on failure.
  */
 int
 tf_global_cfg_bind(struct tf *tfp,

diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp.c b/drivers/net/bnxt/tf_ulp/bnxt_ulp.c
index fd211bbc3fda58db858b8aa3da6ec490b08b5445..b1b8679aa698f9835326f8d1d31c8ae61bdffaf9 100644 (file)
--- a/drivers/net/bnxt/tf_ulp/bnxt_ulp.c
+++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp.c
@@ -35,6 +35,7 @@ STAILQ_HEAD(, bnxt_ulp_session_state) bnxt_ulp_session_list =
 static pthread_mutex_t bnxt_ulp_global_mutex = PTHREAD_MUTEX_INITIALIZER;
 
 /* Spin lock to protect context global list */
+uint32_t bnxt_ulp_ctxt_lock_created;
 rte_spinlock_t bnxt_ulp_ctxt_lock;
 TAILQ_HEAD(cntx_list_entry_list, ulp_context_list_entry);
 static struct cntx_list_entry_list ulp_cntx_list =
@@ -2010,9 +2011,10 @@ bnxt_ulp_cntxt_ha_enabled(struct bnxt_ulp_context *ulp_ctx)
 static int32_t
 bnxt_ulp_cntxt_list_init(void)
 {
-       /* Create the cntxt spin lock */
-       rte_spinlock_init(&bnxt_ulp_ctxt_lock);
-
+       /* Create the cntxt spin lock only once*/
+       if (!bnxt_ulp_ctxt_lock_created)
+               rte_spinlock_init(&bnxt_ulp_ctxt_lock);
+       bnxt_ulp_ctxt_lock_created = 1;
        return 0;
 }
 
@@ -2051,14 +2053,14 @@ bnxt_ulp_cntxt_list_del(struct bnxt_ulp_context *ulp_ctx)
 }
 
 struct bnxt_ulp_context *
-bnxt_ulp_cntxt_entry_acquire(void)
+bnxt_ulp_cntxt_entry_acquire(void *arg)
 {
        struct ulp_context_list_entry   *entry;
 
        /* take a lock and get the first ulp context available */
        if (rte_spinlock_trylock(&bnxt_ulp_ctxt_lock)) {
                TAILQ_FOREACH(entry, &ulp_cntx_list, next)
-                       if (entry->ulp_ctx)
+                       if (entry->ulp_ctx->cfg_data == arg)
                                return entry->ulp_ctx;
        }
        return NULL;

diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp.h b/drivers/net/bnxt/tf_ulp/bnxt_ulp.h
index 17c6898196009afa87fcc56644edc6780618f41c..05a98b14e6da29eb73262a9b2c004745e6f50d39 100644 (file)
--- a/drivers/net/bnxt/tf_ulp/bnxt_ulp.h
+++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp.h
@@ -307,7 +307,7 @@ bool
 bnxt_ulp_cntxt_ha_enabled(struct bnxt_ulp_context *ulp_ctx);
 
 struct bnxt_ulp_context *
-bnxt_ulp_cntxt_entry_acquire(void);
+bnxt_ulp_cntxt_entry_acquire(void *arg);
 
 void
 bnxt_ulp_cntxt_entry_release(void);

diff --git a/drivers/net/bnxt/tf_ulp/ulp_fc_mgr.c b/drivers/net/bnxt/tf_ulp/ulp_fc_mgr.c
index 92243083b582dbe36a04edb0b1097172c06ff88d..85c9cbb7f26bc1aafe5500fdb0055f89f0fd184d 100644 (file)
--- a/drivers/net/bnxt/tf_ulp/ulp_fc_mgr.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_fc_mgr.c
@@ -203,7 +203,7 @@ ulp_fc_mgr_thread_start(struct bnxt_ulp_context *ctxt)
 
        if (ulp_fc_info && !(ulp_fc_info->flags & ULP_FLAG_FC_THREAD)) {
                rte_eal_alarm_set(US_PER_S * ULP_FC_TIMER,
-                                 ulp_fc_mgr_alarm_cb, NULL);
+                                 ulp_fc_mgr_alarm_cb, (void *)ctxt->cfg_data);
                ulp_fc_info->flags |= ULP_FLAG_FC_THREAD;
        }
 
@@ -225,7 +225,7 @@ void ulp_fc_mgr_thread_cancel(struct bnxt_ulp_context *ctxt)
                return;
 
        ulp_fc_info->flags &= ~ULP_FLAG_FC_THREAD;
-       rte_eal_alarm_cancel(ulp_fc_mgr_alarm_cb, NULL);
+       rte_eal_alarm_cancel(ulp_fc_mgr_alarm_cb, ctxt->cfg_data);
 }
 
 /*
@@ -434,7 +434,7 @@ static int ulp_get_single_flow_stat(struct bnxt_ulp_context *ctxt,
  */
 
 void
-ulp_fc_mgr_alarm_cb(void *arg __rte_unused)
+ulp_fc_mgr_alarm_cb(void *arg)
 {
        int rc = 0;
        unsigned int j;
@@ -445,11 +445,11 @@ ulp_fc_mgr_alarm_cb(void *arg __rte_unused)
        struct tf *tfp;
        uint32_t dev_id, hw_cntr_id = 0, num_entries = 0;
 
-       ctxt = bnxt_ulp_cntxt_entry_acquire();
+       ctxt = bnxt_ulp_cntxt_entry_acquire(arg);
        if (ctxt == NULL) {
                BNXT_TF_DBG(INFO, "could not get the ulp context lock\n");
                rte_eal_alarm_set(US_PER_S * ULP_FC_TIMER,
-                                 ulp_fc_mgr_alarm_cb, NULL);
+                                 ulp_fc_mgr_alarm_cb, arg);
                return;
        }
 
@@ -534,7 +534,7 @@ ulp_fc_mgr_alarm_cb(void *arg __rte_unused)
 out:
        bnxt_ulp_cntxt_entry_release();
        rte_eal_alarm_set(US_PER_S * ULP_FC_TIMER,
-                         ulp_fc_mgr_alarm_cb, NULL);
+                         ulp_fc_mgr_alarm_cb, arg);
 }
 
 /*

diff --git a/drivers/net/bnxt/tf_ulp/ulp_ha_mgr.c b/drivers/net/bnxt/tf_ulp/ulp_ha_mgr.c
index 5f5b5d639ec848d5ad298ea531457d9507494e1d..1325986aba89691de28a696444acfe8873beed8b 100644 (file)
--- a/drivers/net/bnxt/tf_ulp/ulp_ha_mgr.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_ha_mgr.c
@@ -27,7 +27,7 @@
 #define ULP_HA_CLIENT_CNT_IF_TBL_IDX 9
 
 static void ulp_ha_mgr_timer_cancel(void);
-static int32_t ulp_ha_mgr_timer_start(void);
+static int32_t ulp_ha_mgr_timer_start(void *arg);
 static void ulp_ha_mgr_timer_cb(void *arg);
 static int32_t ulp_ha_mgr_app_type_set(struct bnxt_ulp_context *ulp_ctx,
                                enum ulp_ha_mgr_app_type app_type);
@@ -151,7 +151,7 @@ ulp_ha_mgr_app_type_set(struct bnxt_ulp_context *ulp_ctx,
 }
 
 static void
-ulp_ha_mgr_timer_cb(void *arg __rte_unused)
+ulp_ha_mgr_timer_cb(void *arg)
 {
        struct tf_move_tcam_shared_entries_parms mparms = { 0 };
        struct tf_clear_tcam_shared_entries_parms cparms = { 0 };
@@ -163,9 +163,9 @@ ulp_ha_mgr_timer_cb(void *arg __rte_unused)
        struct tf *tfp;
        int32_t rc;
 
-       ulp_ctx = bnxt_ulp_cntxt_entry_acquire();
+       ulp_ctx = bnxt_ulp_cntxt_entry_acquire(arg);
        if (ulp_ctx == NULL) {
-               ulp_ha_mgr_timer_start();
+               ulp_ha_mgr_timer_start(arg);
                return;
        }
 
@@ -299,14 +299,14 @@ unlock:
        bnxt_ulp_cntxt_release_fdb_lock(ulp_ctx);
 cb_restart:
        bnxt_ulp_cntxt_entry_release();
-       ulp_ha_mgr_timer_start();
+       ulp_ha_mgr_timer_start(arg);
 }
 
 static int32_t
-ulp_ha_mgr_timer_start(void)
+ulp_ha_mgr_timer_start(void *arg)
 {
        rte_eal_alarm_set(US_PER_S * ULP_HA_TIMER_SEC,
-                         ulp_ha_mgr_timer_cb, NULL);
+                         ulp_ha_mgr_timer_cb, arg);
        return 0;
 }
 
@@ -333,7 +333,7 @@ ulp_ha_mgr_init(struct bnxt_ulp_context *ulp_ctx)
                PMD_DRV_LOG(ERR, "Failed to initialize ha mutex\n");
                goto cleanup;
        }
-       rc = ulp_ha_mgr_timer_start();
+       rc = ulp_ha_mgr_timer_start(ulp_ctx->cfg_data);
        if (rc) {
                BNXT_TF_DBG(ERR, "Unable to start timer CB.\n");
                goto cleanup;