From patchwork Fri May 6 13:18:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rahul Lakkireddy X-Patchwork-Id: 110774 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id C4D00A0503; Fri, 6 May 2022 15:18:58 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B392040395; Fri, 6 May 2022 15:18:58 +0200 (CEST) Received: from stargate.chelsio.com (stargate.chelsio.com [12.32.117.8]) by mails.dpdk.org (Postfix) with ESMTP id 45D874014F for ; Fri, 6 May 2022 15:18:57 +0200 (CEST) Received: from localhost (sreekanth.asicdesigners.com [10.193.177.149] (may be forged)) by stargate.chelsio.com (8.14.7/8.14.7) with ESMTP id 246DIs7L019087 for ; Fri, 6 May 2022 06:18:55 -0700 From: Rahul Lakkireddy To: dev@dpdk.org Subject: [PATCH v2] net/cxgbe: track packets dropped by TP due to congestion Date: Fri, 6 May 2022 18:48:46 +0530 Message-Id: <61ae717665c2f4e38712652bec2f9d0fe5ca7d32.1651842841.git.rahul.lakkireddy@chelsio.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <323a4fe735f784ec49c6c93b18a2b21cde1d05c3.1650297776.git.rahul.lakkireddy@chelsio.com> References: <323a4fe735f784ec49c6c93b18a2b21cde1d05c3.1650297776.git.rahul.lakkireddy@chelsio.com> MIME-Version: 1.0 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 Transport Processor (TP) on the NIC delivers the incoming packets from the wire to NIC's DMA engine to place the packets in Rx buffers. TP sends signal towards the Multi-Port Switch (MPS) near the MAC when the Rxqs run out of Rx buffers posted by driver. These MPS buffer drop stats are already accounted for in imissed counters. However, if a large number of Rxqs run out of Rx buffers simultaneously, then the TP can start dropping packets by itself when there is heavy congestion on the channel and hence could not inform to the MPS. So, track these packets dropped by TP in imissed counters. Also add xstats for these counters. Signed-off-by: Rahul Lakkireddy --- v2: - Update commit message with more info about the TP counters. drivers/net/cxgbe/base/common.h | 2 ++ drivers/net/cxgbe/base/t4_hw.c | 14 ++++++++++++-- drivers/net/cxgbe/base/t4_regs.h | 4 ++++ drivers/net/cxgbe/cxgbe_ethdev.c | 11 +++++++++++ 4 files changed, 29 insertions(+), 2 deletions(-) diff --git a/drivers/net/cxgbe/base/common.h b/drivers/net/cxgbe/base/common.h index 980d78e4a4..4482ddbf56 100644 --- a/drivers/net/cxgbe/base/common.h +++ b/drivers/net/cxgbe/base/common.h @@ -101,6 +101,8 @@ struct port_stats { u64 rx_trunc1; /* buffer-group 1 truncated packets */ u64 rx_trunc2; /* buffer-group 2 truncated packets */ u64 rx_trunc3; /* buffer-group 3 truncated packets */ + + u64 rx_tp_tnl_cong_drops[NCHAN]; /* TP frame drops due to congestion */ }; struct sge_params { diff --git a/drivers/net/cxgbe/base/t4_hw.c b/drivers/net/cxgbe/base/t4_hw.c index 84c4316e68..384080e6d3 100644 --- a/drivers/net/cxgbe/base/t4_hw.c +++ b/drivers/net/cxgbe/base/t4_hw.c @@ -3040,8 +3040,10 @@ unsigned int t4_get_tp_ch_map(struct adapter *adapter, unsigned int pidx) */ void t4_get_port_stats(struct adapter *adap, int idx, struct port_stats *p) { - u32 bgmap = t4_get_mps_bg_map(adap, idx); u32 stat_ctl = t4_read_reg(adap, A_MPS_STAT_CTL); + u32 bgmap = t4_get_mps_bg_map(adap, idx); + u32 val[NCHAN] = { 0 }; + u8 i; #define GET_STAT(name) \ t4_read_reg64(adap, \ @@ -3129,6 +3131,11 @@ void t4_get_port_stats(struct adapter *adap, int idx, struct port_stats *p) p->rx_trunc2 = (bgmap & 4) ? GET_STAT_COM(RX_BG_2_MAC_TRUNC_FRAME) : 0; p->rx_trunc3 = (bgmap & 8) ? GET_STAT_COM(RX_BG_3_MAC_TRUNC_FRAME) : 0; + t4_read_indirect(adap, A_TP_MIB_INDEX, A_TP_MIB_DATA, &val[idx], 1, + A_TP_MIB_TNL_CNG_DROP_0 + idx); + + for (i = 0; i < NCHAN; i++) + p->rx_tp_tnl_cong_drops[i] = val[i]; #undef GET_STAT #undef GET_STAT_COM } @@ -3163,9 +3170,10 @@ void t4_get_port_stats_offset(struct adapter *adap, int idx, */ void t4_clr_port_stats(struct adapter *adap, int idx) { - unsigned int i; u32 bgmap = t4_get_mps_bg_map(adap, idx); u32 port_base_addr; + unsigned int i; + u32 val = 0; if (is_t4(adap->params.chip)) port_base_addr = PORT_BASE(idx); @@ -3187,6 +3195,8 @@ void t4_clr_port_stats(struct adapter *adap, int idx) A_MPS_STAT_RX_BG_0_MAC_TRUNC_FRAME_L + i * 8, 0); } + t4_write_indirect(adap, A_TP_MIB_INDEX, A_TP_MIB_DATA, + &val, 1, A_TP_MIB_TNL_CNG_DROP_0 + idx); } /** diff --git a/drivers/net/cxgbe/base/t4_regs.h b/drivers/net/cxgbe/base/t4_regs.h index 8a14d09a15..ff60dc1bb3 100644 --- a/drivers/net/cxgbe/base/t4_regs.h +++ b/drivers/net/cxgbe/base/t4_regs.h @@ -525,6 +525,8 @@ #define A_TP_PIO_ADDR 0x7e40 #define A_TP_PIO_DATA 0x7e44 +#define A_TP_MIB_INDEX 0x7e50 +#define A_TP_MIB_DATA 0x7e54 #define A_TP_RSS_SECRET_KEY0 0x40 @@ -587,6 +589,8 @@ #define S_RM_OVLAN 9 #define V_RM_OVLAN(x) ((x) << S_RM_OVLAN) +#define A_TP_MIB_TNL_CNG_DROP_0 0x18 + /* registers for module MA */ #define A_MA_EDRAM0_BAR 0x77c0 diff --git a/drivers/net/cxgbe/cxgbe_ethdev.c b/drivers/net/cxgbe/cxgbe_ethdev.c index e7ea76180f..cf9a2fdc19 100644 --- a/drivers/net/cxgbe/cxgbe_ethdev.c +++ b/drivers/net/cxgbe/cxgbe_ethdev.c @@ -709,6 +709,9 @@ static int cxgbe_dev_stats_get(struct rte_eth_dev *eth_dev, ps.rx_ovflow2 + ps.rx_ovflow3 + ps.rx_trunc0 + ps.rx_trunc1 + ps.rx_trunc2 + ps.rx_trunc3; + for (i = 0; i < NCHAN; i++) + eth_stats->imissed += ps.rx_tp_tnl_cong_drops[i]; + eth_stats->ierrors = ps.rx_symbol_err + ps.rx_fcs_err + ps.rx_jabber + ps.rx_too_long + ps.rx_runt + ps.rx_len_err; @@ -851,6 +854,14 @@ static const struct cxgbe_dev_xstats_name_off cxgbe_dev_port_stats_strings[] = { {"rx_bg1_truncated_packets", offsetof(struct port_stats, rx_trunc1)}, {"rx_bg2_truncated_packets", offsetof(struct port_stats, rx_trunc2)}, {"rx_bg3_truncated_packets", offsetof(struct port_stats, rx_trunc3)}, + {"rx_tp_tnl_cong_drops0", + offsetof(struct port_stats, rx_tp_tnl_cong_drops[0])}, + {"rx_tp_tnl_cong_drops1", + offsetof(struct port_stats, rx_tp_tnl_cong_drops[1])}, + {"rx_tp_tnl_cong_drops2", + offsetof(struct port_stats, rx_tp_tnl_cong_drops[2])}, + {"rx_tp_tnl_cong_drops3", + offsetof(struct port_stats, rx_tp_tnl_cong_drops[3])}, }; static const struct cxgbe_dev_xstats_name_off