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 1BE7CA0540 for ; Thu, 7 Jul 2022 09:56:35 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 15A2140A7B; Thu, 7 Jul 2022 09:56:35 +0200 (CEST) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id F0AD6406B4 for ; Thu, 7 Jul 2022 09:56:33 +0200 (CEST) Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 983C73F1FD for ; Thu, 7 Jul 2022 07:56:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657180592; bh=NBsRFVxAS+m06aYMcev7Jj/mBlthBVbjQuaMp7yjQLg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=d3bo/sAXY8YAx+m9kX84tZ0EKQURj+LLuGmLGhhA9l7XgKAQy3BoL9Lguv5BXBIh0 DDXd/qytr6n1SlZdYj8zyWJ9gdyM851sz1nmZ15ctZiPhVlnczU5ldqWcohU7b6bI7 8eMLjqwAIXJxF0BzH5ABbfQkKMq7glr/MKOk1hrG0rIcBOYHQEUy/bzczF12WuTpnR jEUSrfG+YDT2Q/pCNC+pEOF74feDas2dx8DN2MJIX5EYTvljTgagyDNYp194zUOJgZ 0k76FPwwh86gc+o0senEDuMXCHNda6o0WpKvzb8RmRJs4I4RfaDROEsKZSRjo38MRI c4Fz3ULrl33Sw== Received: by mail-ed1-f70.google.com with SMTP id s1-20020a056402520100b00439658fad14so13623350edd.20 for ; Thu, 07 Jul 2022 00:56:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NBsRFVxAS+m06aYMcev7Jj/mBlthBVbjQuaMp7yjQLg=; b=B3bS0m/r0xPYCraXKUtKTR149DVUSUiO4gz/EI7PgbwV4uMHcC4rnE7E3dltdOVcx7 bw8sylkZqNWa2uHlN8vrmcRaMjgvOOap6IZAXIJn8kyHokVXywiN6VA8g8/87IxnO7T5 iOoW9GIKN6Nb8G49Y750FovBDJ+KGpHTWGaCZy19cHAi9GEg1PjcLqAbvR+kNnnbD289 pmyufYTHQ+YfTz0QX2P80XhBsBbOELnhg3deqhENeNt9cyROmrEdObHyWNcp8NQbTkak HWrfR0xjPY/QAsGbStGBMdGPQzgf9c9TVj7IBitGnd30dfqgcwJy2aoHUOSxebVS+G+z tynw== X-Gm-Message-State: AJIora9TaKrw5OnFY830GeDyxtPwERykKJayp/ZEVxAj22IlIC8AIuRu 8LYiLmGGOdkPxAOg74gNwyupPXM65vpFRWxe63mOcq5OokhoTFwUSI+sUQEzAvYUZfE6Wc2PRr4 t0+jCLVuQvr4mQj4rAmsm+BZj X-Received: by 2002:a17:906:9b8a:b0:722:e50e:2a6d with SMTP id dd10-20020a1709069b8a00b00722e50e2a6dmr44507475ejc.724.1657180592392; Thu, 07 Jul 2022 00:56:32 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sI5mnNaWIzwXe38ceRF3/yYrL1pA3kF5wlub//xQCjtnnBI/E4jd/l9sc0UyOdmfqU+I8CVA== X-Received: by 2002:a17:906:9b8a:b0:722:e50e:2a6d with SMTP id dd10-20020a1709069b8a00b00722e50e2a6dmr44507453ejc.724.1657180592169; Thu, 07 Jul 2022 00:56:32 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2a02:6d40:3a4f:7b00:c19b:938e:7c97:afe2]) by smtp.gmail.com with ESMTPSA id s16-20020a170906455000b00722bc0aa9e3sm12194041ejq.162.2022.07.07.00.56.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jul 2022 00:56:31 -0700 (PDT) From: christian.ehrhardt@canonical.com To: "Min Hu (Connor)" Cc: Aman Singh , dpdk stable Subject: patch 'app/testpmd: check statistics query before printing' has been queued to stable release 19.11.13 Date: Thu, 7 Jul 2022 09:54:16 +0200 Message-Id: <20220707075522.194223-21-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220707075522.194223-1-christian.ehrhardt@canonical.com> References: <20220707075522.194223-1-christian.ehrhardt@canonical.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 19.11.13 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/09/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/ee3e5f1825a67f387d455cbd91f803d44502bf0c Thanks. Christian Ehrhardt --- >From ee3e5f1825a67f387d455cbd91f803d44502bf0c Mon Sep 17 00:00:00 2001 From: "Min Hu (Connor)" Date: Wed, 6 Apr 2022 16:45:36 +0800 Subject: [PATCH] app/testpmd: check statistics query before printing [ upstream commit baef6bbfad1b9596c7051f5c1fcc308310296342 ] In function 'fwd_stats_display', if function 'rte_eth_stats_get' fails, 'stats' is uncertainty value. The display result will be abnormal. This patch check the return value of 'rte_eth_stats_get' to avoid display abnormal stats. Fixes: 53324971a14e ("app/testpmd: display/clear forwarding stats on demand") Signed-off-by: Min Hu (Connor) Acked-by: Aman Singh --- app/test-pmd/config.c | 10 ++++++++-- app/test-pmd/testpmd.c | 16 ++++++++++++++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index 7d826632dc..3eefc90bf4 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -141,14 +141,20 @@ nic_stats_display(portid_t port_id) struct rte_eth_stats stats; struct rte_port *port = &ports[port_id]; uint8_t i; - static const char *nic_stats_border = "########################"; + int ret; if (port_id_is_invalid(port_id, ENABLED_WARN)) { print_valid_ports(); return; } - rte_eth_stats_get(port_id, &stats); + ret = rte_eth_stats_get(port_id, &stats); + if (ret != 0) { + fprintf(stderr, + "%s: Error: failed to get stats (port %u): %d", + __func__, port_id, ret); + return; + } printf("\n %s NIC statistics for port %-2d %s\n", nic_stats_border, port_id, nic_stats_border); diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index 2a182eda20..cb59c85c83 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -1705,6 +1705,7 @@ fwd_stats_display(void) struct rte_port *port; streamid_t sm_id; portid_t pt_id; + int ret; int i; memset(ports_stats, 0, sizeof(ports_stats)); @@ -1737,7 +1738,13 @@ fwd_stats_display(void) pt_id = fwd_ports_ids[i]; port = &ports[pt_id]; - rte_eth_stats_get(pt_id, &stats); + ret = rte_eth_stats_get(pt_id, &stats); + if (ret != 0) { + fprintf(stderr, + "%s: Error: failed to get stats (port %u): %d", + __func__, pt_id, ret); + continue; + } stats.ipackets -= port->stats.ipackets; stats.opackets -= port->stats.opackets; stats.ibytes -= port->stats.ibytes; @@ -1883,11 +1890,16 @@ fwd_stats_reset(void) { streamid_t sm_id; portid_t pt_id; + int ret; int i; for (i = 0; i < cur_fwd_config.nb_fwd_ports; i++) { pt_id = fwd_ports_ids[i]; - rte_eth_stats_get(pt_id, &ports[pt_id].stats); + ret = rte_eth_stats_get(pt_id, &ports[pt_id].stats); + if (ret != 0) + fprintf(stderr, + "%s: Error: failed to clear stats (port %u):%d", + __func__, pt_id, ret); } for (sm_id = 0; sm_id < cur_fwd_config.nb_fwd_streams; sm_id++) { struct fwd_stream *fs = fwd_streams[sm_id]; -- 2.37.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-07 09:54:12.107804215 +0200 +++ 0021-app-testpmd-check-statistics-query-before-printing.patch 2022-07-07 09:54:10.825823752 +0200 @@ -1 +1 @@ -From baef6bbfad1b9596c7051f5c1fcc308310296342 Mon Sep 17 00:00:00 2001 +From ee3e5f1825a67f387d455cbd91f803d44502bf0c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit baef6bbfad1b9596c7051f5c1fcc308310296342 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index cc8e7aa138..bd689f9f86 100644 +index 7d826632dc..3eefc90bf4 100644 @@ -26,3 +27 @@ -@@ -249,14 +249,20 @@ nic_stats_display(portid_t port_id) - diff_ns; - uint64_t mpps_rx, mpps_tx, mbps_rx, mbps_tx; +@@ -141,14 +141,20 @@ nic_stats_display(portid_t port_id) @@ -29,0 +29,2 @@ + struct rte_port *port = &ports[port_id]; + uint8_t i; @@ -50 +51 @@ -index fe2ce19f99..79bb23264b 100644 +index 2a182eda20..cb59c85c83 100644 @@ -53 +54 @@ -@@ -1982,6 +1982,7 @@ fwd_stats_display(void) +@@ -1705,6 +1705,7 @@ fwd_stats_display(void) @@ -61 +62 @@ -@@ -2013,7 +2014,13 @@ fwd_stats_display(void) +@@ -1737,7 +1738,13 @@ fwd_stats_display(void) @@ -76 +77 @@ -@@ -2108,11 +2115,16 @@ fwd_stats_reset(void) +@@ -1883,11 +1890,16 @@ fwd_stats_reset(void)