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 59ED8A0A0E for ; Mon, 10 May 2021 18:16:33 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 50894410E3; Mon, 10 May 2021 18:16:33 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2071.outbound.protection.outlook.com [40.107.244.71]) by mails.dpdk.org (Postfix) with ESMTP id 872B840140 for ; Mon, 10 May 2021 18:16:32 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nfUA+nu3sn9a7lJZ1Wu1m0IIP6bBoh+6UhfAMMWm3AMnjCHmvZykS0YDYGjBUHTZVIt92h7If8uu+WfSWgegQzy1SgXvKH8BQb9bgkUDpNJSpeulwgGJoHTp3l4tyystNpzpdfmwEGE27KMKVXkadMmsyxZ8vqPUgpVPytR0/QTdivif2xt+Z4iguh6by3/DnPIjmQrvx2e3+O/0W57bD6ZCF5snaMpzvsKL6S+TSB0yW19i88R78ZLNleav2oof+pZwzBLiFD03feK+jdfaSe6m4P3bbHDg5hHg/b8dbjjaw4NhbJEmZw8J7tdxNhGS5rcjalnaPr0OcoGm4JNDow== 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-SenderADCheck; bh=/ZHD9lntdsXyqqU4PLlSpNdMMcwG6gtoD+T/yJAir9Q=; b=cG6ihrFnpTjw091fCyZjBm83JIuVOhKo7kWvOIR1sssbSYzmED2D1ajQc81QeOyAiJoK0dLDmN3KWpyFdnumooddBjR75dWApv8URZ86ejq0rIFbgP3q9XkkcU8qOmvOC/ag5sjpSyQ+LnvZTpEtLB7MlzUpZB3lCuPSaoW4LAnaoszzgYVpxsu4s17qo0drmlj6AInHOEEKgDviwasN/jadNyKEos8B7MJevQrDfX1BtNawsJ4mIlWw43KRogY/jxuEBW8HyPnra439vcWaDP3O4mEVLjVOYDvk/TsBiCN4XCg8ZiCa87UVGID2XKhKW7Dtq3EFYkqKZSmz9iNUrg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=redhat.com smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none 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=/ZHD9lntdsXyqqU4PLlSpNdMMcwG6gtoD+T/yJAir9Q=; b=GjYOjpH2cF7mn3cc54f0ackeRDFHfNTK9XZ1fuvMJcAaoMcsntNRVYWuSMeIc9YCf7/dR0ESD9NI4JQ0zMjF07zloDoJH5TYu7ZYNhLyladpBAlEX101numTdNza+G4yIF0yEAYdJI1vmEpqjgAngIrN1xwSiZrZwfB2adjVhYS7d3TfmRKI6SsWJNzsr0CnWUgZVbdzv3otBrzKXqAh/G+wsKOn/ExIBKimgtDPaAPXkFtfsjbieeuzggHO1zzOU8tvEW31urEwSYqAB0FCOSTp27onfFfw4jsbciM5XXruuR0O0GMETpfxeq1wvtkajNF/CqLzHkjU/h+QUGWPOA== Received: from DM6PR10CA0017.namprd10.prod.outlook.com (2603:10b6:5:60::30) by DM5PR12MB2581.namprd12.prod.outlook.com (2603:10b6:4:b2::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.29; Mon, 10 May 2021 16:16:28 +0000 Received: from DM6NAM11FT022.eop-nam11.prod.protection.outlook.com (2603:10b6:5:60:cafe::5f) by DM6PR10CA0017.outlook.office365.com (2603:10b6:5:60::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:16:28 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; redhat.com; dkim=none (message not signed) header.d=none;redhat.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT022.mail.protection.outlook.com (10.13.172.210) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:16:28 +0000 Received: from nvidia.com (172.20.145.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 10 May 2021 16:16:24 +0000 From: Xueming Li To: Thomas Monjalon CC: Luca Boccassi , Ajit Khaparde , Bruce Richardson , Andrew Rybchenko , Xiaoyun Li , Jens Freimann , Bing Zhao , David Marchand , dpdk stable Date: Tue, 11 May 2021 00:01:23 +0800 Message-ID: <20210510160258.30982-134-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510160258.30982-1-xuemingl@nvidia.com> References: <20210510160258.30982-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.145.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ef472211-e105-4dbe-1982-08d913cef739 X-MS-TrafficTypeDiagnostic: DM5PR12MB2581: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4941; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IuQSnVvHhtkyzAQyQObu6UOzZz2WeTTGwtjvsht4xEMHXNofUZE4OTHHLiL2gf/v8FBcOA+QqaG+MM+Tj4AmPEheXXpBViiwU3dfEQU6qBEM4lfwXjKc/0aR2L+TvtNqK2+eDYB6iAvnNgEI36BnPQQ01Idz+JacP7iEbI5bNTqBM6OrymbxC5lgwJUfrl3Pw6JmESXCZdbaxr7gl/47MorgTqpahKPpbJdCMOtFKy4le9CFjPwWo9LbUxdPQf72inQ8dC5XuTjcSl/9LJM81/S8Fv+xDnZrR2ZC8yjlmrl27jexXo4Q+O8btC459Y6nrn0mi2yCZxIEe3zdF3JtWVXJ9jxKXG1v9iAP6b1n8diNuXwAqbIPDtrygNOOJ+wRVi0bUSHNUT3HuIf46MhVdgMMfRr9+JnPBTsTcorOEsSpyVQdYRfCAhV47yqq1vlWozlCGu8Cx9nnOsKIh+YNPuZq7jvp2rINkBsidrJpEd3W8T7Gidx/QpGGdMRuomnHHlkf3J19NWQB+5YAbFtdTiQWDPLMNeG14zcI6tPNtUYKDTgJ94lKQQzE17HasOg6ilW7ky/f42ztlxIEQ1XcmgHy6wRRg1x8YLbhoanqrya8VBVCsZ8ODYtnXWTYKPTo3GSqAGGG3RQtuOaRUNz4HsMmSpo5lroC5Byn8LpaLkMXN7Ugpey4If05mJ2BCFVvu+Dw8zCqwvWLJ/cvjhqLtPGrRPEUe8Nr4Q/zqN95vCA= X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(39860400002)(346002)(136003)(376002)(396003)(36840700001)(46966006)(53546011)(2906002)(26005)(426003)(16526019)(54906003)(186003)(336012)(47076005)(316002)(55016002)(36906005)(5660300002)(4326008)(82740400003)(7696005)(70206006)(1076003)(83380400001)(7636003)(6286002)(6916009)(356005)(478600001)(86362001)(8676002)(36756003)(36860700001)(82310400003)(966005)(2616005)(8936002)(70586007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:16:28.0511 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ef472211-e105-4dbe-1982-08d913cef739 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT022.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB2581 Subject: [dpdk-stable] patch 'app/testpmd: fix usage text' has been queued to stable release 20.11.2 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.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 05/12/21. 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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/5a324f3e4d37108b640bbc0281b2edcf2ece3db3 Thanks. Xueming Li --- >From 5a324f3e4d37108b640bbc0281b2edcf2ece3db3 Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Mon, 5 Apr 2021 21:33:25 +0200 Subject: [PATCH] app/testpmd: fix usage text Cc: Luca Boccassi [ upstream commit c6d527a1c8bdee9435ce150670acf1657234c0c1 ] The options help text was including an incomplete and redundant summary of the options before explaining each. The summary is dropped. The details of the option --hairpin-mode had an extra space, breaking the alignment with the next line. There were some mismatches between options in the usage text sed -rn 's/.*\(" *--([a-z-]*)[=: ].*/\1/p' app/test-pmd/parameters.c and the options declared in lgopts array sed -rn 's/.*\{.*"(.*)",.*,.*,.*},.*/\1/p' app/test-pmd/parameters.c The misses were: --no-numa --enable-scatter --tx-ip --tx-udp --noisy-lkup-num-reads-writes The option --ports was not implemented. Fixes: 01817b10d27c ("app/testpmd: change hairpin queues setup") Fixes: 3c156061b938 ("app/testpmd: add noisy neighbour forwarding mode") Fixes: bf5b2126bf44 ("app/testpmd: add ability to set Tx IP and UDP parameters") Fixes: 0499793854f5 ("app/testpmd: add scatter enabling option") Fixes: 999b2ee0fe45 ("app/testpmd: enable NUMA support by default") Fixes: af75078fece3 ("first public release") Signed-off-by: Thomas Monjalon Acked-by: Ajit Khaparde Acked-by: Bruce Richardson Acked-by: Andrew Rybchenko Acked-by: Xiaoyun Li Reviewed-by: Jens Freimann Reviewed-by: Bing Zhao Acked-by: David Marchand --- app/test-pmd/parameters.c | 35 ++++++++--------------------------- 1 file changed, 8 insertions(+), 27 deletions(-) diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c index df5eb10d84..b2935f96be 100644 --- a/app/test-pmd/parameters.c +++ b/app/test-pmd/parameters.c @@ -49,29 +49,7 @@ static void usage(char* progname) { - printf("usage: %s [EAL options] -- " -#ifdef RTE_LIB_CMDLINE - "[--interactive|-i] " - "[--cmdline-file=FILENAME] " -#endif - "[--help|-h] | [--auto-start|-a] | [" - "--tx-first | --stats-period=PERIOD | " - "--coremask=COREMASK --portmask=PORTMASK --numa " - "--portlist=PORTLIST " - "--mbuf-size= | --total-num-mbufs= | " - "--nb-cores= | --nb-ports= | " -#ifdef RTE_LIB_CMDLINE - "--eth-peers-configfile= | " - "--eth-peer=X,M:M:M:M:M:M | " - "--tx-ip=SRC,DST | --tx-udp=PORT | " -#endif - "--pkt-filter-mode= |" - "--rss-ip | --rss-udp | --rss-level-inner | --rss-level-outer |" - "--rxpt= | --rxht= | --rxwt= |" - " --rxfreet= | --txpt= | --txht= | --txwt= | --txfreet= | " - "--txrst= | --tx-offloads= | | --rx-offloads= | " - "--vxlan-gpe-port= | --geneve-parsed-port= | " - "--record-core-cycles | --record-burst-stats]\n", + printf("\nUsage: %s [EAL options] -- [testpmd options]\n\n", progname); #ifdef RTE_LIB_CMDLINE printf(" --interactive: run in interactive mode.\n"); @@ -97,6 +75,7 @@ usage(char* progname) printf(" --portlist=PORTLIST: list of forwarding ports\n"); printf(" --numa: enable NUMA-aware allocation of RX/TX rings and of " "RX memory buffers (mbufs).\n"); + printf(" --no-numa: disable NUMA-aware allocation.\n"); printf(" --port-numa-config=(port,socket)[,(port,socket)]: " "specify the socket on which the memory pool " "used by the port will be allocated.\n"); @@ -136,6 +115,7 @@ usage(char* progname) "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"); printf(" --enable-lro: enable large receive offload.\n"); printf(" --enable-rx-cksum: enable rx hardware checksum offload.\n"); printf(" --enable-rx-timestamp: enable rx hardware timestamp offload.\n"); @@ -183,6 +163,8 @@ usage(char* progname) printf(" --txpkts=X[,Y]*: set TX segment sizes" " or total packet length.\n"); printf(" --txonly-multi-flow: generate multiple flows in txonly mode\n"); + printf(" --tx-ip=src,dst: IP addresses in Tx-only mode\n"); + printf(" --tx-udp=src[,dst]: UDP ports in Tx-only mode\n"); printf(" --disable-link-check: disable check on link status when " "starting/stopping ports.\n"); printf(" --disable-device-start: do not automatically start port\n"); @@ -213,14 +195,14 @@ usage(char* progname) printf(" --noisy-lkup-memory=N: allocate N MB of VNF memory\n"); printf(" --noisy-lkup-num-writes=N: do N random writes per packet\n"); printf(" --noisy-lkup-num-reads=N: do N random reads per packet\n"); - printf(" --noisy-lkup-num-writes=N: do N random reads and writes per packet\n"); + printf(" --noisy-lkup-num-reads-writes=N: do N random reads and writes per packet\n"); printf(" --no-iova-contig: mempool memory can be IOVA non contiguous. " "valid only with --mp-alloc=anon\n"); printf(" --rx-mq-mode=0xX: hexadecimal bitmask of RX mq mode can be " "enabled\n"); printf(" --record-core-cycles: enable measurement of CPU cycles.\n"); printf(" --record-burst-stats: enable display of RX and TX bursts.\n"); - printf(" --hairpin-mode=0xXX: bitmask set the hairpin port mode.\n " + printf(" --hairpin-mode=0xXX: bitmask set the hairpin port mode.\n" " 0x10 - explicit Tx rule, 0x02 - hairpin ports paired\n" " 0x01 - hairpin ports loop, 0x00 - hairpin port self\n"); } @@ -510,7 +492,6 @@ launch_args_parse(int argc, char** argv) #endif { "tx-first", 0, 0, 0 }, { "stats-period", 1, 0, 0 }, - { "ports", 1, 0, 0 }, { "nb-cores", 1, 0, 0 }, { "nb-ports", 1, 0, 0 }, { "coremask", 1, 0, 0 }, @@ -518,7 +499,7 @@ launch_args_parse(int argc, char** argv) { "portlist", 1, 0, 0 }, { "numa", 0, 0, 0 }, { "no-numa", 0, 0, 0 }, - { "mp-anon", 0, 0, 0 }, + { "mp-anon", 0, 0, 0 }, /* deprecated */ { "port-numa-config", 1, 0, 0 }, { "ring-numa-config", 1, 0, 0 }, { "socket-num", 1, 0, 0 }, -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-10 23:59:30.059323800 +0800 +++ 0135-app-testpmd-fix-usage-text.patch 2021-05-10 23:59:26.530000000 +0800 @@ -1 +1 @@ -From c6d527a1c8bdee9435ce150670acf1657234c0c1 Mon Sep 17 00:00:00 2001 +From 5a324f3e4d37108b640bbc0281b2edcf2ece3db3 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit c6d527a1c8bdee9435ce150670acf1657234c0c1 ] @@ -30 +32,0 @@ -Cc: stable@dpdk.org @@ -45 +47 @@ -index b7d4ef76b0..f3954c1c63 100644 +index df5eb10d84..b2935f96be 100644 @@ -95 +97 @@ -@@ -184,6 +164,8 @@ usage(char* progname) +@@ -183,6 +163,8 @@ usage(char* progname) @@ -101 +102,0 @@ - printf(" --eth-link-speed: force link speed.\n"); @@ -104 +105,2 @@ -@@ -215,14 +197,14 @@ usage(char* progname) + printf(" --disable-device-start: do not automatically start port\n"); +@@ -213,14 +195,14 @@ usage(char* progname) @@ -121 +123 @@ -@@ -549,7 +531,6 @@ launch_args_parse(int argc, char** argv) +@@ -510,7 +492,6 @@ launch_args_parse(int argc, char** argv) @@ -129 +131 @@ -@@ -557,7 +538,7 @@ launch_args_parse(int argc, char** argv) +@@ -518,7 +499,7 @@ launch_args_parse(int argc, char** argv)