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 8F306A054A for ; Tue, 25 Oct 2022 17:08:31 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8C0F942C48; Tue, 25 Oct 2022 17:08:31 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id B4B6042C4A for ; Tue, 25 Oct 2022 17:08:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666710509; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AbBZrXd3SS8tZXEIigc5Wd1N+6KFzXGG0O6xrjvl9Ng=; b=g1a+xlblaOPiO5+PxExAOkOJbkRZc5/+dpN/UVhi56MwQVwnXGW/xPfwSD4s9umsURpQva k/ltC/XIFxzbmIzn1td6v84el1OBrV0fR+F1bxGkioozdYFlZCTSDKGYU5SnovyW6z5FNM iKMdmOAOQxavjGJRAVYUqcOrE+gvyPY= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-630-1ot4ZCHxN1atsS4oS9yU0g-1; Tue, 25 Oct 2022 11:08:26 -0400 X-MC-Unique: 1ot4ZCHxN1atsS4oS9yU0g-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 34BEC185A7A8; Tue, 25 Oct 2022 15:08:24 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5E99B477F55; Tue, 25 Oct 2022 15:08:23 +0000 (UTC) From: Kevin Traynor To: Jiawen Wu Cc: dpdk stable Subject: patch 'net/txgbe: rename some extended statistics' has been queued to stable release 21.11.3 Date: Tue, 25 Oct 2022 16:06:13 +0100 Message-Id: <20221025150734.142189-18-ktraynor@redhat.com> In-Reply-To: <20221025150734.142189-1-ktraynor@redhat.com> References: <20221025150734.142189-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/01/22. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/8bdb992cea5c5625fa017610a0be4546cb0d3378 Thanks. Kevin --- >From 8bdb992cea5c5625fa017610a0be4546cb0d3378 Mon Sep 17 00:00:00 2001 From: Jiawen Wu Date: Fri, 2 Sep 2022 11:00:06 +0800 Subject: [PATCH] net/txgbe: rename some extended statistics [ upstream commit d7494d6d530dc425b077d60b0035f99ee1741673 ] 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 to rx_rdb_drop to indicate the drop location. And add rx_dma_drop to extended statistics. Fixes: 91fe49c87d76 ("net/txgbe: support device xstats") Signed-off-by: Jiawen Wu --- drivers/net/txgbe/base/txgbe_type.h | 4 ++-- drivers/net/txgbe/txgbe_ethdev.c | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/net/txgbe/base/txgbe_type.h b/drivers/net/txgbe/base/txgbe_type.h index d95467f9f8..7010372119 100644 --- a/drivers/net/txgbe/base/txgbe_type.h +++ b/drivers/net/txgbe/base/txgbe_type.h @@ -356,7 +356,7 @@ struct txgbe_hw_stats { u64 rx_management_dropped; u64 rx_dma_drop; - u64 rx_drop_packets; /* Basic Error */ + u64 rx_rdb_drop; u64 rx_crc_errors; u64 rx_illegal_byte_errors; @@ -366,5 +366,5 @@ struct txgbe_hw_stats { 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; diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c index 49948e62bc..c229736d85 100644 --- a/drivers/net/txgbe/txgbe_ethdev.c +++ b/drivers/net/txgbe/txgbe_ethdev.c @@ -184,6 +184,8 @@ static const struct rte_txgbe_xstats_name_off rte_txgbe_stats_strings[] = { HW_XSTAT(tx_management_packets), HW_XSTAT(rx_management_dropped), + HW_XSTAT(rx_dma_drop), /* Basic Error */ + HW_XSTAT(rx_rdb_drop), HW_XSTAT(rx_crc_errors), HW_XSTAT(rx_illegal_byte_errors), @@ -193,5 +195,5 @@ static const struct rte_txgbe_xstats_name_off rte_txgbe_stats_strings[] = { 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), @@ -2148,5 +2150,5 @@ txgbe_read_stats_registers(struct txgbe_hw *hw, hw_stats->tx_bytes += rd64(hw, TXGBE_DMATXOCTL); hw_stats->rx_dma_drop += rd32(hw, TXGBE_DMARXDROP); - hw_stats->rx_drop_packets += rd32(hw, TXGBE_PBRXDROP); + hw_stats->rx_rdb_drop += rd32(hw, TXGBE_PBRXDROP); /* MAC Stats */ @@ -2180,5 +2182,5 @@ txgbe_read_stats_registers(struct txgbe_hw *hw, hw_stats->rx_undersize_errors += rd64(hw, TXGBE_MACRXERRLENL); - hw_stats->rx_oversize_errors += rd32(hw, TXGBE_MACRXOVERSIZE); + hw_stats->rx_oversize_cnt += rd32(hw, TXGBE_MACRXOVERSIZE); hw_stats->rx_jabber_errors += rd32(hw, TXGBE_MACRXJABBER); @@ -2302,6 +2304,5 @@ txgbe_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) hw_stats->rx_length_errors + hw_stats->rx_undersize_errors + - hw_stats->rx_oversize_errors + - hw_stats->rx_drop_packets + + hw_stats->rx_rdb_drop + hw_stats->rx_illegal_byte_errors + hw_stats->rx_error_bytes + -- 2.37.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-10-25 14:18:58.972217415 +0100 +++ 0018-net-txgbe-rename-some-extended-statistics.patch 2022-10-25 14:18:58.371797948 +0100 @@ -1 +1 @@ -From d7494d6d530dc425b077d60b0035f99ee1741673 Mon Sep 17 00:00:00 2001 +From 8bdb992cea5c5625fa017610a0be4546cb0d3378 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d7494d6d530dc425b077d60b0035f99ee1741673 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 343279127f..c3486b472f 100644 +index d95467f9f8..7010372119 100644 @@ -24 +25 @@ -@@ -357,7 +357,7 @@ struct txgbe_hw_stats { +@@ -356,7 +356,7 @@ struct txgbe_hw_stats { @@ -33 +34 @@ -@@ -367,5 +367,5 @@ struct txgbe_hw_stats { +@@ -366,5 +366,5 @@ struct txgbe_hw_stats { @@ -41 +42 @@ -index 0624568bdf..44224724da 100644 +index 49948e62bc..c229736d85 100644 @@ -60 +61 @@ -@@ -2158,5 +2160,5 @@ txgbe_read_stats_registers(struct txgbe_hw *hw, +@@ -2148,5 +2150,5 @@ txgbe_read_stats_registers(struct txgbe_hw *hw, @@ -67 +68 @@ -@@ -2190,5 +2192,5 @@ txgbe_read_stats_registers(struct txgbe_hw *hw, +@@ -2180,5 +2182,5 @@ txgbe_read_stats_registers(struct txgbe_hw *hw, @@ -74 +75 @@ -@@ -2312,6 +2314,5 @@ txgbe_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) +@@ -2302,6 +2304,5 @@ txgbe_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)