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 9102A41D8D for ; Mon, 27 Feb 2023 08:11:05 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8C8E140A84; Mon, 27 Feb 2023 08:11:05 +0100 (CET) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2042.outbound.protection.outlook.com [40.107.223.42]) by mails.dpdk.org (Postfix) with ESMTP id CAF4840ED6 for ; Mon, 27 Feb 2023 08:11:03 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UOTWjJlEpEzv3odSIDNd+2ujj30i5AJRv2XVTgzwKy+6Oth3wjHMOh/Yg8TZnsc68RhDF0atFXM3I0GQqNdcWKvSGgLVPVgE2vYEYKUwiwQ28Wcx26179/ba1IwmK4DML8DeU3eTUSmurkg9GzjAKaJ8/d3qLRCW/nJ236RNIklOHHLiI/j8xsleKyl/gBt3crkdM/o35Sqs8YhNCTrbEi0yYiu3RZGBXIrUifSIyou4LdqK1APzXbAsCnckgZE4+GXci63TP67nmc/cfnEE3ALrSCHsL5IA9+a3pRyShGk4RhneIVLAyuNjO+outpJ8+aD9vXr1qYTwTF2TM1q3Bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=liac597R+ZMGzK1A1rxPpOLkQ0F7+5eLf5ncPmuBgRg=; b=XiivuYndHdkZUKjRAvzl/S2OaH/PNbl2X/jZBRnqViC+YjHu+dx41FeIImEE5mqbHdG6deKlPi3hEElAYXBvcgISnPG0VQBT2rYHSqYiVbSOfdAna2GOxx1Gp0sMK7eJAde26DoCn9fRjYN1SSeSZ4CikUJAwtFUtGHWaP+fk6vRFvp7j3tORo5+WMKtQX+Fa/YlTKHQbq/2o1bWUXKg5u/8jCTcsJSPa54vz7kg17KYm0I8ICya/j+XH2iuuZ+i58HefrB11CfR5Z0G02IxKV78ml8y3l3S5xbyTOhzLADKl9ZeG3w96LfTS+FcTSnDf3gbeNsuAwNoFkGjnXDSFQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=amd.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=liac597R+ZMGzK1A1rxPpOLkQ0F7+5eLf5ncPmuBgRg=; b=sWYg5cPz4vGOfkS+SvdUu165GFd/SkAfSIBqD0qd2DwohbNY3kHx/KNHUMvESl8EzD219OXmsKhYw+E94pdJllycjQmT/JAC65uJiXoRE3Nd+Powgd5EigUPg7ffj/vuT08fLciorXG+GCpleg4rMSYJ/NaNTHdPdRTwH7PBqifFHMlJbyuJiNhaTT0vHZC9GbaUfByl80UYa2+Iqzp6OThpJ6NJnHN9AsSHvIk14GZx0VxydcTe3R/CAD2iLY38upB3u2MBmezbBeQJsXkDFH+bqkvXzfwmGQGp/yU2C972RBNiSVtO1WZBYqN/Fy+RzxNeeKTRCVPM4q4P+tAEjQ== Received: from MN2PR20CA0052.namprd20.prod.outlook.com (2603:10b6:208:235::21) by DS7PR12MB8289.namprd12.prod.outlook.com (2603:10b6:8:d8::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.26; Mon, 27 Feb 2023 07:11:02 +0000 Received: from BL02EPF00010206.namprd05.prod.outlook.com (2603:10b6:208:235:cafe::2e) by MN2PR20CA0052.outlook.office365.com (2603:10b6:208:235::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.28 via Frontend Transport; Mon, 27 Feb 2023 07:11:02 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by BL02EPF00010206.mail.protection.outlook.com (10.167.241.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.12 via Frontend Transport; Mon, 27 Feb 2023 07:11:01 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Sun, 26 Feb 2023 23:10:42 -0800 Received: from nvidia.com (10.126.230.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Sun, 26 Feb 2023 23:10:39 -0800 From: Xueming Li To: Ferruh Yigit CC: Joshua Washington , Huisong Li , Aman Singh , dpdk stable Subject: patch 'app/testpmd: fix forwarding stats for Tx dropped' has been queued to stable release 22.11.2 Date: Mon, 27 Feb 2023 14:59:58 +0800 Message-ID: <20230227070107.15664-90-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230227070107.15664-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230227070107.15664-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF00010206:EE_|DS7PR12MB8289:EE_ X-MS-Office365-Filtering-Correlation-Id: 983849d5-a87d-4000-a9bf-08db1891c8d0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7eTiNhnygEapoWPqNr8bmT3WodxfUo5WhL1DQtsPfn9u72M02YusnDOMiLAcKP2cJ9Dw63Y1GSbcbkvm2aZt+MbF2OyI3PTAhC4EnM/07xIZAchP5bi4Hk0it3RDdgtbOg4rihWbaNfwGanCcVWfqNQWUzgCWWKqtK+9rpK8PgFKboblA8rg12LDYt0OR4xMVeBZJwnyQuXqC9GkiO6XbLVQZ9/+MbfCa6LuQFA4x0haXM7E20TPXpIiaHScZkWdXpxfxlzgy1qUKdh6GAODMumrjyCwNpF4y4rGmIyfi6bjQgiRUn/qr9f6rPvl4uRHdqJFBwG+JLangDQCpfHTjBPBZG8TgtEtTCk+ugtpe3emi/H6ouuSnIoFZVKww3MhZsKuLC7zh+6/dfWUuY3d8AkbOzJGs7GjIdI2cetmBramPqQ4PLDNS6OzVastFN5+g8z+V1owTb7BsR/RnHBDhPL+FgFyJcVyLIScnCg16sMrhJYlzY2sUaZA/lgijBsQbFPH9UnvQg8d9BALUnwsd3w3ZkGfxijYgpg6iTJI0QwAykfl+LurdrUwHKMo3qCQRPSQsPJbFHs4IXirhOgHe3QUTKU6hct9LeWPyK1W4ddiiIhgvVSeiU+2rwsv6TJfOyDu/9jANYiCfUHKhbaYAj+hJbYiQQE76Q14YRmWYG00TV2T3IxAdYql45X4iMztj5Xa1s2d98Bea1969PEZsyHAsII+bNDt02Fu0ZiZB/ePsvb70IWK5ZoklN1LKvc2vQJgWW7fjTix/Wzt5HHVan/GAYTUjWpdgtncwMjRV2c= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230025)(4636009)(39860400002)(136003)(396003)(346002)(376002)(451199018)(36840700001)(40470700004)(46966006)(40460700003)(6286002)(16526019)(356005)(2906002)(7636003)(82740400003)(8676002)(6916009)(8936002)(70586007)(41300700001)(70206006)(4326008)(36860700001)(5660300002)(336012)(7696005)(55016003)(40480700001)(426003)(53546011)(1076003)(186003)(6666004)(2616005)(26005)(478600001)(966005)(82310400005)(83380400001)(316002)(36756003)(54906003)(86362001)(47076005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2023 07:11:01.9624 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 983849d5-a87d-4000-a9bf-08db1891c8d0 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF00010206.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB8289 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 22.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/01/23. 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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=a1d3811bc0ca7d7031319f2fc4a1fbee8a6d14b5 Thanks. Xueming Li --- >From a1d3811bc0ca7d7031319f2fc4a1fbee8a6d14b5 Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Tue, 31 Jan 2023 11:56:03 +0000 Subject: [PATCH] app/testpmd: fix forwarding stats for Tx dropped Cc: Xueming Li [ upstream commit c3fd1e6089cce14ad3f941ab5df0501e03b3356c ] There is an inconsistency at displaying Tx dropped value for per port forwarding stats and accumulated forwarding stats. While displaying per port TX-dropped value, it only takes 'ports_stats[pt_id].tx_dropped' into account, but for accumulated TX-dropped results it takes both 'ports_stats[pt_id].tx_dropped' & 'stats.oerrors' into account. To fix, make both per port and accumulated stats display 'tx_dropped' and 'stats.oerrors' (ports_stats[pt_id].tx_dropped + stats.oerrors). Fixes: 53324971a14e ("app/testpmd: display/clear forwarding stats on demand") Reported-by: Joshua Washington Signed-off-by: Ferruh Yigit Acked-by: Huisong Li Acked-by: Aman Singh --- app/test-pmd/testpmd.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index e366f81a0f..3c404c8a6e 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -2056,6 +2056,8 @@ fwd_stats_display(void) fwd_cycles += fs->core_cycles; } for (i = 0; i < cur_fwd_config.nb_fwd_ports; i++) { + uint64_t tx_dropped = 0; + pt_id = fwd_ports_ids[i]; port = &ports[pt_id]; @@ -2077,8 +2079,9 @@ fwd_stats_display(void) total_recv += stats.ipackets; total_xmit += stats.opackets; total_rx_dropped += stats.imissed; - total_tx_dropped += ports_stats[pt_id].tx_dropped; - total_tx_dropped += stats.oerrors; + tx_dropped += ports_stats[pt_id].tx_dropped; + tx_dropped += stats.oerrors; + total_tx_dropped += tx_dropped; total_rx_nombuf += stats.rx_nombuf; printf("\n %s Forward statistics for port %-2d %s\n", @@ -2105,8 +2108,8 @@ fwd_stats_display(void) printf(" TX-packets: %-14"PRIu64" TX-dropped: %-14"PRIu64 "TX-total: %-"PRIu64"\n", - stats.opackets, ports_stats[pt_id].tx_dropped, - stats.opackets + ports_stats[pt_id].tx_dropped); + stats.opackets, tx_dropped, + stats.opackets + tx_dropped); if (record_burst_stats) { if (ports_stats[pt_id].rx_stream) -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-27 14:08:43.803353700 +0800 +++ 0091-app-testpmd-fix-forwarding-stats-for-Tx-dropped.patch 2023-02-27 14:08:40.819237000 +0800 @@ -1 +1 @@ -From c3fd1e6089cce14ad3f941ab5df0501e03b3356c Mon Sep 17 00:00:00 2001 +From a1d3811bc0ca7d7031319f2fc4a1fbee8a6d14b5 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit c3fd1e6089cce14ad3f941ab5df0501e03b3356c ] @@ -18 +20,0 @@ -Cc: stable@dpdk.org @@ -29 +31 @@ -index 86fa9c16ba..f3e29a5b4b 100644 +index e366f81a0f..3c404c8a6e 100644 @@ -32,2 +34,2 @@ -@@ -2061,6 +2061,8 @@ fwd_stats_display(void) - fwd_cycles += fs->busy_cycles; +@@ -2056,6 +2056,8 @@ fwd_stats_display(void) + fwd_cycles += fs->core_cycles; @@ -41 +43 @@ -@@ -2082,8 +2084,9 @@ fwd_stats_display(void) +@@ -2077,8 +2079,9 @@ fwd_stats_display(void) @@ -53 +55 @@ -@@ -2110,8 +2113,8 @@ fwd_stats_display(void) +@@ -2105,8 +2108,8 @@ fwd_stats_display(void)