From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id DDA21488F5; Fri, 10 Oct 2025 00:12:58 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 313FD409FA; Fri, 10 Oct 2025 00:12:23 +0200 (CEST) Received: from mail-pl1-f228.google.com (mail-pl1-f228.google.com [209.85.214.228]) by mails.dpdk.org (Postfix) with ESMTP id 8CD9F4065B for ; Fri, 10 Oct 2025 00:12:20 +0200 (CEST) Received: by mail-pl1-f228.google.com with SMTP id d9443c01a7336-27d69771e3eso9200615ad.3 for ; Thu, 09 Oct 2025 15:12:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1760047940; x=1760652740; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=wj/sSnMM5W6pCEhosYpxvZI8b1gfSWNN/dZledvFIc0=; b=dSDMTJ6PDoGA3q4q35RzNr2TKZRZgJpV0RH7jQWmGCuAFlZgTm4DFcrg08ld7hE6yo Oey3cJT4MOKceKnZ3pkDGFhs+pJ7o+8m1I1xVAe5dRujNwKKVREDfLfPnt/NoFNaK13U 0A5Ade1Bhe865Fhr69vaeLz8LxINAZ0IlBQOa+pNCHCiYhEgUodbt5thes2Z0knZKRTc Xnym+GyTvKNhDdWAxrUs5AFFHAJEqlID9l24EKFkerVUHFMgJsaDec00Io22lrfvhQuA EBEfmn7m7eXGy4Yw+xto4eXKLtaDmI+8fcau9sxvMHYJBECkUWAyc/VieIbXILJHaqIw neFg== X-Gm-Message-State: AOJu0YzshnpNESIE5IHOWt2FfTNQs3kwxf+F1rorIDe0ffDejo0CzEaQ v82+DMhbjLU1U8FO8/PdfpDLzZlLVf0eiwOB6iwDOQjQ+WXYBUAI00anaUhJFyLpXNay9jPuoMs 3DlZ/6RFqQ0YvEomwFneX486/UsTL0BQKBrvcmOedTkVtw4mBj/+F9m6ddYV8s+R+Zu1lCRkqoI 1UtbfHkjrV4Nmk0q1Zr1kDjIYzERFj4E7p9XhA9HvCXmTPWJGQ827BWL/dHUchmhoZLiLmGg== X-Gm-Gg: ASbGncshJ90fnq96pu/ZIQutRE0HW2m7N2ktFGhcVLPMueXuHWEomXo0TqBd1WQYfRs +68gqw2uYAlC48W9Hy+zcwNGDMA4sqJ7sTwSfdcwOhEKpcCBYr+6bkMC2yDDCbGm8UWpnAblAuC rkpI+dvu81PFcggfFh4sB80At9EJajPz3gYfJyvo8lGLqaWwpb6yZ85fPErzfjKrE5RLDP/8W2R /BWX3WjI7gISUepyTzGnlHcuGyYH0Yvo/oN9F1ZB1lG0IaIKxtV+QCODzd95Ps71VHiTqBGHBPC u9fNwfvug/nTV4RhOJA/SgVqpjpX8kPfyThcBpucsfdAHcJebhYqhZFZwfPGsWoiAWxHrlYZX2E 8Zhooq8/4N1aCjfyt/FOIK88FleF4XwKvIhFnHT03Wx3pBEZRzU1DyrLJcqeo/xmfYfY1JtyEco JEPrpp X-Google-Smtp-Source: AGHT+IFfA9/PmxzEJB53p0Vx7o0s4KmMuAwA4pSkvk1S8XwKqjjrRmYVZ58XU9D5ZPK/8p4qS0l0rdWdA4w4 X-Received: by 2002:a17:902:e841:b0:273:59ef:4c30 with SMTP id d9443c01a7336-2902723a7ffmr121604475ad.15.1760047939606; Thu, 09 Oct 2025 15:12:19 -0700 (PDT) Received: from smtp-us-east1-p01-i01-si01.dlp.protect.broadcom.com (address-144-49-247-72.dlp.protect.broadcom.com. [144.49.247.72]) by smtp-relay.gmail.com with ESMTPS id d9443c01a7336-29034f81c9csm3178595ad.66.2025.10.09.15.12.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Oct 2025 15:12:19 -0700 (PDT) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-qv1-f72.google.com with SMTP id 6a1803df08f44-803339f345bso63030806d6.2 for ; Thu, 09 Oct 2025 15:12:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1760047938; x=1760652738; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wj/sSnMM5W6pCEhosYpxvZI8b1gfSWNN/dZledvFIc0=; b=FkUFhwpj7O0KeVtDlGUpS6L7n70azmAGzBqIdBrciDUQPf4uFfXB3t75Lij4QUuXRB xytbpQqcWHJkbQnykuMl8MoJfjEQKuU2UJYcIgxDTeLaGbtMM1lWIjjhyYRE6tIipwwX mvpH9jejHynB3zt5qIGLpAbfpbvs5zyNk7HDY= X-Received: by 2002:a05:6214:d43:b0:787:bd9f:bab9 with SMTP id 6a1803df08f44-87b2f005707mr125620226d6.66.1760047938054; Thu, 09 Oct 2025 15:12:18 -0700 (PDT) X-Received: by 2002:a05:6214:d43:b0:787:bd9f:bab9 with SMTP id 6a1803df08f44-87b2f005707mr125619536d6.66.1760047937417; Thu, 09 Oct 2025 15:12:17 -0700 (PDT) Received: from KX3WTC9T54.dhcp.broadcom.net ([192.19.144.250]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-87bc3479344sm4189986d6.17.2025.10.09.15.12.16 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 09 Oct 2025 15:12:16 -0700 (PDT) From: Manish Kurup To: dev@dpdk.org Cc: ajit.khaparde@broadcom.com, Kishore Padmanabha , Peter Spreadborough , Shuanglin Wang Subject: [PATCH v2 11/54] net/bnxt/tf_core: fix vfr clean up and stats lockup Date: Thu, 9 Oct 2025 18:10:46 -0400 Message-Id: <20251009221129.28256-12-manish.kurup@broadcom.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20251009221129.28256-1-manish.kurup@broadcom.com> References: <20250930003604.87108-1-manish.kurup@broadcom.com> <20251009221129.28256-1-manish.kurup@broadcom.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-DetectorID-Processed: b00c1d49-9d2e-4205-b15f-d015386d3d5e X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Kishore Padmanabha 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 Reviewed-by: Peter Spreadborough Reviewed-by: Shuanglin Wang --- 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)