From: Manish Kurup <manish.kurup@broadcom.com>
To: dev@dpdk.org
Cc: ajit.khaparde@broadcom.com,
Kishore Padmanabha <kishore.padmanabha@broadcom.com>,
Peter Spreadborough <peter.spreadborough@broadcom.com>,
Shuanglin Wang <shuanglin.wang@broadcom.com>
Subject: [PATCH 11/54] net/bnxt/tf_core: fix vfr clean up and stats lockup
Date: Mon, 29 Sep 2025 20:35:21 -0400 [thread overview]
Message-ID: <20250930003604.87108-12-manish.kurup@broadcom.com> (raw)
In-Reply-To: <20250930003604.87108-1-manish.kurup@broadcom.com>
From: Kishore Padmanabha <kishore.padmanabha@broadcom.com>
The representor flows were not being deleted as part of the
vfr clean up. Added code to delete flows related to vfr interface.
Also fixed the stats counter thread lockup.
Signed-off-by: Kishore Padmanabha <kishore.padmanabha@broadcom.com>
Reviewed-by: Peter Spreadborough <peter.spreadborough@broadcom.com>
Reviewed-by: Shuanglin Wang <shuanglin.wang@broadcom.com>
---
drivers/net/bnxt/bnxt_reps.c | 31 ++++++++++++++++++++++++----
drivers/net/bnxt/tf_core/v3/tfc_em.c | 5 +++--
drivers/net/bnxt/tf_core/v3/tfo.c | 1 +
drivers/net/bnxt/tf_ulp/ulp_sc_mgr.c | 29 ++++++++++++++++----------
drivers/net/bnxt/tf_ulp/ulp_sc_mgr.h | 2 +-
5 files changed, 50 insertions(+), 18 deletions(-)
diff --git a/drivers/net/bnxt/bnxt_reps.c b/drivers/net/bnxt/bnxt_reps.c
index 20a0ba65a5..f32b55b1ee 100644
--- a/drivers/net/bnxt/bnxt_reps.c
+++ b/drivers/net/bnxt/bnxt_reps.c
@@ -502,12 +502,33 @@ int bnxt_rep_dev_start_op(struct rte_eth_dev *eth_dev)
return 0;
}
+static int bnxt_tf_vfr_flush_flows(struct bnxt_representor *vfr_bp)
+{
+ struct bnxt *parent_bp = vfr_bp->parent_dev->data->dev_private;
+ uint16_t func_id;
+
+ /* it is assumed that port is either TVF or PF */
+ if (unlikely(ulp_port_db_port_func_id_get(parent_bp->ulp_ctx,
+ vfr_bp->dpdk_port_id,
+ &func_id))) {
+ BNXT_DRV_DBG(ERR, "Invalid argument\n");
+ return -EINVAL;
+ }
+ return ulp_flow_db_function_flow_flush(parent_bp->ulp_ctx, func_id);
+}
+
static int bnxt_tf_vfr_free(struct bnxt_representor *vfr)
{
struct bnxt *parent_bp;
int32_t rc;
PMD_DRV_LOG_LINE(DEBUG, "BNXT Port:%d VFR ulp free", vfr->dpdk_port_id);
+ rc = bnxt_tf_vfr_flush_flows(vfr);
+ if (rc)
+ PMD_DRV_LOG_LINE(ERR,
+ "Failed to delete rules from Port:%d VFR",
+ vfr->dpdk_port_id);
+
rc = bnxt_ulp_delete_vfr_default_rules(vfr);
if (rc)
PMD_DRV_LOG_LINE(ERR,
@@ -603,15 +624,17 @@ int bnxt_rep_dev_info_get_op(struct rte_eth_dev *eth_dev,
struct bnxt *parent_bp;
unsigned int max_rx_rings;
+ /* Need be an error scenario, if parent is removed first */
+ if (eth_dev->device->driver == NULL)
+ return -ENODEV;
+
/* MAC Specifics */
if (!bnxt_rep_check_parent(rep_bp)) {
- PMD_DRV_LOG_LINE(INFO, "Rep parent port does not exist");
- /* Need be an error scenario, if parent is removed first */
- if (eth_dev->device->driver == NULL)
- return -ENODEV;
+ PMD_DRV_LOG_LINE(INFO, "Rep parent port does not exist.");
/* Need not be an error scenario, if parent is closed first */
return 0;
}
+
parent_bp = rep_bp->parent_dev->data->dev_private;
PMD_DRV_LOG_LINE(DEBUG, "Representor dev_info_get_op");
dev_info->max_mac_addrs = parent_bp->max_l2_ctx;
diff --git a/drivers/net/bnxt/tf_core/v3/tfc_em.c b/drivers/net/bnxt/tf_core/v3/tfc_em.c
index feb6e899f6..8264f9a05d 100644
--- a/drivers/net/bnxt/tf_core/v3/tfc_em.c
+++ b/drivers/net/bnxt/tf_core/v3/tfc_em.c
@@ -936,8 +936,9 @@ int tfc_mpc_batch_end(struct tfc *tfcp,
tfo_mpcinfo_get(tfcp->tfo, &mpc_info);
- if (unlikely(mpc_info->mpcops == NULL)) {
- PMD_DRV_LOG_LINE(ERR, "MPC not initialized");
+ if (unlikely(mpc_info == NULL || mpc_info->mpcops == NULL)) {
+ PMD_DRV_LOG_LINE(ERR, "%s: MPC not initialized",
+ __func__);
return -EINVAL;
}
diff --git a/drivers/net/bnxt/tf_core/v3/tfo.c b/drivers/net/bnxt/tf_core/v3/tfo.c
index bee813ebf6..f4ee81aefd 100644
--- a/drivers/net/bnxt/tf_core/v3/tfo.c
+++ b/drivers/net/bnxt/tf_core/v3/tfo.c
@@ -157,6 +157,7 @@ int tfo_mpcinfo_get(void *tfo, struct cfa_bld_mpcinfo **mpc_info)
{
struct tfc_object *tfco = (struct tfc_object *)tfo;
+ *mpc_info = NULL;
if (tfo == NULL) {
PMD_DRV_LOG_LINE(ERR, "Invalid tfo pointer");
return -EINVAL;
diff --git a/drivers/net/bnxt/tf_ulp/ulp_sc_mgr.c b/drivers/net/bnxt/tf_ulp/ulp_sc_mgr.c
index 753c19b055..6b6733133a 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_sc_mgr.c
+++ b/drivers/net/bnxt/tf_ulp/ulp_sc_mgr.c
@@ -158,9 +158,11 @@ ulp_sc_mgr_deinit(struct bnxt_ulp_context *ctxt)
if (!ulp_sc_info)
return -EINVAL;
- rte_free(ulp_sc_info->stats_cache_tbl);
+ if (ulp_sc_info->stats_cache_tbl)
+ rte_free(ulp_sc_info->stats_cache_tbl);
- rte_free(ulp_sc_info->read_data);
+ if (ulp_sc_info->read_data)
+ rte_free(ulp_sc_info->read_data);
rte_free(ulp_sc_info);
@@ -186,9 +188,14 @@ static uint32_t ulp_stats_cache_main_loop(void *arg)
uint32_t batch_size;
struct tfc *tfcp = NULL;
uint32_t batch, stat_cnt;
+ int oldstate;
+ int oldtype;
uint8_t *data;
int rc;
+ pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &oldstate);
+ pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, &oldtype);
+
while (true) {
ctxt = NULL;
while (!ctxt) {
@@ -222,7 +229,6 @@ static uint32_t ulp_stats_cache_main_loop(void *arg)
if (bnxt_ulp_cntxt_acquire_fdb_lock(ctxt))
break;
- batch_info.enabled = false;
rc = tfc_mpc_batch_start(&batch_info);
if (unlikely(rc)) {
PMD_DRV_LOG_LINE(ERR,
@@ -250,12 +256,12 @@ static uint32_t ulp_stats_cache_main_loop(void *arg)
(uint64_t)sce;
rc = sc_ops->ulp_stats_cache_update(tfcp,
- sce->dir,
- &ulp_sc_info->read_data_iova[batch],
- sce->handle,
- &words,
- &batch_info,
- sce->reset);
+ sce->dir,
+ data,
+ sce->handle,
+ &words,
+ &batch_info,
+ sce->reset);
if (unlikely(rc)) {
/* Abort this batch */
PMD_DRV_LOG_LINE(ERR,
@@ -278,7 +284,8 @@ static uint32_t ulp_stats_cache_main_loop(void *arg)
bnxt_ulp_cntxt_release_fdb_lock(ctxt);
if (unlikely(rc)) {
- PMD_DRV_LOG_LINE(ERR, "MPC batch end failed rc:%d", rc);
+ PMD_DRV_LOG_LINE(ERR,
+ "MPC batch end failed rc:%d", rc);
batch_info.enabled = false;
break;
}
@@ -306,7 +313,7 @@ static uint32_t ulp_stats_cache_main_loop(void *arg)
}
terminate:
- PMD_DRV_LOG_LINE(DEBUG, "Terminating the stats cachce thread");
+ PMD_DRV_LOG_LINE(ERR, "Terminating the stats cachce thread");
return 0;
}
diff --git a/drivers/net/bnxt/tf_ulp/ulp_sc_mgr.h b/drivers/net/bnxt/tf_ulp/ulp_sc_mgr.h
index 5501dc18fd..29d0b0a1a4 100644
--- a/drivers/net/bnxt/tf_ulp/ulp_sc_mgr.h
+++ b/drivers/net/bnxt/tf_ulp/ulp_sc_mgr.h
@@ -36,7 +36,7 @@ struct ulp_sc_tfc_stats_cache_entry {
struct bnxt_ulp_sc_info {
struct ulp_sc_tfc_stats_cache_entry *stats_cache_tbl;
uint8_t *read_data;
- uint64_t read_data_iova[ULP_SC_BATCH_SIZE];
+ uint64_t read_data_iova[ULP_SC_BATCH_SIZE];
uint32_t flags;
uint32_t num_entries;
uint32_t num_counters;
--
2.39.5 (Apple Git-154)
next prev parent reply other threads:[~2025-09-30 7:06 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-30 0:35 [PATCH 00/54] bnxt patchset Manish Kurup
2025-09-30 0:35 ` [PATCH 01/54] net/bnxt/tf_ulp: add bnxt app data for 25.11 Manish Kurup
2025-09-30 0:35 ` [PATCH 02/54] net/bnxt: fix a NULL pointer dereference in bnxt_rep funcs Manish Kurup
2025-09-30 0:35 ` [PATCH 03/54] net/bnxt: enable vector mode processing Manish Kurup
2025-09-30 0:35 ` [PATCH 04/54] net/bnxt/tf_ulp: add meter stats support for Thor2 Manish Kurup
2025-09-30 0:35 ` [PATCH 05/54] net/bnxt/tf_core: dynamic UPAR support for THOR2 Manish Kurup
2025-09-30 0:35 ` [PATCH 06/54] net/bnxt/tf_core: fix the miscalculation of the lkup table pool Manish Kurup
2025-09-30 0:35 ` [PATCH 07/54] net/bnxt/tf_core: thor2 TF table scope sizing adjustments Manish Kurup
2025-09-30 0:35 ` [PATCH 08/54] net/bnxt/tf_ulp: add support for global identifiers Manish Kurup
2025-09-30 0:35 ` [PATCH 09/54] net/bnxt/tf_core: add support for multi instance Manish Kurup
2025-09-30 0:35 ` [PATCH 10/54] net/bnxt/tf_core: fix table scope free Manish Kurup
2025-09-30 0:35 ` Manish Kurup [this message]
2025-09-30 0:35 ` [PATCH 12/54] net/bnxt/tf_ulp: add support for special vxlan Manish Kurup
2025-09-30 0:35 ` [PATCH 13/54] net/bnxt/tf_ulp: increase shared pool size to 32 Manish Kurup
2025-09-30 0:35 ` [PATCH 14/54] next/bnxt/tf_ulp: truflow fixes for meter and mac_addr cache Manish Kurup
2025-09-30 0:35 ` [PATCH 15/54] net/bnxt/tf_ulp: add support for tcam priority update Manish Kurup
2025-09-30 0:35 ` [PATCH 16/54] net/bnxt/tf_ulp: hot upgrade support Manish Kurup
2025-09-30 0:35 ` [PATCH 17/54] net/bnxt/tf_core: tcam manager logical id free Manish Kurup
2025-09-30 0:35 ` [PATCH 18/54] net/bnxt/tf_ulp: fix stats counter memory initialization Manish Kurup
2025-09-30 0:35 ` [PATCH 19/54] net/bnxt: fix max VFs count for thor2 Manish Kurup
2025-09-30 0:35 ` [PATCH 20/54] net/bnxt/tf_ulp: ovs-dpdk packet drop observed with thor2 Manish Kurup
2025-09-30 0:35 ` [PATCH 21/54] net/bnxt/tf_ulp: fix seg fault when devargs argument missing Manish Kurup
2025-09-30 0:35 ` [PATCH 22/54] net/bnxt: fix default rss config Manish Kurup
2025-09-30 0:35 ` [PATCH 23/54] net/bnxt/tf_ulp: enable support for global index table Manish Kurup
2025-09-30 0:35 ` [PATCH 24/54] net/bnxt/tf_core: fix build failure with flow scale option Manish Kurup
2025-09-30 0:35 ` [PATCH 25/54] net/bnxt: truflow remove redundant code for mpc init Manish Kurup
2025-09-30 0:35 ` [PATCH 26/54] net/bnxt/tf_ulp: optimize template enums Manish Kurup
2025-09-30 0:35 ` [PATCH 27/54] net/bnxt/tf_core: thor2 hot upgrade ungraceful quit crash Manish Kurup
2025-09-30 0:35 ` [PATCH 28/54] net/bnxt/tf_ulp: support MPLS packets Manish Kurup
2025-09-30 0:35 ` [PATCH 29/54] net/bnxt/tf_core: add backing store debug to dpdk Manish Kurup
2025-09-30 0:35 ` [PATCH 30/54] net/bnxt/tf_core: truflow global table scope Manish Kurup
2025-09-30 0:35 ` [PATCH 31/54] net/bnxt/tf_ulp: ulp parser support to handle gre key Manish Kurup
2025-09-30 0:35 ` [PATCH 32/54] net/bnxt/tf_core: handle out of order MPC completions Manish Kurup
2025-09-30 0:35 ` [PATCH 33/54] net/bnxt/tf_ulp: socket direct enable Manish Kurup
2025-09-30 0:35 ` [PATCH 34/54] net/bnxt: fix adding udp_tunnel_port Manish Kurup
2025-09-30 0:35 ` [PATCH 35/54] net/bnxt/tf_ulp: add non vfr mode capability Manish Kurup
2025-09-30 0:35 ` [PATCH 36/54] net/bnxt: avoid iova range check when external memory is used Manish Kurup
2025-09-30 0:35 ` [PATCH 37/54] net/bnxt: avoid potential segfault in VFR handling Manish Kurup
2025-09-30 0:35 ` [PATCH 38/54] net/bnxt/tf_ulp: change rte_mem_virt2iova to rte_mem_virt2phys Manish Kurup
2025-09-30 0:35 ` [PATCH 39/54] net/bnxt: thor2 truflow memory manager bug Manish Kurup
2025-09-30 0:35 ` [PATCH 40/54] net/bnxt: fix stats collection when rx queue is not set Manish Kurup
2025-09-30 0:35 ` [PATCH 41/54] net/bnxt: fix rss configuration when set to none Manish Kurup
2025-09-30 0:35 ` [PATCH 42/54] net/bnxt: packet drop after port stop and start Manish Kurup
2025-09-30 0:35 ` [PATCH 43/54] net/bnxt/tf_core: fix truflow crash on memory allocation failure Manish Kurup
2025-09-30 0:35 ` [PATCH 44/54] net/bnxt: truflow remove RTE devarg processing for mpc=1 Manish Kurup
2025-09-30 0:35 ` [PATCH 45/54] net/bnxt: add meson build options for TruFlow Manish Kurup
2025-09-30 0:35 ` [PATCH 46/54] net/bnxt: truflow HSI struct fixes Manish Kurup
2025-09-30 0:35 ` [PATCH 47/54] net/bnxt/tf_ulp: truflow add pf action handler Manish Kurup
2025-09-30 0:35 ` [PATCH 48/54] net/bnxt/tf_ulp: add support for unicast only feature Manish Kurup
2025-09-30 0:35 ` [PATCH 49/54] net/bnxt/tf_core: remove excessive debug logging Manish Kurup
2025-09-30 0:36 ` [PATCH 50/54] net/bnxt/tf_core: fix truflow PF init failure on sriov disabled Manish Kurup
2025-09-30 0:36 ` [PATCH 51/54] net/bnxt/tf_ulp: fixes to enable TF functionality Manish Kurup
2025-09-30 0:36 ` [PATCH 52/54] net/bnxt/tf_ulp: add feature bit rx miss handling Manish Kurup
2025-09-30 0:36 ` [PATCH 53/54] net/bnxt: add support for truflow promiscuous mode Manish Kurup
2025-09-30 0:36 ` [PATCH 54/54] net/bnxt/tf_ulp: remove Truflow DEBUG code Manish Kurup
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250930003604.87108-12-manish.kurup@broadcom.com \
--to=manish.kurup@broadcom.com \
--cc=ajit.khaparde@broadcom.com \
--cc=dev@dpdk.org \
--cc=kishore.padmanabha@broadcom.com \
--cc=peter.spreadborough@broadcom.com \
--cc=shuanglin.wang@broadcom.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).