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 8FAF8433D8 for ; Mon, 11 Dec 2023 11:20:17 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 897EA42D6B; Mon, 11 Dec 2023 11:20:17 +0100 (CET) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2073.outbound.protection.outlook.com [40.107.243.73]) by mails.dpdk.org (Postfix) with ESMTP id BA99040E0F for ; Mon, 11 Dec 2023 11:20:15 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ihdDqsKPv+hA9e6/HzigeDkjlVwMXSJ1tpflxQJDDmHyVfRIO8looDkwJ2JmKKGop5GpLCQ5+kjMBm9LJlnoNgzooOv8xri5TqWyze6xTXcW7L8WGKaO5Q3W3Uia0wABCqoGMvspeNDamrl7iJR9yMifmz7uNQIkfXTs18njciro4mSTiWoq8stPZCv+Oi134y7DVqT1TtO8B5JIlg6Q3cQR4tQZG0IoGBQMlH2Jj1rQ7YKaAg035tcLJ6nDtClhwGloMZl8OmzT93GZOBfmMKpltQ3zC9wLHXI0G1DyW8j9pbp5RU9SvgajD+08wLV8gJq5jTVB2MH+VIqmO9tWJw== 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=8jn1mo1VFILGH//SNOvRzR3rzJofksf8QjiZDi1nacg=; b=euW/74vf+LPQAZYWSrDY0tpb3dJSrFLXkOLZ0vnH78BltFStBxfjq8TxRrmIWLWfenANZ7Ua3Qcyre+gY64ICfHiCRvCRe6V8rfxJkvXDFFOyk5otjX2unU34KlhoL9noHa7eDfeKuw3mmCkt/q68L3dIcHdbyENKYx//0X745yt0wIeMCGdS/mBpIQ+E+PAJxTi8FWa+jgKSAkbn6AQvYUpyan84RZMet33IuMomt/nsdUWPSdo6zEmZ/m/jaHaUvZV+ORH0UKKWX/2OxWJuj+n+XqHkRL1GzhDiYPVNz5nH1HTfuL71AcduWYtTgdktNHHi2AOgscdi74Hd9mGxA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) 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=8jn1mo1VFILGH//SNOvRzR3rzJofksf8QjiZDi1nacg=; b=o7SXPpaqvt2RfZ2hm+FPjTCzQhQN4BMH8+bWd1JEANCbwM2XORoVF4ZnunKEEJe8YddYL1P4k+8Yxafk0tfPBaHv1pG1kMcsbMqIaCOsbnK0e5F1VaYlF3VlmD5Ch5WE6Hzk9GvFelduwl0zRk+0ngivMWwMGkkJnauCxAB+zLvwq2B18yixBJV1mUcMIf0cJTwYqAvM0K7xK/xBZABznuCaYjHa9db5qneI7dW0jTEAEia2g04FZ6WHBjPE2+pGFRd8Kr54mVjJBFZ4t33AaIRgdWAWPL4iDdPxvy9i5sSHTk/TfWj1wM9tbJ1xbyq46Xe1phY1C08puhGjPUoW6g== Received: from PH8PR05CA0023.namprd05.prod.outlook.com (2603:10b6:510:2cc::8) by SJ2PR12MB9116.namprd12.prod.outlook.com (2603:10b6:a03:557::18) 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:13 +0000 Received: from SN1PEPF000252A1.namprd05.prod.outlook.com (2603:10b6:510:2cc:cafe::d0) by PH8PR05CA0023.outlook.office365.com (2603:10b6:510:2cc::8) 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:13 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by SN1PEPF000252A1.mail.protection.outlook.com (10.167.242.8) 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:11 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) 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:58 -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:57 -0800 From: Xueming Li To: Huisong Li CC: Ferruh Yigit , dpdk stable Subject: patch 'app/testpmd: add explicit check for tunnel TSO' has been queued to stable release 22.11.4 Date: Mon, 11 Dec 2023 18:11:47 +0800 Message-ID: <20231211101226.2122-83-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: SN1PEPF000252A1:EE_|SJ2PR12MB9116:EE_ X-MS-Office365-Filtering-Correlation-Id: b44f1f8f-36d1-4a1b-f1d5-08dbfa32c268 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: a0bqMo+ViVJguryOcGilxfjJ5CWhBHLddYDQgg7GGXhDw61tF2KLH96M+aU3qzGP4djh73NbWEqJ1fEsooS04WmL0CdFyv4zXwm2RiK44iV3Cm0MsYW9S6+L2JzrOmSW0WwYpyEK4ZAa9aXNZC3QT2twtIv+hg290yly7cdr2TbJx2VP39kig21jc3Sy2eHUsDij2UkLc/RLfCRD/6UYYBEbaLz9BCrOt5ESFVzoZlkh+phqWwU6SyfEEVdJsw8fnZQsaukfqXO8Kd67UXI7kx6YQutScnAVZbZTwesGElyyDD3VQyWRhGuAQHOVxEDD+BIOJ2234sLX2V31YvBCluce/3GCZTnj1ZVJ6SRwr/lG3/3zvHLLesuHG19N8m1ZnOQMpKfPhQQjM9tZvkGfUG7p36651/eK6pFjdlM/jvd1Bq+5er0Gj35e3zIqwGmG9SUFoLaqIlKl5GWJWTLAA16kJLrUDihrhbHqq1qbPxHUvoAjRuL6P0OPETtArdx578NCPwUy2ePeKqJ0LkmLUubHmMRJe41bSanseoCzGNTIo3/tlF/meTWCAikisuZS2EPG4Ex+qtNkixoYQKKyuLrMlxYI2TvNAxqrf6ChY7zzXov2u+6GWze3aqyh8S83B9qatZ6AlFHGNmLHfyGONbTs5cK1i1hOXm49fAT9T+PK19peQHWbgwaR4AWZ1q+go6DRfBS4U/eTcK5KqS4OdDF9kFeKozy65sQCAsjbU9ij8YOLx/SEUIrk3SkRDmWbNVL8rfyatlQsSRVn/lYi0LZ49G9Ij0WlKxNczScfleLrP2gh+RoF5x+Nir9u8FoA X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.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:11.8617 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b44f1f8f-36d1-4a1b-f1d5-08dbfa32c268 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.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF000252A1.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB9116 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=2959baf71f1e4c5146f7e9dd2317ef084de026de Thanks. Xueming Li --- >From 2959baf71f1e4c5146f7e9dd2317ef084de026de Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Sat, 11 Nov 2023 12:59:42 +0800 Subject: [PATCH] app/testpmd: add explicit check for tunnel TSO Cc: Xueming Li [ upstream commit 33156a6bc61560e74a126ade38a7af9c1fa02671 ] If port don't support TSO of tunnel packets, tell user in advance and no need to change other configuration of this port in case of fault spread. In addition, if some tunnel offloads don't support, which is not an error case, the log about this shouldn't be to stderr. Fixes: 3926dd2b6668 ("app/testpmd: enforce offload capabilities check") Signed-off-by: Huisong Li Reviewed-by: Ferruh Yigit --- app/test-pmd/cmdline.c | 55 ++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 31 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index a45743dd86..03926e2dbc 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -4954,28 +4954,22 @@ static void check_tunnel_tso_nic_support(portid_t port_id, uint64_t tx_offload_capa) { if (!(tx_offload_capa & RTE_ETH_TX_OFFLOAD_VXLAN_TNL_TSO)) - fprintf(stderr, - "Warning: VXLAN TUNNEL TSO not supported therefore not enabled for port %d\n", + printf("Warning: VXLAN TUNNEL TSO not supported therefore not enabled for port %d\n", port_id); if (!(tx_offload_capa & RTE_ETH_TX_OFFLOAD_GRE_TNL_TSO)) - fprintf(stderr, - "Warning: GRE TUNNEL TSO not supported therefore not enabled for port %d\n", + printf("Warning: GRE TUNNEL TSO not supported therefore not enabled for port %d\n", port_id); if (!(tx_offload_capa & RTE_ETH_TX_OFFLOAD_IPIP_TNL_TSO)) - fprintf(stderr, - "Warning: IPIP TUNNEL TSO not supported therefore not enabled for port %d\n", + printf("Warning: IPIP TUNNEL TSO not supported therefore not enabled for port %d\n", port_id); if (!(tx_offload_capa & RTE_ETH_TX_OFFLOAD_GENEVE_TNL_TSO)) - fprintf(stderr, - "Warning: GENEVE TUNNEL TSO not supported therefore not enabled for port %d\n", + printf("Warning: GENEVE TUNNEL TSO not supported therefore not enabled for port %d\n", port_id); if (!(tx_offload_capa & RTE_ETH_TX_OFFLOAD_IP_TNL_TSO)) - fprintf(stderr, - "Warning: IP TUNNEL TSO not supported therefore not enabled for port %d\n", + printf("Warning: IP TUNNEL TSO not supported therefore not enabled for port %d\n", port_id); if (!(tx_offload_capa & RTE_ETH_TX_OFFLOAD_UDP_TNL_TSO)) - fprintf(stderr, - "Warning: UDP TUNNEL TSO not supported therefore not enabled for port %d\n", + printf("Warning: UDP TUNNEL TSO not supported therefore not enabled for port %d\n", port_id); } @@ -4986,6 +4980,12 @@ cmd_tunnel_tso_set_parsed(void *parsed_result, { struct cmd_tunnel_tso_set_result *res = parsed_result; struct rte_eth_dev_info dev_info; + uint64_t all_tunnel_tso = RTE_ETH_TX_OFFLOAD_VXLAN_TNL_TSO | + RTE_ETH_TX_OFFLOAD_GRE_TNL_TSO | + RTE_ETH_TX_OFFLOAD_IPIP_TNL_TSO | + RTE_ETH_TX_OFFLOAD_GENEVE_TNL_TSO | + RTE_ETH_TX_OFFLOAD_IP_TNL_TSO | + RTE_ETH_TX_OFFLOAD_UDP_TNL_TSO; int ret; if (port_id_is_invalid(res->port_id, ENABLED_WARN)) @@ -4998,30 +4998,23 @@ cmd_tunnel_tso_set_parsed(void *parsed_result, if (!strcmp(res->mode, "set")) ports[res->port_id].tunnel_tso_segsz = res->tso_segsz; - ret = eth_dev_info_get_print_err(res->port_id, &dev_info); - if (ret != 0) - return; - - check_tunnel_tso_nic_support(res->port_id, dev_info.tx_offload_capa); if (ports[res->port_id].tunnel_tso_segsz == 0) { - ports[res->port_id].dev_conf.txmode.offloads &= - ~(RTE_ETH_TX_OFFLOAD_VXLAN_TNL_TSO | - RTE_ETH_TX_OFFLOAD_GRE_TNL_TSO | - RTE_ETH_TX_OFFLOAD_IPIP_TNL_TSO | - RTE_ETH_TX_OFFLOAD_GENEVE_TNL_TSO | - RTE_ETH_TX_OFFLOAD_IP_TNL_TSO | - RTE_ETH_TX_OFFLOAD_UDP_TNL_TSO); + ports[res->port_id].dev_conf.txmode.offloads &= ~all_tunnel_tso; printf("TSO for tunneled packets is disabled\n"); } else { - uint64_t tso_offloads = (RTE_ETH_TX_OFFLOAD_VXLAN_TNL_TSO | - RTE_ETH_TX_OFFLOAD_GRE_TNL_TSO | - RTE_ETH_TX_OFFLOAD_IPIP_TNL_TSO | - RTE_ETH_TX_OFFLOAD_GENEVE_TNL_TSO | - RTE_ETH_TX_OFFLOAD_IP_TNL_TSO | - RTE_ETH_TX_OFFLOAD_UDP_TNL_TSO); + ret = eth_dev_info_get_print_err(res->port_id, &dev_info); + if (ret != 0) + return; + + if ((all_tunnel_tso & dev_info.tx_offload_capa) == 0) { + fprintf(stderr, "Error: port=%u don't support tunnel TSO offloads.\n", + 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 |= - (tso_offloads & dev_info.tx_offload_capa); + (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); -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-12-11 17:56:25.724223800 +0800 +++ 0082-app-testpmd-add-explicit-check-for-tunnel-TSO.patch 2023-12-11 17:56:23.127652300 +0800 @@ -1 +1 @@ -From 33156a6bc61560e74a126ade38a7af9c1fa02671 Mon Sep 17 00:00:00 2001 +From 2959baf71f1e4c5146f7e9dd2317ef084de026de Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 33156a6bc61560e74a126ade38a7af9c1fa02671 ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index 1fffb07db1..2e3365557a 100644 +index a45743dd86..03926e2dbc 100644 @@ -25 +27 @@ -@@ -5039,28 +5039,22 @@ static void +@@ -4954,28 +4954,22 @@ static void @@ -60 +62 @@ -@@ -5071,6 +5065,12 @@ cmd_tunnel_tso_set_parsed(void *parsed_result, +@@ -4986,6 +4980,12 @@ cmd_tunnel_tso_set_parsed(void *parsed_result, @@ -73 +75 @@ -@@ -5083,30 +5083,23 @@ cmd_tunnel_tso_set_parsed(void *parsed_result, +@@ -4998,30 +4998,23 @@ cmd_tunnel_tso_set_parsed(void *parsed_result,