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 6348D433D8 for ; Mon, 11 Dec 2023 11:20:16 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5D57F42D7D; Mon, 11 Dec 2023 11:20:16 +0100 (CET) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2054.outbound.protection.outlook.com [40.107.223.54]) by mails.dpdk.org (Postfix) with ESMTP id 9A4B240E0F for ; Mon, 11 Dec 2023 11:20:14 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CEG7fWWI8bjQOgeYn22S2yo77BmOwdlO2jtfzRPA2XqziwyPmDfA1nAfDFLFWLxOeGQknfBRe/xzMcrOe85aMWoOKG3HvZzCkzHwCEHW7KMbahR/Gr8olkGIyKPUe1UFLWO5OCblZXji5Dda07xCJlLyxdyLclmx7d+lIULNyUOuAKWxkluS23/NnYavMbM+6AQbqv9EIwr7BKmWGRutrlO3GsjrWAT5DBA8DW7D4nF5UyYT+95DH+T8ACwUR8xTieAAthdiD7VDOgl17fxul5wE+F7WQz3vpS267Ijern5qQy6ThelMMJ1gAWmh/ddSYPCTuK/U+24fp+1kgysKlA== 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=Nunyzle5z6YlY0ZQKq0pjxk+KL3e+Fee+UcADfeunvM=; b=aIisEc4DvrgHBeWM1uVWIk6NkoqVmdLou1JFSfoD4UD2HJkpLNEibx0ZXoXfmpte1x5sk0Hupk/BAX5kF09zujItj3DRh67xuWYlRdxP5zr3g/7IHxoweoh1RZE5tLKLj7mdT1j6JOLTNSB0iftKqxSiA8ULWyfuTKu3JofOh0mdVuqsGCSkpEsRXJ8lU6BuPEX02A7pgISYQX8libOz6fOWvzICz0v8md/aMWiT2DPsgjmNSMi9MHpTUnCaM98Tg0vH+0A4U5cpWKs9819btev7EBW2o5mqnA8pTuj2JmwEqt5sr7wR+7o0LM89tRPdVzidMbdRB4JXZeTXEHD3Ng== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=huawei.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 (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=Nunyzle5z6YlY0ZQKq0pjxk+KL3e+Fee+UcADfeunvM=; b=lqj0xEs40t6h+cKdpRfdeGZKXXSlAUvGCQ+0NSUhUQqt3Y9ZG5QZB+JS0gOOXpDhUimColAbg6K1CU/rGz7Q+74/SRMv7GYER4dmzBAAZQXWn6FiwUbyBzlZ/2WR1jz3cVY7Nt8rbcAmSlRKHNRV13zDEz48mbf4npLYMCO9+Z60HwQxFaews10T41UTvrzzBSV0qZcgDqZYxB+y2CGQw/4hjVYaDdsHP/3T4k3LYIxAhuyDQG8IY7ILQ/X4oZaLXkMGWknLd6NJRyc7Crzi3C2wRU7KeFYmeSyUjO74EVRKHGRYbNVMC5tk6lRqH1+4u9l48W+Pn4W2jRlEesTRJw== Received: from DS7PR05CA0081.namprd05.prod.outlook.com (2603:10b6:8:57::6) by MW3PR12MB4587.namprd12.prod.outlook.com (2603:10b6:303:5d::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.32; Mon, 11 Dec 2023 10:20:11 +0000 Received: from CY4PEPF0000EE3B.namprd03.prod.outlook.com (2603:10b6:8:57:cafe::b1) by DS7PR05CA0081.outlook.office365.com (2603:10b6:8:57::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.21 via Frontend Transport; Mon, 11 Dec 2023 10:20:10 +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 CY4PEPF0000EE3B.mail.protection.outlook.com (10.167.242.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.18 via Frontend Transport; Mon, 11 Dec 2023 10:20:09 +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; Mon, 11 Dec 2023 02:20:00 -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.986.41; Mon, 11 Dec 2023 02:19:59 -0800 From: Xueming Li To: Huisong Li CC: Ferruh Yigit , dpdk stable Subject: patch 'app/testpmd: fix tunnel TSO configuration' has been queued to stable release 22.11.4 Date: Mon, 11 Dec 2023 18:11:48 +0800 Message-ID: <20231211101226.2122-84-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231211101226.2122-1-xuemingl@nvidia.com> References: <20231022142250.10324-1-xuemingl@nvidia.com> <20231211101226.2122-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: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EE3B:EE_|MW3PR12MB4587:EE_ X-MS-Office365-Filtering-Correlation-Id: e6cfc9e7-592a-459f-f719-08dbfa32c14b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: s7Von6H7kqDgsIeqsBciiQbc5Cn/H8msACOow7EjA9CHeDvE2LFpUtFAeDnEpL1R3yTk5njNxXMlGRq1fDFTkaWyVMpCIOlJMn2JUoTIVjhs551wAlXOco4dCtAvpXN8mLAHiy1KbVbYfmOKxTTXpzlGYuCklGEU7jTxefv4rehsZq7BpW9VL8Md0/2diP+0YCEibDSyBI5E4pur8WI5e+pM23wiIZnFlxR73/lGSBA5dk/ayabpKX6by4pLD6P8/tfa+SfZAa0lZ9yJooqGyHAsaSv7ZLK2+jIqU+cmnnOjL/Qtjf2HwgDvJLRaWTy/i/LHTuZP9jixpqR1jVRPADXso46e0+2IABlYgtFAh2Z0eL1E4pP4HOj2IaBrj6iFGpm+Ku5UAncyDbBcA7Kbb17EZwRozHhYt6vRQ+ZAICNB5KLEVX7dD7BjPmadu09nuX8iGaWMNm+1ol4r5q7CZ010ED+77k/sid0PT4qteBNS+h4j4US4SmFt79010AoRrNTNZcl5p13NsYCxwEj75BXgb8FDG3QdhnBktXzulodTbJWNOMKWm7UONxF67lCnm/gwtb1ZJ9PtirrDA60LPoBV+DM2a+rimlpm5hKx3OwRSO5/O5j+QOZN5lNCP8qIUrSwxiQy3Byy4DbxKwCOMpWmTk5A/6zYEZT+xAbwYvXI+5AJWGoDzAiitgsEP/nQ2PEw6+e5B7xYM7LZZgDxssKxL1M56o3nuG+nYhzybmM88wpVWuV/qKbQ5saUeMtsKZrYhWF+m42UK/SFSGCs2zvtRDCCLdhZaiwm4ZKOpWGhDN/RgleScuWQS3XquWUJ0T493ed49LWe+0c0Wdx/6w== 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)(4636009)(136003)(346002)(39860400002)(376002)(396003)(230922051799003)(230273577357003)(230173577357003)(64100799003)(451199024)(82310400011)(1800799012)(186009)(36840700001)(40470700004)(46966006)(55016003)(40480700001)(41300700001)(4001150100001)(40460700003)(2906002)(5660300002)(316002)(4326008)(6916009)(8936002)(8676002)(70586007)(54906003)(70206006)(356005)(82740400003)(7636003)(2616005)(86362001)(36756003)(36860700001)(47076005)(966005)(83380400001)(426003)(26005)(478600001)(6666004)(6286002)(336012)(1076003)(16526019)(7696005)(53546011); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 10:20:09.9940 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e6cfc9e7-592a-459f-f719-08dbfa32c14b 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: CY4PEPF0000EE3B.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR12MB4587 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/13/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=5ff3454aace90a2441a256ed24e0c40def45bbaa Thanks. Xueming Li --- >From 5ff3454aace90a2441a256ed24e0c40def45bbaa Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Sat, 11 Nov 2023 12:59:43 +0800 Subject: [PATCH] app/testpmd: fix tunnel TSO configuration Cc: Xueming Li [ upstream commit e43dc93803c4623840472c6109ef05e26286ec2f ] Currently, there are two conditions to set tunnel TSO, like "parse tunnel" and "outer IP checksum". If these conditions are not satisfied, testpmd should not change their configuration, like tx_offloads on port and per queue, and no need to request "reconfig device". Fixes: 597f9fafe13b ("app/testpmd: convert to new Tx offloads API") Signed-off-by: Huisong Li Reviewed-by: Ferruh Yigit --- app/test-pmd/cmdline.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index 03926e2dbc..3a451b9fa0 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -5011,12 +5011,6 @@ cmd_tunnel_tso_set_parsed(void *parsed_result, res->port_id); return; } - check_tunnel_tso_nic_support(res->port_id, dev_info.tx_offload_capa); - - ports[res->port_id].dev_conf.txmode.offloads |= - (all_tunnel_tso & dev_info.tx_offload_capa); - printf("TSO segment size for tunneled packets is %d\n", - ports[res->port_id].tunnel_tso_segsz); /* Below conditions are needed to make it work: * (1) tunnel TSO is supported by the NIC; @@ -5029,14 +5023,23 @@ cmd_tunnel_tso_set_parsed(void *parsed_result, * is not necessary for IPv6 tunneled pkts because there's no * checksum in IP header anymore. */ - - if (!ports[res->port_id].parse_tunnel) + if (!ports[res->port_id].parse_tunnel) { fprintf(stderr, - "Warning: csum parse_tunnel must be set so that tunneled packets are recognized\n"); + "Error: csum parse_tunnel must be set so that tunneled packets are recognized\n"); + return; + } if (!(ports[res->port_id].dev_conf.txmode.offloads & - RTE_ETH_TX_OFFLOAD_OUTER_IPV4_CKSUM)) + RTE_ETH_TX_OFFLOAD_OUTER_IPV4_CKSUM)) { fprintf(stderr, - "Warning: csum set outer-ip must be set to hw if outer L3 is IPv4; not necessary for IPv6\n"); + "Error: csum set outer-ip must be set to hw if outer L3 is IPv4; not necessary for IPv6\n"); + return; + } + + check_tunnel_tso_nic_support(res->port_id, dev_info.tx_offload_capa); + ports[res->port_id].dev_conf.txmode.offloads |= + (all_tunnel_tso & dev_info.tx_offload_capa); + printf("TSO segment size for tunneled packets is %d\n", + ports[res->port_id].tunnel_tso_segsz); } cmd_config_queue_tx_offloads(&ports[res->port_id]); -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-12-11 17:56:25.764149800 +0800 +++ 0083-app-testpmd-fix-tunnel-TSO-configuration.patch 2023-12-11 17:56:23.137652300 +0800 @@ -1 +1 @@ -From e43dc93803c4623840472c6109ef05e26286ec2f Mon Sep 17 00:00:00 2001 +From 5ff3454aace90a2441a256ed24e0c40def45bbaa Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit e43dc93803c4623840472c6109ef05e26286ec2f ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index 2e3365557a..a231d112b0 100644 +index 03926e2dbc..3a451b9fa0 100644 @@ -25 +27 @@ -@@ -5096,12 +5096,6 @@ cmd_tunnel_tso_set_parsed(void *parsed_result, +@@ -5011,12 +5011,6 @@ cmd_tunnel_tso_set_parsed(void *parsed_result, @@ -38 +40 @@ -@@ -5114,14 +5108,23 @@ cmd_tunnel_tso_set_parsed(void *parsed_result, +@@ -5029,14 +5023,23 @@ cmd_tunnel_tso_set_parsed(void *parsed_result,