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 ED8C4A00C2 for ; Thu, 3 Nov 2022 10:28:48 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E94E540694; Thu, 3 Nov 2022 10:28:48 +0100 (CET) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mails.dpdk.org (Postfix) with ESMTP id 0C54640693 for ; Thu, 3 Nov 2022 10:28:47 +0100 (CET) Received: by mail-wr1-f49.google.com with SMTP id k8so1750390wrh.1 for ; Thu, 03 Nov 2022 02:28:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=bWCWgUt7O1ilTP4UGsyJz13eXr53317snYQpoHGYlpg=; b=oNuryuu6Y1q19J52UscxQHRfo745+Nd9v3hdtrMjqxoo5TaX5iSm74FHMShnirlxgp ofhxjFmi5XfL5yeKs7Ux5tOFN4CiHzBZCIXfzCZ4ja6a/Y1Aw6J/NRuu73A8/wjCwe2d 1l3JxysZJcgMVhfq6hDP41C0ZnCdXrrAylxgDw9kdiMavO7gGQYzItjq2qBVfFoesORu Mf0EOllYLvZyOKNqoNtMRcFv23PqlO5uAJAdfdMDD3gSbehHqyNSw0mn4iS0EFFfwKVy 7osjZmkaV4oDNE6g0BvI6uoxd0ZIkKryKpIa0Y/9IUW9/HEafohMbrs8PmVq/v+QUCCL GMQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bWCWgUt7O1ilTP4UGsyJz13eXr53317snYQpoHGYlpg=; b=AuF+JWlmmwMrKlCBs1HIRlcYlY/kS5x0qKQBjKS13IxFjkxQeb26X0ELaFSgWN9PLA F89Bwwb/RvhZ55YVHCgWaDWQqtJWFvH2OXCg3YdNI4GPPc0j9cQ8eHsCgfU3qcAzYtiY ruuyWpNkQUnSiX8omNhuk8dMATn510psWyGYNz17c+bCHRct3jSCf8lPBxgmFu8AD55a IEju2K9+1W0pkkkl6AXxp+lVOvfyuOvVaZRxS8iV+6+gb1LDSVtG7ePjdXmdXGKdd6cJ WSawRENsVhR6Kcu+DEWoizLoDC/rM91l1gU1D7lmaG4HkXel43lNfuwRmGvqG6T1Rs1j Cpgg== X-Gm-Message-State: ACrzQf2lMnXSW0Z8f+niVTIpdy1B/UMCn+aHoLEYwrS97knZSg9NGL7J uez5KU/v5V9x06vk7X/vSCZcRKzsc0JMSA== X-Google-Smtp-Source: AMsMyM5sWP7ZlDz3sdhGbr0twsSS5v2Z2slxARVZz48xlVYRrYKydk9t0M9YLp22ldyr4oub1X4AQw== X-Received: by 2002:a5d:530e:0:b0:236:e1b9:4a9 with SMTP id e14-20020a5d530e000000b00236e1b904a9mr9007997wrv.70.1667467726714; Thu, 03 Nov 2022 02:28:46 -0700 (PDT) Received: from localhost ([137.220.119.58]) by smtp.gmail.com with ESMTPSA id 15-20020a05600c228f00b003b49bd61b19sm4552982wmf.15.2022.11.03.02.28.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 02:28:44 -0700 (PDT) From: luca.boccassi@gmail.com To: Jiawen Wu Cc: dpdk stable Subject: patch 'net/txgbe: rename some extended statistics' has been queued to stable release 20.11.7 Date: Thu, 3 Nov 2022 09:26:32 +0000 Message-Id: <20221103092758.1099402-14-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221103092758.1099402-1-luca.boccassi@gmail.com> References: <20221103092758.1099402-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 20.11.7 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/05/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/12471540bf2a32764f306e4030b19a247e1f994a Thanks. Luca Boccassi --- >From 12471540bf2a32764f306e4030b19a247e1f994a 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 4e9a7deb12..e17f40b978 100644 --- a/drivers/net/txgbe/base/txgbe_type.h +++ b/drivers/net/txgbe/base/txgbe_type.h @@ -285,9 +285,9 @@ struct txgbe_hw_stats { u64 tx_management_packets; 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; u64 rx_error_bytes; @@ -295,7 +295,7 @@ struct txgbe_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/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c index 1a2c9ff976..c62ed02cfd 100644 --- a/drivers/net/txgbe/txgbe_ethdev.c +++ b/drivers/net/txgbe/txgbe_ethdev.c @@ -173,8 +173,10 @@ static const struct rte_txgbe_xstats_name_off rte_txgbe_stats_strings[] = { HW_XSTAT(rx_management_packets), 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), HW_XSTAT(rx_error_bytes), @@ -182,7 +184,7 @@ static const struct rte_txgbe_xstats_name_off rte_txgbe_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), @@ -1910,7 +1912,7 @@ txgbe_read_stats_registers(struct txgbe_hw *hw, hw_stats->rx_bytes += rd64(hw, TXGBE_DMARXOCTL); 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 */ hw_stats->rx_crc_errors += rd64(hw, TXGBE_MACRXERRCRCL); @@ -1942,7 +1944,7 @@ txgbe_read_stats_registers(struct txgbe_hw *hw, rd64(hw, TXGBE_MACTX1024TOMAXL); 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); /* MNG Stats */ @@ -2064,8 +2066,7 @@ txgbe_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->rx_drop_packets + + hw_stats->rx_rdb_drop + hw_stats->rx_illegal_byte_errors + hw_stats->rx_error_bytes + hw_stats->rx_fragment_errors + -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-03 09:27:26.326687690 +0000 +++ 0014-net-txgbe-rename-some-extended-statistics.patch 2022-11-03 09:27:25.317421357 +0000 @@ -1 +1 @@ -From d7494d6d530dc425b077d60b0035f99ee1741673 Mon Sep 17 00:00:00 2001 +From 12471540bf2a32764f306e4030b19a247e1f994a 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 4e9a7deb12..e17f40b978 100644 @@ -24 +25 @@ -@@ -356,9 +356,9 @@ struct txgbe_hw_stats { +@@ -285,9 +285,9 @@ struct txgbe_hw_stats { @@ -35 +36 @@ -@@ -366,7 +366,7 @@ struct txgbe_hw_stats { +@@ -295,7 +295,7 @@ struct txgbe_hw_stats { @@ -45 +46 @@ -index 0624568bdf..44224724da 100644 +index 1a2c9ff976..c62ed02cfd 100644 @@ -48 +49 @@ -@@ -183,8 +183,10 @@ static const struct rte_txgbe_xstats_name_off rte_txgbe_stats_strings[] = { +@@ -173,8 +173,10 @@ static const struct rte_txgbe_xstats_name_off rte_txgbe_stats_strings[] = { @@ -59 +60 @@ -@@ -192,7 +194,7 @@ static const struct rte_txgbe_xstats_name_off rte_txgbe_stats_strings[] = { +@@ -182,7 +184,7 @@ static const struct rte_txgbe_xstats_name_off rte_txgbe_stats_strings[] = { @@ -68 +69 @@ -@@ -2157,7 +2159,7 @@ txgbe_read_stats_registers(struct txgbe_hw *hw, +@@ -1910,7 +1912,7 @@ txgbe_read_stats_registers(struct txgbe_hw *hw, @@ -77 +78 @@ -@@ -2189,7 +2191,7 @@ txgbe_read_stats_registers(struct txgbe_hw *hw, +@@ -1942,7 +1944,7 @@ txgbe_read_stats_registers(struct txgbe_hw *hw, @@ -86 +87 @@ -@@ -2311,8 +2313,7 @@ txgbe_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) +@@ -2064,8 +2066,7 @@ txgbe_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)