net/bnxt: fix ULP context list deadlock
[dpdk.git] / drivers / net / bnxt / tf_ulp / bnxt_ulp.c
index 2896194..1ee21fc 100644 (file)
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2019-2020 Broadcom
+ * Copyright(c) 2019-2021 Broadcom
  * All rights reserved.
  */
 
@@ -8,6 +8,7 @@
 #include <rte_flow.h>
 #include <rte_flow_driver.h>
 #include <rte_tailq.h>
+#include <rte_spinlock.h>
 
 #include "bnxt.h"
 #include "bnxt_ulp.h"
@@ -22,6 +23,9 @@
 #include "ulp_flow_db.h"
 #include "ulp_mapper.h"
 #include "ulp_port_db.h"
+#include "ulp_tun.h"
+#include "ulp_ha_mgr.h"
+#include "bnxt_tf_pmd_shim.h"
 
 /* Linked list of all TF sessions. */
 STAILQ_HEAD(, bnxt_ulp_session_state) bnxt_ulp_session_list =
@@ -30,6 +34,18 @@ STAILQ_HEAD(, bnxt_ulp_session_state) bnxt_ulp_session_list =
 /* Mutex to synchronize bnxt_ulp_session_list operations. */
 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 =
+       TAILQ_HEAD_INITIALIZER(ulp_cntx_list);
+
+/* Static function declarations */
+static int32_t bnxt_ulp_cntxt_list_init(void);
+static int32_t bnxt_ulp_cntxt_list_add(struct bnxt_ulp_context *ulp_ctx);
+static void bnxt_ulp_cntxt_list_del(struct bnxt_ulp_context *ulp_ctx);
+
 /*
  * Allow the deletion of context only for the bnxt device that
  * created the session.
@@ -48,6 +64,460 @@ ulp_ctx_deinit_allowed(struct bnxt_ulp_context *ulp_ctx)
        return false;
 }
 
+static int32_t
+bnxt_ulp_devid_get(struct bnxt *bp,
+                  enum bnxt_ulp_device_id  *ulp_dev_id)
+{
+       if (BNXT_CHIP_P5(bp)) {
+               *ulp_dev_id = BNXT_ULP_DEVICE_ID_THOR;
+               return 0;
+       }
+
+       if (BNXT_STINGRAY(bp))
+               *ulp_dev_id = BNXT_ULP_DEVICE_ID_STINGRAY;
+       else
+               /* Assuming Whitney */
+               *ulp_dev_id = BNXT_ULP_DEVICE_ID_WH_PLUS;
+
+       return 0;
+}
+
+struct bnxt_ulp_app_capabilities_info *
+bnxt_ulp_app_cap_list_get(uint32_t *num_entries)
+{
+       if (!num_entries)
+               return NULL;
+       *num_entries = BNXT_ULP_APP_CAP_TBL_MAX_SZ;
+       return ulp_app_cap_info_list;
+}
+
+static struct bnxt_ulp_resource_resv_info *
+bnxt_ulp_app_resource_resv_list_get(uint32_t *num_entries)
+{
+       if (num_entries == NULL)
+               return NULL;
+       *num_entries = BNXT_ULP_APP_RESOURCE_RESV_LIST_MAX_SZ;
+       return ulp_app_resource_resv_list;
+}
+
+struct bnxt_ulp_resource_resv_info *
+bnxt_ulp_resource_resv_list_get(uint32_t *num_entries)
+{
+       if (!num_entries)
+               return NULL;
+       *num_entries = BNXT_ULP_RESOURCE_RESV_LIST_MAX_SZ;
+       return ulp_resource_resv_list;
+}
+
+struct bnxt_ulp_glb_resource_info *
+bnxt_ulp_app_glb_resource_info_list_get(uint32_t *num_entries)
+{
+       if (!num_entries)
+               return NULL;
+       *num_entries = BNXT_ULP_APP_GLB_RESOURCE_TBL_MAX_SZ;
+       return ulp_app_glb_resource_tbl;
+}
+
+static int32_t
+bnxt_ulp_named_resources_calc(struct bnxt_ulp_context *ulp_ctx,
+                             struct bnxt_ulp_glb_resource_info *info,
+                             uint32_t num,
+                             struct tf_session_resources *res)
+{
+       uint32_t dev_id = BNXT_ULP_DEVICE_ID_LAST, res_type, i;
+       enum tf_dir dir;
+       uint8_t app_id;
+       int32_t rc = 0;
+
+       if (ulp_ctx == NULL || info == NULL || res == NULL || num == 0) {
+               BNXT_TF_DBG(ERR, "Invalid parms to named resources calc.\n");
+               return -EINVAL;
+       }
+
+       rc = bnxt_ulp_cntxt_app_id_get(ulp_ctx, &app_id);
+       if (rc) {
+               BNXT_TF_DBG(ERR, "Unable to get the app id from ulp.\n");
+               return -EINVAL;
+       }
+
+       rc = bnxt_ulp_cntxt_dev_id_get(ulp_ctx, &dev_id);
+       if (rc) {
+               BNXT_TF_DBG(ERR, "Unable to get the dev id from ulp.\n");
+               return -EINVAL;
+       }
+
+       for (i = 0; i < num; i++) {
+               if (dev_id != info[i].device_id || app_id != info[i].app_id)
+                       continue;
+               dir = info[i].direction;
+               res_type = info[i].resource_type;
+
+               switch (info[i].resource_func) {
+               case BNXT_ULP_RESOURCE_FUNC_IDENTIFIER:
+                       res->ident_cnt[dir].cnt[res_type]++;
+                       break;
+               case BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE:
+                       res->tbl_cnt[dir].cnt[res_type]++;
+                       break;
+               case BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE:
+                       res->tcam_cnt[dir].cnt[res_type]++;
+                       break;
+               case BNXT_ULP_RESOURCE_FUNC_EM_TABLE:
+                       res->em_cnt[dir].cnt[res_type]++;
+                       break;
+               default:
+                       BNXT_TF_DBG(ERR, "Unknown resource func (0x%x)\n,",
+                                   info[i].resource_func);
+                       continue;
+               }
+       }
+
+       return 0;
+}
+
+static int32_t
+bnxt_ulp_unnamed_resources_calc(struct bnxt_ulp_context *ulp_ctx,
+                               struct bnxt_ulp_resource_resv_info *info,
+                               uint32_t num,
+                               struct tf_session_resources *res)
+{
+       uint32_t dev_id, res_type, i;
+       enum tf_dir dir;
+       uint8_t app_id;
+       int32_t rc = 0;
+
+       if (ulp_ctx == NULL || res == NULL || info == NULL || num == 0) {
+               BNXT_TF_DBG(ERR, "Invalid arguments to get resources.\n");
+               return -EINVAL;
+       }
+
+       rc = bnxt_ulp_cntxt_app_id_get(ulp_ctx, &app_id);
+       if (rc) {
+               BNXT_TF_DBG(ERR, "Unable to get the app id from ulp.\n");
+               return -EINVAL;
+       }
+
+       rc = bnxt_ulp_cntxt_dev_id_get(ulp_ctx, &dev_id);
+       if (rc) {
+               BNXT_TF_DBG(ERR, "Unable to get the dev id from ulp.\n");
+               return -EINVAL;
+       }
+
+       for (i = 0; i < num; i++) {
+               if (app_id != info[i].app_id || dev_id != info[i].device_id)
+                       continue;
+               dir = info[i].direction;
+               res_type = info[i].resource_type;
+
+               switch (info[i].resource_func) {
+               case BNXT_ULP_RESOURCE_FUNC_IDENTIFIER:
+                       res->ident_cnt[dir].cnt[res_type] = info[i].count;
+                       break;
+               case BNXT_ULP_RESOURCE_FUNC_INDEX_TABLE:
+                       res->tbl_cnt[dir].cnt[res_type] = info[i].count;
+                       break;
+               case BNXT_ULP_RESOURCE_FUNC_TCAM_TABLE:
+                       res->tcam_cnt[dir].cnt[res_type] = info[i].count;
+                       break;
+               case BNXT_ULP_RESOURCE_FUNC_EM_TABLE:
+                       res->em_cnt[dir].cnt[res_type] = info[i].count;
+                       break;
+               default:
+                       break;
+               }
+       }
+       return 0;
+}
+
+static int32_t
+bnxt_ulp_tf_resources_get(struct bnxt_ulp_context *ulp_ctx,
+                         struct tf_session_resources *res)
+{
+       struct bnxt_ulp_resource_resv_info *unnamed = NULL;
+       uint32_t unum;
+       int32_t rc = 0;
+
+       if (ulp_ctx == NULL || res == NULL) {
+               BNXT_TF_DBG(ERR, "Invalid arguments to get resources.\n");
+               return -EINVAL;
+       }
+
+       unnamed = bnxt_ulp_resource_resv_list_get(&unum);
+       if (unnamed == NULL) {
+               BNXT_TF_DBG(ERR, "Unable to get resource resv list.\n");
+               return -EINVAL;
+       }
+
+       rc = bnxt_ulp_unnamed_resources_calc(ulp_ctx, unnamed, unum, res);
+       if (rc)
+               BNXT_TF_DBG(ERR, "Unable to calc resources for session.\n");
+
+       return rc;
+}
+
+static int32_t
+bnxt_ulp_tf_shared_session_resources_get(struct bnxt_ulp_context *ulp_ctx,
+                                        struct tf_session_resources *res)
+{
+       struct bnxt_ulp_resource_resv_info *unnamed;
+       struct bnxt_ulp_glb_resource_info *named;
+       uint32_t unum, nnum;
+       int32_t rc;
+
+       if (ulp_ctx == NULL || res == NULL) {
+               BNXT_TF_DBG(ERR, "Invalid arguments to get resources.\n");
+               return -EINVAL;
+       }
+
+       /* Make sure the resources are zero before accumulating. */
+       memset(res, 0, sizeof(struct tf_session_resources));
+
+       /*
+        * Shared resources are comprised of both named and unnamed resources.
+        * First get the unnamed counts, and then add the named to the result.
+        */
+       /* Get the baseline counts */
+       unnamed = bnxt_ulp_app_resource_resv_list_get(&unum);
+       if (unnamed == NULL) {
+               BNXT_TF_DBG(ERR, "Unable to get shared resource resv list.\n");
+               return -EINVAL;
+       }
+       rc = bnxt_ulp_unnamed_resources_calc(ulp_ctx, unnamed, unum, res);
+       if (rc) {
+               BNXT_TF_DBG(ERR, "Unable to calc resources for shared session.\n");
+               return -EINVAL;
+       }
+
+       /* Get the named list and add the totals */
+       named = bnxt_ulp_app_glb_resource_info_list_get(&nnum);
+       if (named == NULL) {
+               BNXT_TF_DBG(ERR, "Unable to get app global resource list\n");
+               return -EINVAL;
+       }
+       rc = bnxt_ulp_named_resources_calc(ulp_ctx, named, nnum, res);
+       if (rc)
+               BNXT_TF_DBG(ERR, "Unable to calc named resources\n");
+
+       return rc;
+}
+
+int32_t
+bnxt_ulp_cntxt_app_caps_init(struct bnxt *bp,
+                            uint8_t app_id, uint32_t dev_id)
+{
+       struct bnxt_ulp_app_capabilities_info *info;
+       uint32_t num = 0;
+       uint16_t i;
+       bool found = false;
+       struct bnxt_ulp_context *ulp_ctx = bp->ulp_ctx;
+
+       if (ULP_APP_DEV_UNSUPPORTED_ENABLED(ulp_ctx->cfg_data->ulp_flags)) {
+               BNXT_TF_DBG(ERR, "APP ID %d, Device ID: 0x%x not supported.\n",
+                           app_id, dev_id);
+               return -EINVAL;
+       }
+
+       info = bnxt_ulp_app_cap_list_get(&num);
+       if (!info || !num) {
+               BNXT_TF_DBG(ERR, "Failed to get app capabilities.\n");
+               return -EINVAL;
+       }
+
+       for (i = 0; i < num; i++) {
+               if (info[i].app_id != app_id || info[i].device_id != dev_id)
+                       continue;
+               found = true;
+               if (info[i].flags & BNXT_ULP_APP_CAP_SHARED_EN)
+                       ulp_ctx->cfg_data->ulp_flags |=
+                               BNXT_ULP_SHARED_SESSION_ENABLED;
+               if (info[i].flags & BNXT_ULP_APP_CAP_HOT_UPGRADE_EN)
+                       ulp_ctx->cfg_data->ulp_flags |=
+                               BNXT_ULP_HIGH_AVAIL_ENABLED;
+               if (info[i].flags & BNXT_ULP_APP_CAP_UNICAST_ONLY)
+                       ulp_ctx->cfg_data->ulp_flags |=
+                               BNXT_ULP_APP_UNICAST_ONLY;
+               if (info[i].flags & BNXT_ULP_APP_CAP_SOCKET_DIRECT) {
+                       /* Enable socket direction only if MR is enabled in fw*/
+                       if (BNXT_MULTIROOT_EN(bp)) {
+                               ulp_ctx->cfg_data->ulp_flags |=
+                                       BNXT_ULP_APP_SOCKET_DIRECT;
+                               BNXT_TF_DBG(DEBUG,
+                                           "Socket Direct feature is enabled");
+                       }
+               }
+       }
+       if (!found) {
+               BNXT_TF_DBG(ERR, "APP ID %d, Device ID: 0x%x not supported.\n",
+                           app_id, dev_id);
+               ulp_ctx->cfg_data->ulp_flags |= BNXT_ULP_APP_DEV_UNSUPPORTED;
+               return -EINVAL;
+       }
+
+       return 0;
+}
+
+static void
+ulp_ctx_shared_session_close(struct bnxt *bp,
+                            struct bnxt_ulp_session_state *session)
+{
+       struct tf *tfp;
+       int32_t rc;
+
+       if (!bnxt_ulp_cntxt_shared_session_enabled(bp->ulp_ctx))
+               return;
+
+       tfp = bnxt_ulp_cntxt_shared_tfp_get(bp->ulp_ctx);
+       if (!tfp) {
+               /*
+                * Log it under debug since this is likely a case of the
+                * shared session not being created.  For example, a failed
+                * initialization.
+                */
+               BNXT_TF_DBG(DEBUG, "Failed to get shared tfp on close.\n");
+               return;
+       }
+       rc = tf_close_session(tfp);
+       if (rc)
+               BNXT_TF_DBG(ERR, "Failed to close the shared session rc=%d.\n",
+                           rc);
+       (void)bnxt_ulp_cntxt_shared_tfp_set(bp->ulp_ctx, NULL);
+
+       session->g_shared_tfp.session = NULL;
+}
+
+static int32_t
+ulp_ctx_shared_session_open(struct bnxt *bp,
+                           struct bnxt_ulp_session_state *session)
+{
+       struct rte_eth_dev *ethdev = bp->eth_dev;
+       struct tf_session_resources *resources;
+       struct tf_open_session_parms parms;
+       size_t copy_nbytes;
+       uint32_t ulp_dev_id = BNXT_ULP_DEVICE_ID_LAST;
+       int32_t rc = 0;
+       uint8_t app_id;
+
+       /* only perform this if shared session is enabled. */
+       if (!bnxt_ulp_cntxt_shared_session_enabled(bp->ulp_ctx))
+               return 0;
+
+       memset(&parms, 0, sizeof(parms));
+
+       rc = rte_eth_dev_get_name_by_port(ethdev->data->port_id,
+                                         parms.ctrl_chan_name);
+       if (rc) {
+               BNXT_TF_DBG(ERR, "Invalid port %d, rc = %d\n",
+                           ethdev->data->port_id, rc);
+               return rc;
+       }
+       resources = &parms.resources;
+
+       /*
+        * Need to account for size of ctrl_chan_name and 1 extra for Null
+        * terminator
+        */
+       copy_nbytes = sizeof(parms.ctrl_chan_name) -
+               strlen(parms.ctrl_chan_name) - 1;
+
+       /*
+        * Build the ctrl_chan_name with shared token.
+        * When HA is enabled, the WC TCAM needs extra management by the core,
+        * so add the wc_tcam string to the control channel.
+        */
+       if (bnxt_ulp_cntxt_ha_enabled(bp->ulp_ctx))
+               strncat(parms.ctrl_chan_name, "-tf_shared-wc_tcam",
+                       copy_nbytes);
+       else
+               strncat(parms.ctrl_chan_name, "-tf_shared", copy_nbytes);
+
+       rc = bnxt_ulp_tf_shared_session_resources_get(bp->ulp_ctx, resources);
+       if (rc)
+               return rc;
+
+       rc = bnxt_ulp_cntxt_app_id_get(bp->ulp_ctx, &app_id);
+       if (rc) {
+               BNXT_TF_DBG(ERR, "Unable to get the app id from ulp.\n");
+               return -EINVAL;
+       }
+
+       rc = bnxt_ulp_cntxt_dev_id_get(bp->ulp_ctx, &ulp_dev_id);
+       if (rc) {
+               BNXT_TF_DBG(ERR, "Unable to get device id from ulp.\n");
+               return rc;
+       }
+
+       switch (ulp_dev_id) {
+       case BNXT_ULP_DEVICE_ID_WH_PLUS:
+               parms.device_type = TF_DEVICE_TYPE_WH;
+               break;
+       case BNXT_ULP_DEVICE_ID_STINGRAY:
+               parms.device_type = TF_DEVICE_TYPE_SR;
+               break;
+       case BNXT_ULP_DEVICE_ID_THOR:
+               parms.device_type = TF_DEVICE_TYPE_THOR;
+               break;
+       default:
+               BNXT_TF_DBG(ERR, "Unable to determine dev for opening session.\n");
+               return rc;
+       }
+
+       parms.shadow_copy = true;
+       parms.bp = bp;
+       if (app_id == 0)
+               parms.wc_num_slices = TF_WC_TCAM_2_SLICE_PER_ROW;
+       else
+               parms.wc_num_slices = TF_WC_TCAM_1_SLICE_PER_ROW;
+
+       /*
+        * Open the session here, but the collect the resources during the
+        * mapper initialization.
+        */
+       rc = tf_open_session(&bp->tfp_shared, &parms);
+       if (rc)
+               return rc;
+
+       if (parms.shared_session_creator)
+               BNXT_TF_DBG(DEBUG, "Shared session creator.\n");
+       else
+               BNXT_TF_DBG(DEBUG, "Shared session attached.\n");
+
+       /* Save the shared session in global data */
+       if (!session->g_shared_tfp.session)
+               session->g_shared_tfp.session = bp->tfp_shared.session;
+
+       rc = bnxt_ulp_cntxt_shared_tfp_set(bp->ulp_ctx, &bp->tfp_shared);
+       if (rc)
+               BNXT_TF_DBG(ERR, "Failed to add shared tfp to ulp (%d)\n", rc);
+
+       return rc;
+}
+
+static int32_t
+ulp_ctx_shared_session_attach(struct bnxt *bp,
+                             struct bnxt_ulp_session_state *session)
+{
+       int32_t rc = 0;
+
+       /* Simply return success if shared session not enabled */
+       if (bnxt_ulp_cntxt_shared_session_enabled(bp->ulp_ctx)) {
+               bp->tfp_shared.session = session->g_shared_tfp.session;
+               rc = ulp_ctx_shared_session_open(bp, session);
+       }
+
+       return rc;
+}
+
+static void
+ulp_ctx_shared_session_detach(struct bnxt *bp)
+{
+       if (bnxt_ulp_cntxt_shared_session_enabled(bp->ulp_ctx)) {
+               if (bp->tfp_shared.session) {
+                       tf_close_session(&bp->tfp_shared);
+                       bp->tfp_shared.session = NULL;
+               }
+       }
+}
+
 /*
  * Initialize an ULP session.
  * An ULP session will contain all the resources needed to support rte flow
@@ -67,6 +537,8 @@ ulp_ctx_session_open(struct bnxt *bp,
        int32_t                         rc = 0;
        struct tf_open_session_parms    params;
        struct tf_session_resources     *resources;
+       uint32_t ulp_dev_id = BNXT_ULP_DEVICE_ID_LAST;
+       uint8_t app_id;
 
        memset(&params, 0, sizeof(params));
 
@@ -79,77 +551,44 @@ ulp_ctx_session_open(struct bnxt *bp,
        }
 
        params.shadow_copy = true;
-       params.device_type = TF_DEVICE_TYPE_WH;
+
+       rc = bnxt_ulp_cntxt_app_id_get(bp->ulp_ctx, &app_id);
+       if (rc) {
+               BNXT_TF_DBG(ERR, "Unable to get the app id from ulp.\n");
+               return -EINVAL;
+       }
+
+       rc = bnxt_ulp_cntxt_dev_id_get(bp->ulp_ctx, &ulp_dev_id);
+       if (rc) {
+               BNXT_TF_DBG(ERR, "Unable to get device id from ulp.\n");
+               return rc;
+       }
+
+       switch (ulp_dev_id) {
+       case BNXT_ULP_DEVICE_ID_WH_PLUS:
+               params.device_type = TF_DEVICE_TYPE_WH;
+               break;
+       case BNXT_ULP_DEVICE_ID_STINGRAY:
+               params.device_type = TF_DEVICE_TYPE_SR;
+               break;
+       case BNXT_ULP_DEVICE_ID_THOR:
+               params.device_type = TF_DEVICE_TYPE_THOR;
+               break;
+       default:
+               BNXT_TF_DBG(ERR, "Unable to determine device for opening session.\n");
+               return rc;
+       }
+
        resources = &params.resources;
-       /** RX **/
-       /* Identifiers */
-       resources->ident_cnt[TF_DIR_RX].cnt[TF_IDENT_TYPE_L2_CTXT_HIGH] = 422;
-       resources->ident_cnt[TF_DIR_RX].cnt[TF_IDENT_TYPE_L2_CTXT_LOW] = 6;
-       resources->ident_cnt[TF_DIR_RX].cnt[TF_IDENT_TYPE_WC_PROF] = 192;
-       resources->ident_cnt[TF_DIR_RX].cnt[TF_IDENT_TYPE_PROF_FUNC] = 64;
-       resources->ident_cnt[TF_DIR_RX].cnt[TF_IDENT_TYPE_EM_PROF] = 192;
-
-       /* Table Types */
-       resources->tbl_cnt[TF_DIR_RX].cnt[TF_TBL_TYPE_FULL_ACT_RECORD] = 8192;
-       resources->tbl_cnt[TF_DIR_RX].cnt[TF_TBL_TYPE_ACT_STATS_64] = 16384;
-       resources->tbl_cnt[TF_DIR_RX].cnt[TF_TBL_TYPE_ACT_MODIFY_IPV4] = 1023;
-
-       /* ENCAP */
-       resources->tbl_cnt[TF_DIR_RX].cnt[TF_TBL_TYPE_ACT_ENCAP_8B] = 511;
-       resources->tbl_cnt[TF_DIR_RX].cnt[TF_TBL_TYPE_ACT_ENCAP_16B] = 63;
-
-       /* TCAMs */
-       resources->tcam_cnt[TF_DIR_RX].cnt[TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH] =
-               422;
-       resources->tcam_cnt[TF_DIR_RX].cnt[TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW] =
-               6;
-       resources->tcam_cnt[TF_DIR_RX].cnt[TF_TCAM_TBL_TYPE_PROF_TCAM] = 960;
-       resources->tcam_cnt[TF_DIR_RX].cnt[TF_TCAM_TBL_TYPE_WC_TCAM] = 88;
-
-       /* EM */
-       resources->em_cnt[TF_DIR_RX].cnt[TF_EM_TBL_TYPE_EM_RECORD] = 13168;
-
-       /* EEM */
-       resources->em_cnt[TF_DIR_RX].cnt[TF_EM_TBL_TYPE_TBL_SCOPE] = 1;
-
-       /* SP */
-       resources->tbl_cnt[TF_DIR_RX].cnt[TF_TBL_TYPE_ACT_SP_SMAC] = 255;
-
-       /** TX **/
-       /* Identifiers */
-       resources->ident_cnt[TF_DIR_TX].cnt[TF_IDENT_TYPE_L2_CTXT_HIGH] = 292;
-       resources->ident_cnt[TF_DIR_TX].cnt[TF_IDENT_TYPE_L2_CTXT_LOW] = 148;
-       resources->ident_cnt[TF_DIR_TX].cnt[TF_IDENT_TYPE_WC_PROF] = 192;
-       resources->ident_cnt[TF_DIR_TX].cnt[TF_IDENT_TYPE_PROF_FUNC] = 64;
-       resources->ident_cnt[TF_DIR_TX].cnt[TF_IDENT_TYPE_EM_PROF] = 192;
-
-       /* Table Types */
-       resources->tbl_cnt[TF_DIR_TX].cnt[TF_TBL_TYPE_FULL_ACT_RECORD] = 8192;
-       resources->tbl_cnt[TF_DIR_TX].cnt[TF_TBL_TYPE_ACT_STATS_64] = 16384;
-       resources->tbl_cnt[TF_DIR_TX].cnt[TF_TBL_TYPE_ACT_MODIFY_IPV4] = 1023;
-
-       /* ENCAP */
-       resources->tbl_cnt[TF_DIR_TX].cnt[TF_TBL_TYPE_ACT_ENCAP_64B] = 511;
-       resources->tbl_cnt[TF_DIR_TX].cnt[TF_TBL_TYPE_ACT_ENCAP_16B] = 223;
-       resources->tbl_cnt[TF_DIR_TX].cnt[TF_TBL_TYPE_ACT_ENCAP_8B] = 255;
-
-       /* TCAMs */
-       resources->tcam_cnt[TF_DIR_TX].cnt[TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_HIGH] =
-               292;
-       resources->tcam_cnt[TF_DIR_TX].cnt[TF_TCAM_TBL_TYPE_L2_CTXT_TCAM_LOW] =
-               144;
-       resources->tcam_cnt[TF_DIR_TX].cnt[TF_TCAM_TBL_TYPE_PROF_TCAM] = 960;
-       resources->tcam_cnt[TF_DIR_TX].cnt[TF_TCAM_TBL_TYPE_WC_TCAM] = 928;
-
-       /* EM */
-       resources->em_cnt[TF_DIR_TX].cnt[TF_EM_TBL_TYPE_EM_RECORD] = 15232;
-
-       /* EEM */
-       resources->em_cnt[TF_DIR_TX].cnt[TF_EM_TBL_TYPE_TBL_SCOPE] = 1;
-
-       /* SP */
-       resources->tbl_cnt[TF_DIR_TX].cnt[TF_TBL_TYPE_ACT_SP_SMAC_IPV4] = 488;
-       resources->tbl_cnt[TF_DIR_TX].cnt[TF_TBL_TYPE_ACT_SP_SMAC_IPV6] = 511;
+       rc = bnxt_ulp_tf_resources_get(bp->ulp_ctx, resources);
+       if (rc)
+               return rc;
+
+       params.bp = bp;
+       if (app_id == 0)
+               params.wc_num_slices = TF_WC_TCAM_2_SLICE_PER_ROW;
+       else
+               params.wc_num_slices = TF_WC_TCAM_1_SLICE_PER_ROW;
 
        rc = tf_open_session(&bp->tfp, &params);
        if (rc) {
@@ -159,7 +598,9 @@ ulp_ctx_session_open(struct bnxt *bp,
        }
        if (!session->session_opened) {
                session->session_opened = 1;
-               session->g_tfp = &bp->tfp;
+               session->g_tfp = rte_zmalloc("bnxt_ulp_session_tfp",
+                                            sizeof(struct tf), 0);
+               session->g_tfp->session = bp->tfp.session;
        }
        return rc;
 }
@@ -176,6 +617,7 @@ ulp_ctx_session_close(struct bnxt *bp,
        if (session->session_opened)
                tf_close_session(&bp->tfp);
        session->session_opened = 0;
+       rte_free(session->g_tfp);
        session->g_tfp = NULL;
 }
 
@@ -206,29 +648,29 @@ bnxt_init_tbl_scope_parms(struct bnxt *bp,
                        BNXT_ULP_DFLT_RX_MAX_ACTN_ENTRY;
                params->rx_mem_size_in_mb = BNXT_ULP_DFLT_RX_MEM;
                params->rx_num_flows_in_k = BNXT_ULP_RX_NUM_FLOWS;
-               params->rx_tbl_if_id = BNXT_ULP_RX_TBL_IF_ID;
 
                params->tx_max_key_sz_in_bits = BNXT_ULP_DFLT_TX_MAX_KEY;
                params->tx_max_action_entry_sz_in_bits =
                        BNXT_ULP_DFLT_TX_MAX_ACTN_ENTRY;
                params->tx_mem_size_in_mb = BNXT_ULP_DFLT_TX_MEM;
                params->tx_num_flows_in_k = BNXT_ULP_TX_NUM_FLOWS;
-               params->tx_tbl_if_id = BNXT_ULP_TX_TBL_IF_ID;
        } else {
                params->rx_max_key_sz_in_bits = BNXT_ULP_DFLT_RX_MAX_KEY;
                params->rx_max_action_entry_sz_in_bits =
                        BNXT_ULP_DFLT_RX_MAX_ACTN_ENTRY;
                params->rx_mem_size_in_mb = BNXT_ULP_DFLT_RX_MEM;
-               params->rx_num_flows_in_k = dparms->flow_db_num_entries / 1024;
-               params->rx_tbl_if_id = BNXT_ULP_RX_TBL_IF_ID;
+               params->rx_num_flows_in_k =
+                       dparms->ext_flow_db_num_entries / 1024;
 
                params->tx_max_key_sz_in_bits = BNXT_ULP_DFLT_TX_MAX_KEY;
                params->tx_max_action_entry_sz_in_bits =
                        BNXT_ULP_DFLT_TX_MAX_ACTN_ENTRY;
                params->tx_mem_size_in_mb = BNXT_ULP_DFLT_TX_MEM;
-               params->tx_num_flows_in_k = dparms->flow_db_num_entries / 1024;
-               params->tx_tbl_if_id = BNXT_ULP_TX_TBL_IF_ID;
+               params->tx_num_flows_in_k =
+                       dparms->ext_flow_db_num_entries / 1024;
        }
+       BNXT_TF_DBG(INFO, "Table Scope initialized with %uK flows.\n",
+                   params->rx_num_flows_in_k);
 }
 
 /* Initialize Extended Exact Match host memory. */
@@ -236,8 +678,9 @@ static int32_t
 ulp_eem_tbl_scope_init(struct bnxt *bp)
 {
        struct tf_alloc_tbl_scope_parms params = {0};
-       uint32_t dev_id;
        struct bnxt_ulp_device_params *dparms;
+       enum bnxt_ulp_flow_mem_type mtype;
+       uint32_t dev_id;
        int rc;
 
        /* Get the dev specific number of flows that needed to be supported. */
@@ -252,20 +695,20 @@ ulp_eem_tbl_scope_init(struct bnxt *bp)
                return -ENODEV;
        }
 
-       if (dparms->flow_mem_type != BNXT_ULP_FLOW_MEM_TYPE_EXT) {
+       if (bnxt_ulp_cntxt_mem_type_get(bp->ulp_ctx, &mtype))
+               return -EINVAL;
+       if (mtype != BNXT_ULP_FLOW_MEM_TYPE_EXT) {
                BNXT_TF_DBG(INFO, "Table Scope alloc is not required\n");
                return 0;
        }
 
        bnxt_init_tbl_scope_parms(bp, &params);
-
        rc = tf_alloc_tbl_scope(&bp->tfp, &params);
        if (rc) {
                BNXT_TF_DBG(ERR, "Unable to allocate eem table scope rc = %d\n",
                            rc);
                return rc;
        }
-
        rc = bnxt_ulp_cntxt_tbl_scope_id_set(bp->ulp_ctx, params.tbl_scope_id);
        if (rc) {
                BNXT_TF_DBG(ERR, "Unable to set table scope id\n");
@@ -283,12 +726,13 @@ ulp_eem_tbl_scope_deinit(struct bnxt *bp, struct bnxt_ulp_context *ulp_ctx)
        struct tf                       *tfp;
        int32_t                         rc = 0;
        struct bnxt_ulp_device_params *dparms;
+       enum bnxt_ulp_flow_mem_type mtype;
        uint32_t dev_id;
 
        if (!ulp_ctx || !ulp_ctx->cfg_data)
                return -EINVAL;
 
-       tfp = bnxt_ulp_cntxt_tfp_get(ulp_ctx);
+       tfp = bnxt_ulp_cntxt_tfp_get(ulp_ctx, BNXT_ULP_SHARED_SESSION_NO);
        if (!tfp) {
                BNXT_TF_DBG(ERR, "Failed to get the truflow pointer\n");
                return -EINVAL;
@@ -306,7 +750,9 @@ ulp_eem_tbl_scope_deinit(struct bnxt *bp, struct bnxt_ulp_context *ulp_ctx)
                return -ENODEV;
        }
 
-       if (dparms->flow_mem_type != BNXT_ULP_FLOW_MEM_TYPE_EXT) {
+       if (bnxt_ulp_cntxt_mem_type_get(ulp_ctx, &mtype))
+               return -EINVAL;
+       if (mtype != BNXT_ULP_FLOW_MEM_TYPE_EXT) {
                BNXT_TF_DBG(INFO, "Table Scope free is not required\n");
                return 0;
        }
@@ -333,6 +779,9 @@ ulp_ctx_deinit(struct bnxt *bp,
        /* close the tf session */
        ulp_ctx_session_close(bp, session);
 
+       /* The shared session must be closed last. */
+       ulp_ctx_shared_session_close(bp, session);
+
        /* Free the contents */
        if (session->cfg_data) {
                rte_free(session->cfg_data);
@@ -349,6 +798,17 @@ ulp_ctx_init(struct bnxt *bp,
 {
        struct bnxt_ulp_data    *ulp_data;
        int32_t                 rc = 0;
+       enum bnxt_ulp_device_id devid;
+
+       /* Initialize the context entries list */
+       bnxt_ulp_cntxt_list_init();
+
+       /* Add the context to the context entries list */
+       rc = bnxt_ulp_cntxt_list_add(bp->ulp_ctx);
+       if (rc) {
+               BNXT_TF_DBG(ERR, "Failed to add the context list entry\n");
+               return -ENOMEM;
+       }
 
        /* Allocate memory to hold ulp context data. */
        ulp_data = rte_zmalloc("bnxt_ulp_data",
@@ -364,28 +824,73 @@ ulp_ctx_init(struct bnxt *bp,
        ulp_data->ref_cnt++;
        ulp_data->ulp_flags |= BNXT_ULP_VF_REP_ENABLED;
 
-       /* Open the ulp session. */
-       rc = ulp_ctx_session_open(bp, session);
+       rc = bnxt_ulp_devid_get(bp, &devid);
        if (rc) {
-               session->session_opened = 1;
-               (void)ulp_ctx_deinit(bp, session);
-               return rc;
+               BNXT_TF_DBG(ERR, "Unable to determine device for ULP init.\n");
+               goto error_deinit;
+       }
+
+       rc = bnxt_ulp_cntxt_dev_id_set(bp->ulp_ctx, devid);
+       if (rc) {
+               BNXT_TF_DBG(ERR, "Unable to set device for ULP init.\n");
+               goto error_deinit;
+       }
+
+       rc = bnxt_ulp_cntxt_app_id_set(bp->ulp_ctx, bp->app_id);
+       if (rc) {
+               BNXT_TF_DBG(ERR, "Unable to set app_id for ULP init.\n");
+               goto error_deinit;
+       }
+       BNXT_TF_DBG(DEBUG, "Ulp initialized with app id %d\n", bp->app_id);
+
+       rc = bnxt_ulp_cntxt_app_caps_init(bp, bp->app_id, devid);
+       if (rc) {
+               BNXT_TF_DBG(ERR, "Unable to set caps for app(%x)/dev(%x)\n",
+                           bp->app_id, devid);
+               goto error_deinit;
        }
 
+       /*
+        * Shared session must be created before first regular session but after
+        * the ulp_ctx is valid.
+        */
+       rc = ulp_ctx_shared_session_open(bp, session);
+       if (rc) {
+               BNXT_TF_DBG(ERR, "Unable to open shared session (%d)\n", rc);
+               goto error_deinit;
+       }
+
+       /* Open the ulp session. */
+       rc = ulp_ctx_session_open(bp, session);
+       if (rc)
+               goto error_deinit;
+
        bnxt_ulp_cntxt_tfp_set(bp->ulp_ctx, &bp->tfp);
        return rc;
+
+error_deinit:
+       session->session_opened = 1;
+       (void)ulp_ctx_deinit(bp, session);
+       return rc;
 }
 
 /* The function to initialize ulp dparms with devargs */
 static int32_t
-ulp_dparms_init(struct bnxt *bp,
-               struct bnxt_ulp_context *ulp_ctx)
+ulp_dparms_init(struct bnxt *bp, struct bnxt_ulp_context *ulp_ctx)
 {
        struct bnxt_ulp_device_params *dparms;
-       uint32_t dev_id;
+       uint32_t dev_id = BNXT_ULP_DEVICE_ID_LAST;
 
-       if (!bp->max_num_kflows)
+       if (!bp->max_num_kflows) {
+               /* Defaults to Internal */
+               bnxt_ulp_cntxt_mem_type_set(ulp_ctx,
+                                           BNXT_ULP_FLOW_MEM_TYPE_INT);
                return 0;
+       }
+
+       /* The max_num_kflows were set, so move to external */
+       if (bnxt_ulp_cntxt_mem_type_set(ulp_ctx, BNXT_ULP_FLOW_MEM_TYPE_EXT))
+               return -EINVAL;
 
        if (bnxt_ulp_cntxt_dev_id_get(ulp_ctx, &dev_id)) {
                BNXT_TF_DBG(DEBUG, "Failed to get device id\n");
@@ -399,11 +904,11 @@ ulp_dparms_init(struct bnxt *bp,
        }
 
        /* num_flows = max_num_kflows * 1024 */
-       dparms->flow_db_num_entries = bp->max_num_kflows * 1024;
+       dparms->ext_flow_db_num_entries = bp->max_num_kflows * 1024;
        /* GFID =  2 * num_flows */
-       dparms->mark_db_gfid_entries = dparms->flow_db_num_entries * 2;
-       BNXT_TF_DBG(DEBUG, "Set the number of flows = %"PRIu64"\n",
-                   dparms->flow_db_num_entries);
+       dparms->mark_db_gfid_entries = dparms->ext_flow_db_num_entries * 2;
+       BNXT_TF_DBG(DEBUG, "Set the number of flows = %" PRIu64 "\n",
+                   dparms->ext_flow_db_num_entries);
 
        return 0;
 }
@@ -413,22 +918,12 @@ static int32_t
 ulp_dparms_dev_port_intf_update(struct bnxt *bp,
                                struct bnxt_ulp_context *ulp_ctx)
 {
-       struct bnxt_ulp_device_params *dparms;
-       uint32_t dev_id;
-
-       if (bnxt_ulp_cntxt_dev_id_get(ulp_ctx, &dev_id)) {
-               BNXT_TF_DBG(DEBUG, "Failed to get device id\n");
-               return -EINVAL;
-       }
+       enum bnxt_ulp_flow_mem_type mtype;
 
-       dparms = bnxt_ulp_device_params_get(dev_id);
-       if (!dparms) {
-               BNXT_TF_DBG(DEBUG, "Failed to get device parms\n");
+       if (bnxt_ulp_cntxt_mem_type_get(ulp_ctx, &mtype))
                return -EINVAL;
-       }
-
        /* Update the bp flag with gfid flag */
-       if (dparms->flow_mem_type == BNXT_ULP_FLOW_MEM_TYPE_EXT)
+       if (mtype == BNXT_ULP_FLOW_MEM_TYPE_EXT)
                bp->flags |= BNXT_FLAG_GFID_ENABLE;
 
        return 0;
@@ -439,6 +934,8 @@ ulp_ctx_attach(struct bnxt *bp,
               struct bnxt_ulp_session_state *session)
 {
        int32_t rc = 0;
+       uint32_t flags, dev_id = BNXT_ULP_DEVICE_ID_LAST;
+       uint8_t app_id;
 
        /* Increment the ulp context data reference count usage. */
        bp->ulp_ctx->cfg_data = session->cfg_data;
@@ -447,6 +944,36 @@ ulp_ctx_attach(struct bnxt *bp,
        /* update the session details in bnxt tfp */
        bp->tfp.session = session->g_tfp->session;
 
+       /* Add the context to the context entries list */
+       rc = bnxt_ulp_cntxt_list_add(bp->ulp_ctx);
+       if (rc) {
+               BNXT_TF_DBG(ERR, "Failed to add the context list entry\n");
+               return -EINVAL;
+       }
+
+       /*
+        * The supported flag will be set during the init. Use it now to
+        * know if we should go through the attach.
+        */
+       rc = bnxt_ulp_cntxt_app_id_get(bp->ulp_ctx, &app_id);
+       if (rc) {
+               BNXT_TF_DBG(ERR, "Unable to get the app id from ulp.\n");
+               return -EINVAL;
+       }
+
+       rc = bnxt_ulp_cntxt_dev_id_get(bp->ulp_ctx, &dev_id);
+       if (rc) {
+               BNXT_TF_DBG(ERR, "Unable do get the dev_id.\n");
+               return -EINVAL;
+       }
+
+       flags = bp->ulp_ctx->cfg_data->ulp_flags;
+       if (ULP_APP_DEV_UNSUPPORTED_ENABLED(flags)) {
+               BNXT_TF_DBG(ERR, "APP ID %d, Device ID: 0x%x not supported.\n",
+                           app_id, dev_id);
+               return -EINVAL;
+       }
+
        /* Create a TF Client */
        rc = ulp_ctx_session_open(bp, session);
        if (rc) {
@@ -494,13 +1021,15 @@ ulp_context_initialized(struct bnxt_ulp_session_state *session, bool *init)
  * pointer, otherwise allocate a new session.
  */
 static struct bnxt_ulp_session_state *
-ulp_get_session(struct rte_pci_addr *pci_addr)
+ulp_get_session(struct bnxt *bp, struct rte_pci_addr *pci_addr)
 {
        struct bnxt_ulp_session_state *session;
 
+       /* if multi root capability is enabled, then ignore the pci bus id */
        STAILQ_FOREACH(session, &bnxt_ulp_session_list, next) {
                if (session->pci_info.domain == pci_addr->domain &&
-                   session->pci_info.bus == pci_addr->bus) {
+                   (BNXT_MULTIROOT_EN(bp) ||
+                   session->pci_info.bus == pci_addr->bus)) {
                        return session;
                }
        }
@@ -528,7 +1057,7 @@ ulp_session_init(struct bnxt *bp,
 
        pthread_mutex_lock(&bnxt_ulp_global_mutex);
 
-       session = ulp_get_session(pci_addr);
+       session = ulp_get_session(bp, pci_addr);
        if (!session) {
                /* Not Found the session  Allocate a new one */
                session = rte_zmalloc("bnxt_ulp_session",
@@ -667,8 +1196,7 @@ bnxt_ulp_destroy_vfr_default_rules(struct bnxt *bp, bool global)
                        continue;
 
                /* Destroy the flows */
-               ulp_default_flow_destroy(bp->eth_dev, info->rep2vf_flow_id);
-               ulp_default_flow_destroy(bp->eth_dev, info->vf2rep_flow_id);
+               ulp_default_flow_destroy(bp->eth_dev, info->vfr_flow_id);
                /* Clean up the tx action pointer */
                vfr_eth_dev = &rte_eth_devices[port_id];
                if (vfr_eth_dev) {
@@ -688,9 +1216,18 @@ static void
 bnxt_ulp_deinit(struct bnxt *bp,
                struct bnxt_ulp_session_state *session)
 {
+       bool ha_enabled;
+
        if (!bp->ulp_ctx || !bp->ulp_ctx->cfg_data)
                return;
 
+       ha_enabled = bnxt_ulp_cntxt_ha_enabled(bp->ulp_ctx);
+       if (ha_enabled && session->session_opened) {
+               int32_t rc = ulp_ha_mgr_close(bp->ulp_ctx);
+               if (rc)
+                       BNXT_TF_DBG(ERR, "Failed to close HA (%d)\n", rc);
+       }
+
        /* clean up default flows */
        bnxt_ulp_destroy_df_rules(bp, true);
 
@@ -698,7 +1235,7 @@ bnxt_ulp_deinit(struct bnxt *bp,
        bnxt_ulp_destroy_vfr_default_rules(bp, true);
 
        /* clean up regular flows */
-       ulp_flow_db_flush_flows(bp->ulp_ctx, BNXT_ULP_REGULAR_FLOW_TABLE);
+       ulp_flow_db_flush_flows(bp->ulp_ctx, BNXT_ULP_FDB_TYPE_REGULAR);
 
        /* cleanup the eem table scope */
        ulp_eem_tbl_scope_deinit(bp, bp->ulp_ctx);
@@ -730,6 +1267,9 @@ bnxt_ulp_deinit(struct bnxt *bp,
        /* free the flow db lock */
        pthread_mutex_destroy(&bp->ulp_ctx->cfg_data->flow_db_lock);
 
+       if (ha_enabled)
+               ulp_ha_mgr_deinit(bp->ulp_ctx);
+
        /* Delete the ulp context and tf session and free the ulp context */
        ulp_ctx_deinit(bp, session);
        BNXT_TF_DBG(DEBUG, "ulp ctx has been deinitialized\n");
@@ -826,6 +1366,19 @@ bnxt_ulp_init(struct bnxt *bp,
                BNXT_TF_DBG(ERR, "Failed to set tx global configuration\n");
                goto jump_to_error;
        }
+
+       if (bnxt_ulp_cntxt_ha_enabled(bp->ulp_ctx)) {
+               rc = ulp_ha_mgr_init(bp->ulp_ctx);
+               if (rc) {
+                       BNXT_TF_DBG(ERR, "Failed to initialize HA %d\n", rc);
+                       goto jump_to_error;
+               }
+               rc = ulp_ha_mgr_open(bp->ulp_ctx);
+               if (rc) {
+                       BNXT_TF_DBG(ERR, "Failed to Process HA Open %d\n", rc);
+                       goto jump_to_error;
+               }
+       }
        BNXT_TF_DBG(DEBUG, "ulp ctx has been initialized\n");
        return rc;
 
@@ -843,15 +1396,21 @@ bnxt_ulp_port_init(struct bnxt *bp)
 {
        struct bnxt_ulp_session_state *session;
        bool initialized;
+       enum bnxt_ulp_device_id devid = BNXT_ULP_DEVICE_ID_LAST;
+       uint32_t ulp_flags;
        int32_t rc = 0;
 
-       if (!bp || !BNXT_TRUFLOW_EN(bp))
+       if (!BNXT_TRUFLOW_EN(bp)) {
+               BNXT_TF_DBG(DEBUG,
+                           "Skip ulp init for port: %d, TF is not enabled\n",
+                           bp->eth_dev->data->port_id);
                return rc;
+       }
 
        if (!BNXT_PF(bp) && !BNXT_VF_IS_TRUSTED(bp)) {
-               BNXT_TF_DBG(ERR,
+               BNXT_TF_DBG(DEBUG,
                            "Skip ulp init for port: %d, not a TVF or PF\n",
-                       bp->eth_dev->data->port_id);
+                           bp->eth_dev->data->port_id);
                return rc;
        }
 
@@ -889,6 +1448,18 @@ bnxt_ulp_port_init(struct bnxt *bp)
                        BNXT_TF_DBG(ERR, "Failed to attach the ulp context\n");
                        goto jump_to_error;
                }
+
+               /*
+                * Attach to the shared session, must be called after the
+                * ulp_ctx_attach in order to ensure that ulp data is available
+                * for attaching.
+                */
+               rc = ulp_ctx_shared_session_attach(bp, session);
+               if (rc) {
+                       BNXT_TF_DBG(ERR,
+                                   "Failed attach to shared session (%d)", rc);
+                       goto jump_to_error;
+               }
        } else {
                rc = bnxt_ulp_init(bp, session);
                if (rc) {
@@ -911,9 +1482,30 @@ bnxt_ulp_port_init(struct bnxt *bp)
                goto jump_to_error;
        }
        /* create the default rules */
-       bnxt_ulp_create_df_rules(bp);
-       BNXT_TF_DBG(DEBUG, "BNXT Port:%d ULP port init\n",
-                   bp->eth_dev->data->port_id);
+       rc = bnxt_ulp_create_df_rules(bp);
+       if (rc) {
+               BNXT_TF_DBG(ERR, "Failed to create default flow\n");
+               goto jump_to_error;
+       }
+
+       rc = bnxt_ulp_devid_get(bp, &devid);
+       if (rc) {
+               BNXT_TF_DBG(ERR, "Unable to determine device for ULP port init.\n");
+               goto jump_to_error;
+       }
+
+       /* set the unicast mode */
+       if (bnxt_ulp_cntxt_ptr2_ulp_flags_get(bp->ulp_ctx, &ulp_flags)) {
+               BNXT_TF_DBG(ERR, "Error in getting ULP context flags\n");
+               goto jump_to_error;
+       }
+       if (ulp_flags & BNXT_ULP_APP_UNICAST_ONLY) {
+               if (bnxt_pmd_set_unicast_rxmask(bp->eth_dev)) {
+                       BNXT_TF_DBG(ERR, "Error in setting unicast rxmode\n");
+                       goto jump_to_error;
+               }
+       }
+
        return rc;
 
 jump_to_error:
@@ -932,11 +1524,15 @@ bnxt_ulp_port_deinit(struct bnxt *bp)
        struct rte_pci_device *pci_dev;
        struct rte_pci_addr *pci_addr;
 
-       if (!BNXT_TRUFLOW_EN(bp))
+       if (!BNXT_TRUFLOW_EN(bp)) {
+               BNXT_TF_DBG(DEBUG,
+                           "Skip ULP deinit for port:%d, TF is not enabled\n",
+                           bp->eth_dev->data->port_id);
                return;
+       }
 
        if (!BNXT_PF(bp) && !BNXT_VF_IS_TRUSTED(bp)) {
-               BNXT_TF_DBG(ERR,
+               BNXT_TF_DBG(DEBUG,
                            "Skip ULP deinit port:%d, not a TVF or PF\n",
                            bp->eth_dev->data->port_id);
                return;
@@ -954,7 +1550,7 @@ bnxt_ulp_port_deinit(struct bnxt *bp)
        pci_dev = RTE_DEV_TO_PCI(bp->eth_dev->device);
        pci_addr = &pci_dev->addr;
        pthread_mutex_lock(&bnxt_ulp_global_mutex);
-       session = ulp_get_session(pci_addr);
+       session = ulp_get_session(bp, pci_addr);
        pthread_mutex_unlock(&bnxt_ulp_global_mutex);
 
        /* session not found then just exit */
@@ -979,12 +1575,18 @@ bnxt_ulp_port_deinit(struct bnxt *bp)
 
                        /* close the session associated with this port */
                        ulp_ctx_detach(bp);
+
+                       /* always detach/close shared after the session. */
+                       ulp_ctx_shared_session_detach(bp);
                } else {
                        /* Perform ulp ctx deinit */
                        bnxt_ulp_deinit(bp, session);
                }
        }
 
+       /* Free the ulp context in the context entry list */
+       bnxt_ulp_cntxt_list_del(bp->ulp_ctx);
+
        /* clean up the session */
        ulp_session_deinit(session);
 
@@ -1019,6 +1621,31 @@ bnxt_ulp_cntxt_ptr2_mark_db_get(struct bnxt_ulp_context *ulp_ctx)
        return ulp_ctx->cfg_data->mark_tbl;
 }
 
+bool
+bnxt_ulp_cntxt_shared_session_enabled(struct bnxt_ulp_context *ulp_ctx)
+{
+       return ULP_SHARED_SESSION_IS_ENABLED(ulp_ctx->cfg_data->ulp_flags);
+}
+
+int32_t
+bnxt_ulp_cntxt_app_id_set(struct bnxt_ulp_context *ulp_ctx, uint8_t app_id)
+{
+       if (!ulp_ctx)
+               return -EINVAL;
+       ulp_ctx->cfg_data->app_id = app_id;
+       return 0;
+}
+
+int32_t
+bnxt_ulp_cntxt_app_id_get(struct bnxt_ulp_context *ulp_ctx, uint8_t *app_id)
+{
+       /* Default APP id is zero */
+       if (!ulp_ctx || !app_id)
+               return -EINVAL;
+       *app_id = ulp_ctx->cfg_data->app_id;
+       return 0;
+}
+
 /* Function to set the device id of the hardware. */
 int32_t
 bnxt_ulp_cntxt_dev_id_set(struct bnxt_ulp_context *ulp_ctx,
@@ -1041,7 +1668,33 @@ bnxt_ulp_cntxt_dev_id_get(struct bnxt_ulp_context *ulp_ctx,
                *dev_id = ulp_ctx->cfg_data->dev_id;
                return 0;
        }
+       *dev_id = BNXT_ULP_DEVICE_ID_LAST;
+       BNXT_TF_DBG(ERR, "Failed to read dev_id from ulp ctxt\n");
+       return -EINVAL;
+}
+
+int32_t
+bnxt_ulp_cntxt_mem_type_set(struct bnxt_ulp_context *ulp_ctx,
+                           enum bnxt_ulp_flow_mem_type mem_type)
+{
+       if (ulp_ctx && ulp_ctx->cfg_data) {
+               ulp_ctx->cfg_data->mem_type = mem_type;
+               return 0;
+       }
+       BNXT_TF_DBG(ERR, "Failed to write mem_type in ulp ctxt\n");
+       return -EINVAL;
+}
 
+int32_t
+bnxt_ulp_cntxt_mem_type_get(struct bnxt_ulp_context *ulp_ctx,
+                           enum bnxt_ulp_flow_mem_type *mem_type)
+{
+       if (ulp_ctx && ulp_ctx->cfg_data) {
+               *mem_type = ulp_ctx->cfg_data->mem_type;
+               return 0;
+       }
+       *mem_type = BNXT_ULP_FLOW_MEM_TYPE_LAST;
+       BNXT_TF_DBG(ERR, "Failed to read mem_type in ulp ctxt\n");
        return -EINVAL;
 }
 
@@ -1071,6 +1724,48 @@ bnxt_ulp_cntxt_tbl_scope_id_set(struct bnxt_ulp_context *ulp_ctx,
        return -EINVAL;
 }
 
+/* Function to set the shared tfp session details from the ulp context. */
+int32_t
+bnxt_ulp_cntxt_shared_tfp_set(struct bnxt_ulp_context *ulp, struct tf *tfp)
+{
+       if (!ulp) {
+               BNXT_TF_DBG(ERR, "Invalid arguments\n");
+               return -EINVAL;
+       }
+
+       if (tfp == NULL) {
+               if (ulp->cfg_data->num_shared_clients > 0)
+                       ulp->cfg_data->num_shared_clients--;
+       } else {
+               ulp->cfg_data->num_shared_clients++;
+       }
+
+       ulp->g_shared_tfp = tfp;
+       return 0;
+}
+
+/* Function to get the shared tfp session details from the ulp context. */
+struct tf *
+bnxt_ulp_cntxt_shared_tfp_get(struct bnxt_ulp_context *ulp)
+{
+       if (!ulp) {
+               BNXT_TF_DBG(ERR, "Invalid arguments\n");
+               return NULL;
+       }
+       return ulp->g_shared_tfp;
+}
+
+/* Function to get the number of shared clients attached */
+uint8_t
+bnxt_ulp_cntxt_num_shared_clients_get(struct bnxt_ulp_context *ulp)
+{
+       if (ulp == NULL || ulp->cfg_data == NULL) {
+               BNXT_TF_DBG(ERR, "Invalid arguments\n");
+               return 0;
+       }
+       return ulp->cfg_data->num_shared_clients;
+}
+
 /* Function to set the tfp session details from the ulp context. */
 int32_t
 bnxt_ulp_cntxt_tfp_set(struct bnxt_ulp_context *ulp, struct tf *tfp)
@@ -1086,13 +1781,17 @@ bnxt_ulp_cntxt_tfp_set(struct bnxt_ulp_context *ulp, struct tf *tfp)
 
 /* Function to get the tfp session details from the ulp context. */
 struct tf *
-bnxt_ulp_cntxt_tfp_get(struct bnxt_ulp_context *ulp)
+bnxt_ulp_cntxt_tfp_get(struct bnxt_ulp_context *ulp,
+                      enum bnxt_ulp_shared_session shared)
 {
        if (!ulp) {
                BNXT_TF_DBG(ERR, "Invalid arguments\n");
                return NULL;
        }
-       return ulp->g_tfp;
+       if (shared)
+               return ulp->g_shared_tfp;
+       else
+               return ulp->g_tfp;
 }
 
 /*
@@ -1132,6 +1831,16 @@ bnxt_ulp_cntxt_ptr2_flow_db_get(struct bnxt_ulp_context  *ulp_ctx)
        return ulp_ctx->cfg_data->flow_db;
 }
 
+/* Function to get the tunnel cache table info from the ulp context. */
+struct bnxt_tun_cache_entry *
+bnxt_ulp_cntxt_ptr2_tun_tbl_get(struct bnxt_ulp_context *ulp_ctx)
+{
+       if (!ulp_ctx || !ulp_ctx->cfg_data)
+               return NULL;
+
+       return ulp_ctx->cfg_data->tun_tbl;
+}
+
 /* Function to get the ulp context from eth device. */
 struct bnxt_ulp_context        *
 bnxt_ulp_eth_dev_ptr2_cntxt_get(struct rte_eth_dev     *dev)
@@ -1268,3 +1977,108 @@ bnxt_ulp_cntxt_release_fdb_lock(struct bnxt_ulp_context *ulp_ctx)
 
        pthread_mutex_unlock(&ulp_ctx->cfg_data->flow_db_lock);
 }
+
+/* Function to set the ha info into the context */
+int32_t
+bnxt_ulp_cntxt_ptr2_ha_info_set(struct bnxt_ulp_context *ulp_ctx,
+                               struct bnxt_ulp_ha_mgr_info *ulp_ha_info)
+{
+       if (ulp_ctx == NULL || ulp_ctx->cfg_data == NULL) {
+               BNXT_TF_DBG(ERR, "Invalid ulp context data\n");
+               return -EINVAL;
+       }
+       ulp_ctx->cfg_data->ha_info = ulp_ha_info;
+       return 0;
+}
+
+/* Function to retrieve the ha info from the context. */
+struct bnxt_ulp_ha_mgr_info *
+bnxt_ulp_cntxt_ptr2_ha_info_get(struct bnxt_ulp_context *ulp_ctx)
+{
+       if (ulp_ctx == NULL || ulp_ctx->cfg_data == NULL)
+               return NULL;
+       return ulp_ctx->cfg_data->ha_info;
+}
+
+bool
+bnxt_ulp_cntxt_ha_enabled(struct bnxt_ulp_context *ulp_ctx)
+{
+       if (ulp_ctx == NULL || ulp_ctx->cfg_data == NULL)
+               return false;
+       return !!ULP_HIGH_AVAIL_IS_ENABLED(ulp_ctx->cfg_data->ulp_flags);
+}
+
+static int32_t
+bnxt_ulp_cntxt_list_init(void)
+{
+       /* 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;
+}
+
+static int32_t
+bnxt_ulp_cntxt_list_add(struct bnxt_ulp_context *ulp_ctx)
+{
+       struct ulp_context_list_entry   *entry;
+
+       entry = rte_zmalloc(NULL, sizeof(struct ulp_context_list_entry), 0);
+       if (entry == NULL) {
+               BNXT_TF_DBG(ERR, "unable to allocate memory\n");
+               return -ENOMEM;
+       }
+
+       rte_spinlock_lock(&bnxt_ulp_ctxt_lock);
+       entry->ulp_ctx = ulp_ctx;
+       TAILQ_INSERT_TAIL(&ulp_cntx_list, entry, next);
+       rte_spinlock_unlock(&bnxt_ulp_ctxt_lock);
+       return 0;
+}
+
+static void
+bnxt_ulp_cntxt_list_del(struct bnxt_ulp_context *ulp_ctx)
+{
+       struct ulp_context_list_entry   *entry, *temp;
+
+       rte_spinlock_lock(&bnxt_ulp_ctxt_lock);
+       RTE_TAILQ_FOREACH_SAFE(entry, &ulp_cntx_list, next, temp) {
+               if (entry->ulp_ctx == ulp_ctx) {
+                       TAILQ_REMOVE(&ulp_cntx_list, entry, next);
+                       rte_free(entry);
+                       break;
+               }
+       }
+       rte_spinlock_unlock(&bnxt_ulp_ctxt_lock);
+}
+
+struct bnxt_ulp_context *
+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->cfg_data == arg)
+                               return entry->ulp_ctx;
+               rte_spinlock_unlock(&bnxt_ulp_ctxt_lock);
+       }
+       return NULL;
+}
+
+void
+bnxt_ulp_cntxt_entry_release(void)
+{
+       rte_spinlock_unlock(&bnxt_ulp_ctxt_lock);
+}
+
+/* Function to get the app tunnel details from the ulp context. */
+struct bnxt_flow_app_tun_ent *
+bnxt_ulp_cntxt_ptr2_app_tun_list_get(struct bnxt_ulp_context *ulp)
+{
+       if (!ulp || !ulp->cfg_data)
+               return NULL;
+
+       return ulp->cfg_data->app_tun;
+}