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 3A7B843B7D for ; Tue, 5 Mar 2024 10:56:43 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 35E0A42D66; Tue, 5 Mar 2024 10:56:43 +0100 (CET) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2061.outbound.protection.outlook.com [40.107.244.61]) by mails.dpdk.org (Postfix) with ESMTP id 8572D4026B for ; Tue, 5 Mar 2024 10:56:40 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JK0pFFu8+9F+H/raCinbxUKcmZDiybc5REvqjgBicup98pECZlyRJU35zhTD7VsMQ8b9YhsdCfC2m4CjjPhW1FgUFvoWc7kM8eqfg8+hb24hUPiduTI6RgFSYwxi+BQJDpjx22ZkyWiWaBA6Hl+NXV7gZIIrq9t3R05LjDeQLM3Ti7rrS9tRbUuICbjYg5rIUoFUfgak03laTRzatB/mbkkPWZKRrLTQ9qGK3irKYZ8ibqOewkiJ9rh5WOihhn2wpEEPGzvdc+yWWv0eMlZcyOnbq2TFAC9BJs1iE5gWtTWACmm2MMMSwYM5GB+qBBVuRuW6PshkAzhhaKcqtzcnDQ== 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=rZh9Cxa92tuJ3KYdoSVSevXiErpHl5JZGcZfCyZbiXQ=; b=QmZZJj5B/QtP/c7ujmjF2+cAOtoHzI0RMw6MRRWfxn9naMDxgRoSXbDtNmrOaDXLDNiErUIOgHqqtF9gi+ztC2+/WRxO/QgmFi20FKgq3oMA3ZnJG9es//RqJGtr/c1LI5UntDYHx89gauAoxN/pFbG0Xhmw7ywIkZux1UipR7qxaLeE9cljyBCdnnEm6iSdmr5W+L3sn1OIuGQMy78f5B6C8bYOX4XdZTkfa2dVUIHmsmal9epkZIxD4Ncpyq3bqXInhUPHknFaCOX5BtNo+9avZQxunz0U1E9Jm78j5BqNExRiFkun8l0tnkLVN8aylKywYefIwvHhpj2ezDImTQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=networkplumber.org 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 (0) 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=rZh9Cxa92tuJ3KYdoSVSevXiErpHl5JZGcZfCyZbiXQ=; b=tIXvdgN2UPrlw2nOqFjCRa8cWPFgMTQZPXiSjh2y2rXEAour96yd5VaRhH4yDcShzXByvFvftd28Tm9ySV+rN8u3ETM55FzYxNJrNMpPNn6w7E9b53+gR/wPC3GF4zGT+wAzv8TBiR9CsUibixZMFjuR8wFughL89fDuxkpyiQk363KX+cCvUMzbEWfi2AqHGkEFAmzbpifzgWavt6WPxaZAi9mdl74CqbTPfJmxdkXFppZAq3v6aLf7zWEX8v13KZs9oBZItsINrhF9LnP7lhF8n/Mzb2HU8haOpjHDE9AxXX0r1b8sNYsty7gF0BPwPyBHtKVEUR6QZYHU5SXXGg== Received: from MW4PR04CA0065.namprd04.prod.outlook.com (2603:10b6:303:6b::10) by LV3PR12MB9356.namprd12.prod.outlook.com (2603:10b6:408:20c::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.38; Tue, 5 Mar 2024 09:56:37 +0000 Received: from CO1PEPF000042AC.namprd03.prod.outlook.com (2603:10b6:303:6b:cafe::c0) by MW4PR04CA0065.outlook.office365.com (2603:10b6:303:6b::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.39 via Frontend Transport; Tue, 5 Mar 2024 09:56:37 +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 CO1PEPF000042AC.mail.protection.outlook.com (10.167.243.41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.11 via Frontend Transport; Tue, 5 Mar 2024 09:56:36 +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.41; Tue, 5 Mar 2024 01:56:19 -0800 Received: from nvidia.com (10.126.231.35) 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.1258.12; Tue, 5 Mar 2024 01:56:17 -0800 From: Xueming Li To: Stephen Hemminger CC: Ferruh Yigit , dpdk stable Subject: patch 'app/testpmd: hide --bitrate-stats in help if disabled' has been queued to stable release 23.11.1 Date: Tue, 5 Mar 2024 17:47:14 +0800 Message-ID: <20240305094757.439387-94-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240305094757.439387-1-xuemingl@nvidia.com> References: <20240305094757.439387-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] 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: CO1PEPF000042AC:EE_|LV3PR12MB9356:EE_ X-MS-Office365-Filtering-Correlation-Id: d17e2666-6367-4784-8fc8-08dc3cfa8c0d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oVo/DFdrBzLCo5s/a53d4vgl2+whrHFr+eh7O5R9hqaPjb9DhSOwaUQfCwnfBr2JaPNQHZJHLAMm+S6kHGY6KcN1EJfWExJFCA15Q4jMglu36R6l6ilnpmpijC/6y3BSnylD63+wtZxmbHGHQ2AsL4Qsg1H5n6Qpm02rQFIvqeQPfRnnCgK4jYBZBf7KqIQJwrCilRrUsYNNxuTuvxsFq4KCFiA4nPSnUX7c/Jkez2Lx8sL/iUk/9Qj94AGtVyYJwZMz+t6YOedOvirH2WfBpc1kcp6OpIGicxidyOvmp2C5PESgA02MyU7fFSgbhLA+YGZ9UvtoS0Yd9z8dBdNE1swFcHGglW5YqqOPnYGXxP5woDYgtUZ9emFNDJEUW3EJRx0VbxJwyo/luKtBCzsnIhyDxKZqnUtdHrWVLFqePCghodvrqnw4P4jj9Ry2Kl8v84FM6IpIX+LFOF28SGRN7PkBsue7K5I+Gz9LY/+IUg5jhnXnmXGcHPsDQaTf03wA+IhH41wAk1D/oLianN0d7cljyPgIveIltfY1FbwU4lWVKSG6VkysJcLyOogToa/LT52mqeoQwCQFFkYIlcEXlpIs28b15AY3DcCgOqyueXKDyfMD4tMEC1z4ODPBVE+bcQsG7RV/8s8GxPn9T1aFWJSMvIksyrIonHU1yo3gOPvGgICAYf3B68qLSv+/D72Mh8KdOLFgb/yd6falodjC6rh+HoLf364BwlT9PN8gNwbrKMhktuTWaR1DAH94pr8l 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:(13230031)(82310400014)(376005)(36860700004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2024 09:56:36.7551 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d17e2666-6367-4784-8fc8-08dc3cfa8c0d 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: CO1PEPF000042AC.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR12MB9356 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 23.11.1 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/31/24. 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=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=edc0e91ffc15d513a9686dc878e6fa1442a3c2db Thanks. Xueming Li --- >From edc0e91ffc15d513a9686dc878e6fa1442a3c2db Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 9 Jan 2024 15:09:27 -0800 Subject: [PATCH] app/testpmd: hide --bitrate-stats in help if disabled Cc: Xueming Li [ upstream commit e96491cb91fd048a79e848d713d65d45f0dde915 ] Like other #ifdef options, bitrate-stats should not be printed in help if not configured. Also reordered latencystats help string to group it with bitrate-stats. Fixes: e25e6c70fb56 ("app/testpmd: add --bitrate-stats option") Signed-off-by: Stephen Hemminger Acked-by: Ferruh Yigit --- app/test-pmd/parameters.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c index a9ca58339d..11b0cce577 100644 --- a/app/test-pmd/parameters.c +++ b/app/test-pmd/parameters.c @@ -100,10 +100,6 @@ usage(char* progname) "of peer ports.\n"); printf(" --eth-peer=X,M:M:M:M:M:M: set the MAC address of the X peer " "port (0 <= X < %d).\n", RTE_MAX_ETHPORTS); -#endif -#ifdef RTE_LIB_LATENCYSTATS - printf(" --latencystats=N: enable latency and jitter statistics " - "monitoring on forwarding lcore id N.\n"); #endif printf(" --disable-crc-strip: disable CRC stripping by hardware.\n"); printf(" --enable-scatter: enable scattered Rx.\n"); @@ -167,8 +163,14 @@ usage(char* progname) printf(" --disable-device-start: do not automatically start port\n"); printf(" --no-lsc-interrupt: disable link status change interrupt.\n"); printf(" --no-rmv-interrupt: disable device removal interrupt.\n"); +#ifdef RTE_LIB_BITRATESTATS printf(" --bitrate-stats=N: set the logical core N to perform " "bit-rate calculation.\n"); +#endif +#ifdef RTE_LIB_LATENCYSTATS + printf(" --latencystats=N: enable latency and jitter statistics " + "monitoring on forwarding lcore id N.\n"); +#endif printf(" --print-event : " "enable print of designated event or all of them.\n"); printf(" --mask-event : " -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 17:39:33.813053294 +0800 +++ 0093-app-testpmd-hide-bitrate-stats-in-help-if-disabled.patch 2024-03-05 17:39:30.853566496 +0800 @@ -1 +1 @@ -From e96491cb91fd048a79e848d713d65d45f0dde915 Mon Sep 17 00:00:00 2001 +From edc0e91ffc15d513a9686dc878e6fa1442a3c2db Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit e96491cb91fd048a79e848d713d65d45f0dde915 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org