From patchwork Fri Sep 2 03:00:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiawen Wu X-Patchwork-Id: 115767 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 491BAA0542; Fri, 2 Sep 2022 05:01:24 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B0AC842B72; Fri, 2 Sep 2022 05:01:02 +0200 (CEST) Received: from smtpbg.qq.com (smtpbgbr2.qq.com [54.207.22.56]) by mails.dpdk.org (Postfix) with ESMTP id DD08242905; Fri, 2 Sep 2022 05:00:58 +0200 (CEST) X-QQ-mid: bizesmtp70t1662087654tepkcmy2 Received: from wxdbg.localdomain.com ( [183.129.236.74]) by bizesmtp.qq.com (ESMTP) with id ; Fri, 02 Sep 2022 11:00:54 +0800 (CST) X-QQ-SSF: 01400000000000G0T000000A0000000 X-QQ-FEAT: NGMqyHdgFPZqCS0z2PNXX4doXELaub0YVRMf4GgE1HSaOv9wmwGrkMr73bkbV WT0TBkx0pXrvZTeCvWQCLYPHrsC4pd9PUQKq+C6/Iz9OdX7Ov4Z4YiYyAquGR3GoY/KmJlF vU2I51pmbp47OdxR5yLrAJdFf4Bth5X07Vnn/1EPC6lPuihSeN3DllBlZr6eNuKAv5kAKJM UvSPlImbkjjzt9UTs/3fmQrIOYZXTKi0vv8cbDUC9oqyUm+CAJkk0iIci7daxKuxMRNBIKd tgY/vYUwZbqzG+FIW+4DZmQV+R+YTCAv6yA+Dn3Hv0vHH7+JA+Ij0YHPpkv3tdUwv5m2ov+ ceyivJaPkEiEsIShShEjZZKqjdJz+mDyujhAH2e0mvE26FcbCkF4/n3UpXst3vdhyOyk61F X-QQ-GoodBg: 2 From: Jiawen Wu To: dev@dpdk.org Cc: Jiawen Wu , stable@dpdk.org Subject: [PATCH 5/9] net/ngbe: rename some extended statistic Date: Fri, 2 Sep 2022 11:00:07 +0800 Message-Id: <20220902030011.377523-6-jiawenwu@trustnetic.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220902030011.377523-1-jiawenwu@trustnetic.com> References: <20220902030011.377523-1-jiawenwu@trustnetic.com> MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:trustnetic.com:qybglogicsvr:qybglogicsvr5 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 Rename rx_oversize_errors to rx_oversize_cnt since it depends on giant packet size limit instead of MTU, by hardware design. Rename rx_drop_packets and tx_drop_packets to rx_dma_drop and tx_dma_drop to indicate the drop location. And add tx_dma_drop to extended statistics. Fixes: 8b433d04adc9 ("net/ngbe: support device xstats") Cc: stable@dpdk.org Signed-off-by: Jiawen Wu --- drivers/net/ngbe/base/ngbe_type.h | 5 ++--- drivers/net/ngbe/ngbe_ethdev.c | 10 +++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/net/ngbe/base/ngbe_type.h b/drivers/net/ngbe/base/ngbe_type.h index 4a6c273f1e..73111f7950 100644 --- a/drivers/net/ngbe/base/ngbe_type.h +++ b/drivers/net/ngbe/base/ngbe_type.h @@ -142,9 +142,8 @@ struct ngbe_hw_stats { u64 mng_bmc2host_packets; u64 mng_host2bmc_packets; /* Basix RxTx */ - u64 rx_drop_packets; - u64 tx_drop_packets; u64 rx_dma_drop; + u64 tx_dma_drop; u64 tx_secdrp_packets; u64 rx_packets; u64 tx_packets; @@ -170,7 +169,7 @@ struct ngbe_hw_stats { u64 rx_length_errors; u64 rx_undersize_errors; u64 rx_fragment_errors; - u64 rx_oversize_errors; + u64 rx_oversize_cnt; u64 rx_jabber_errors; u64 rx_l3_l4_xsum_error; u64 mac_local_errors; diff --git a/drivers/net/ngbe/ngbe_ethdev.c b/drivers/net/ngbe/ngbe_ethdev.c index 86c28099c4..df32bf64ff 100644 --- a/drivers/net/ngbe/ngbe_ethdev.c +++ b/drivers/net/ngbe/ngbe_ethdev.c @@ -165,6 +165,7 @@ static const struct rte_ngbe_xstats_name_off rte_ngbe_stats_strings[] = { HW_XSTAT(tx_management_packets), HW_XSTAT(rx_management_dropped), HW_XSTAT(rx_dma_drop), + HW_XSTAT(tx_dma_drop), HW_XSTAT(tx_secdrp_packets), /* Basic Error */ @@ -175,7 +176,7 @@ static const struct rte_ngbe_xstats_name_off rte_ngbe_stats_strings[] = { HW_XSTAT(rx_length_errors), HW_XSTAT(rx_undersize_errors), HW_XSTAT(rx_fragment_errors), - HW_XSTAT(rx_oversize_errors), + HW_XSTAT(rx_oversize_cnt), HW_XSTAT(rx_jabber_errors), HW_XSTAT(rx_l3_l4_xsum_error), HW_XSTAT(mac_local_errors), @@ -1374,9 +1375,8 @@ ngbe_read_stats_registers(struct ngbe_hw *hw, hw_stats->rx_xoff_packets += rd32(hw, NGBE_PBRXLNKXOFF); /* DMA Stats */ - hw_stats->rx_drop_packets += rd32(hw, NGBE_DMARXDROP); - hw_stats->tx_drop_packets += rd32(hw, NGBE_DMATXDROP); hw_stats->rx_dma_drop += rd32(hw, NGBE_DMARXDROP); + hw_stats->tx_dma_drop += rd32(hw, NGBE_DMATXDROP); hw_stats->tx_secdrp_packets += rd32(hw, NGBE_DMATXSECDROP); hw_stats->rx_packets += rd32(hw, NGBE_DMARXPKT); hw_stats->tx_packets += rd32(hw, NGBE_DMATXPKT); @@ -1413,7 +1413,7 @@ ngbe_read_stats_registers(struct ngbe_hw *hw, rd64(hw, NGBE_MACTX1024TOMAXL); hw_stats->rx_undersize_errors += rd64(hw, NGBE_MACRXERRLENL); - hw_stats->rx_oversize_errors += rd32(hw, NGBE_MACRXOVERSIZE); + hw_stats->rx_oversize_cnt += rd32(hw, NGBE_MACRXOVERSIZE); hw_stats->rx_jabber_errors += rd32(hw, NGBE_MACRXJABBER); /* MNG Stats */ @@ -1512,7 +1512,7 @@ ngbe_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) hw_stats->rx_mac_short_packet_dropped + hw_stats->rx_length_errors + hw_stats->rx_undersize_errors + - hw_stats->rx_oversize_errors + + hw_stats->rdb_drp_cnt + hw_stats->rx_illegal_byte_errors + hw_stats->rx_error_bytes + hw_stats->rx_fragment_errors;