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 D2D38A054A for ; Tue, 25 Oct 2022 17:08:32 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CEE8D42C4C; Tue, 25 Oct 2022 17:08:32 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 468D942C1D for ; Tue, 25 Oct 2022 17:08:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666710510; 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=6CVUEo+nbuWGrGCLZgpbFUgsY8cpdTAaiK/CJZehRh8=; b=bcsiltobOcp0+UoGTAaUpcOWoth2FNgCZDVS2BJBWUybC1iN9Kkif/63Cm5tjOTtGOmSgJ WN96e5oauXqoOFj846V/jyKrjf6fVIZ3gAr+NBpuo8nEiMLG9teVgBReyg8yI4ijLsiWQv AFyuat83OrSZpd+YVXFijKL6C/r0UDs= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-371-7M6XenNpPmesNx-lT8ShFg-1; Tue, 25 Oct 2022 11:08:25 -0400 X-MC-Unique: 7M6XenNpPmesNx-lT8ShFg-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 29B922999B56; Tue, 25 Oct 2022 15:08:25 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8348C477F55; Tue, 25 Oct 2022 15:08:24 +0000 (UTC) From: Kevin Traynor To: Jiawen Wu Cc: dpdk stable Subject: patch 'net/ngbe: rename some extended statistics' has been queued to stable release 21.11.3 Date: Tue, 25 Oct 2022 16:06:14 +0100 Message-Id: <20221025150734.142189-19-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/9f6bab86f3af235c1511ec192958060858a35fc6 Thanks. Kevin --- >From 9f6bab86f3af235c1511ec192958060858a35fc6 Mon Sep 17 00:00:00 2001 From: Jiawen Wu Date: Fri, 2 Sep 2022 11:00:07 +0800 Subject: [PATCH] net/ngbe: rename some extended statistics [ upstream commit fee9350f1d23ab9deeaf287be41212c9f0d85d5e ] 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") 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 4c995e7397..043da3cd25 100644 --- a/drivers/net/ngbe/base/ngbe_type.h +++ b/drivers/net/ngbe/base/ngbe_type.h @@ -137,7 +137,6 @@ struct ngbe_hw_stats { 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; @@ -165,5 +164,5 @@ struct ngbe_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/ngbe/ngbe_ethdev.c b/drivers/net/ngbe/ngbe_ethdev.c index b930326379..92eb36f5d4 100644 --- a/drivers/net/ngbe/ngbe_ethdev.c +++ b/drivers/net/ngbe/ngbe_ethdev.c @@ -166,4 +166,5 @@ static const struct rte_ngbe_xstats_name_off rte_ngbe_stats_strings[] = { HW_XSTAT(rx_management_dropped), HW_XSTAT(rx_dma_drop), + HW_XSTAT(tx_dma_drop), HW_XSTAT(tx_secdrp_packets), @@ -176,5 +177,5 @@ static const struct rte_ngbe_xstats_name_off rte_ngbe_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), @@ -1351,7 +1352,6 @@ ngbe_read_stats_registers(struct ngbe_hw *hw, /* 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); @@ -1390,5 +1390,5 @@ ngbe_read_stats_registers(struct ngbe_hw *hw, 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); @@ -1489,5 +1489,5 @@ ngbe_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->rdb_drp_cnt + 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.995243853 +0100 +++ 0019-net-ngbe-rename-some-extended-statistics.patch 2022-10-25 14:18:58.374797959 +0100 @@ -1 +1 @@ -From fee9350f1d23ab9deeaf287be41212c9f0d85d5e Mon Sep 17 00:00:00 2001 +From 9f6bab86f3af235c1511ec192958060858a35fc6 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit fee9350f1d23ab9deeaf287be41212c9f0d85d5e ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 4a6c273f1e..73111f7950 100644 +index 4c995e7397..043da3cd25 100644 @@ -25 +26 @@ -@@ -143,7 +143,6 @@ struct ngbe_hw_stats { +@@ -137,7 +137,6 @@ struct ngbe_hw_stats { @@ -34 +35 @@ -@@ -171,5 +170,5 @@ struct ngbe_hw_stats { +@@ -165,5 +164,5 @@ struct ngbe_hw_stats { @@ -42 +43 @@ -index 86c28099c4..df32bf64ff 100644 +index b930326379..92eb36f5d4 100644 @@ -58 +59 @@ -@@ -1375,7 +1376,6 @@ ngbe_read_stats_registers(struct ngbe_hw *hw, +@@ -1351,7 +1352,6 @@ ngbe_read_stats_registers(struct ngbe_hw *hw, @@ -67 +68 @@ -@@ -1414,5 +1414,5 @@ ngbe_read_stats_registers(struct ngbe_hw *hw, +@@ -1390,5 +1390,5 @@ ngbe_read_stats_registers(struct ngbe_hw *hw, @@ -74 +75 @@ -@@ -1513,5 +1513,5 @@ ngbe_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats) +@@ -1489,5 +1489,5 @@ ngbe_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)