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 05C70433D8 for ; Mon, 11 Dec 2023 11:20:19 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0057242D7D; Mon, 11 Dec 2023 11:20:19 +0100 (CET) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2040.outbound.protection.outlook.com [40.107.236.40]) by mails.dpdk.org (Postfix) with ESMTP id B852C42D90 for ; Mon, 11 Dec 2023 11:20:17 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gjlJDw0Cf51gzIE+AR74nm3AZEwrHtPiiRi++bcLjvPoZd+7qY/Yn91y+R3+N9eRAFvnzqhedIZRRPEIW+ta5mOwWrp2apH/v2QiT63TPkIfMRLtI56QLmyjh2XFHxWpYxidPHmpkk8+m6u6TioOkrWNx0QVC7uJRW5UWDH8/fRfEB9ZekF3UkMjenmXaUb71bfRHvLgjPq+A7K6LfHIatXVw9SmMS/oD8yZ7awBzmz5vlwHdV/arDgzQUy1649L4NPI4CfcH6TQ49t88HIoyg8jgZYPUMsTIvPiK1lWEwkb8NnMp4hK62KcJn5fbrzDEiN8K4Ym5p81PlsaQHqFzg== 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=rcQPWdZoNxekPB7N6RRHcWCcWmDxEmZvL/bAKBzAdDg=; b=moYgPkuAxW3ThWW9iqg6MaSL1hZlXOHVJXpTi4W8vhuGZYPuMdp9Q58QZXsCSpQs0oFPDcGZ2tsyQ3b7esXEa3Ug+nhVSVFM2MIaWFAlNqLKpU+QRwFa9x4lY1LaXz2d1/3A2T17KXLWq4jYItmg+2psYERqoqr/f7KlMdxO/3dhQcEGYEU6AN/lpEhpSnWO4Luztk+CaYUzJfGglUR7xx7OXrMlhe7C+steG0tEfsVxciAqa40V3cQjK7Z5U3sx4ZeJNlGjEvYYLmeNlYF3MFsYtpAZuWRGmQ0f/Z0jY9dkDdDGp4mQmMJ+1EcX8pfD9cik8apeLA1Ia+6IrZQzkA== 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=rcQPWdZoNxekPB7N6RRHcWCcWmDxEmZvL/bAKBzAdDg=; b=k2eqh3qBjUViAz/cQeYnsQJ9b4IafA7Zu5Ru4h6SjRcLSjGwU35Sqhs7b29nM5oBLVPPiD1LuhN4sMVarky+YCVLOxFgc3A2raU9lnTy7tFkwIcm+zwZCi7eHZsQqtPpIlWlU+gPPzxUWx/keDG4wyBPx4SousmO3xyBmF/JldWk4aLu+66dIv0Dgph/usrG6XT5dO/BKg8LLxkkr5Jf70cjyt3kHEDFPHvWxWubLCrqbT2fdrzJs+HgyfoRzqJxn7G42mqZhpCeTLALl6ue0K5iQE4YgW2kGLTgpYEJmzQZPwEw4QOY+7QHOXzv87o/iCo+xYC5ym5f+NikuU1tSw== Received: from CH0PR03CA0043.namprd03.prod.outlook.com (2603:10b6:610:b3::18) by DM4PR12MB6009.namprd12.prod.outlook.com (2603:10b6:8:69::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.33; Mon, 11 Dec 2023 10:20:09 +0000 Received: from CY4PEPF0000EE3D.namprd03.prod.outlook.com (2603:10b6:610:b3:cafe::5f) by CH0PR03CA0043.outlook.office365.com (2603:10b6:610:b3::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.32 via Frontend Transport; Mon, 11 Dec 2023 10:20:08 +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 CY4PEPF0000EE3D.mail.protection.outlook.com (10.167.242.17) 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:07 +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:19:57 -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:55 -0800 From: Xueming Li To: Huisong Li CC: Ferruh Yigit , dpdk stable Subject: patch 'app/testpmd: fix tunnel TSO capability check' has been queued to stable release 22.11.4 Date: Mon, 11 Dec 2023 18:11:46 +0800 Message-ID: <20231211101226.2122-82-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: CY4PEPF0000EE3D:EE_|DM4PR12MB6009:EE_ X-MS-Office365-Filtering-Correlation-Id: 611fe35a-c44b-4d88-2916-08dbfa32bff5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 33evm/hRe610t/4P/qeZ++d6NCDOc/o4HHelpa4uBC8Vv6NjywtFqRgxDxD1NTVWYFMmzB4dmyJZDadLrB4zn31uw7JDvPboVpEZEB1u2LjUI4sKnAz4g2PlxFqw9+XRghfupC53Jtv4sApC+EeYmz07thGS/8Ws7QcjCFYYSRs90SsLkVtpB8jjT03tVVSCUFt0vhbl2EVILBp66hmcTmq4xZEeEzBik1n24+tQC3YCjjN/yoWP6PG4rOcvZdovCC5gbU3rID8jXYCJUdSSPMlw5SeyyqVE/SU2kL3TYiFX9HoKKG+nIpWlCBNhHlLM2wFFCZGfryWsozpDJ1L399uwjUJXSaTmgsSBK9SP0hAno5BLS8SV5EAIYvYIiQdiYSxweOBJo7RSCmqrf8RO4MvjHLGyUIBphsoW6cWwTIaMoa9kqWW99K/agfPJwyRQtffuZkK9/cKmEMgfVT4XMYHNsHDDQrI+Wbs4OUUne59OgbnTlb127pW5033lbiN8NcDTi/wfZewEaY8n0VrNnskLqRiEX2HQobs3vrWLD7Rf6SWu853wLsympcSWXxv1s62ThU3LCRnW/eNc91omc8VcfyjXWGcj3yoGrKn6W314C1k8VLi3h0YMMfiTs3EHbUhfc/6Ka++v2FwksmmXtOBXFYMTRO9R3KIigAWFqFzRRXn5rTU6HTsFMjU4I6b5UFZSTKNbsrssGEUn0uL/dfGaO8TXhL+AekSHJ6+qRDN22th8lljrTmAiKGHC81mBmgHtLp4f+CjKeI0QAhhigEusFulavXWuNxCMapKFG0riYLIYvN7zZVYrPfMcTFPG 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)(376002)(39850400004)(346002)(396003)(230173577357003)(230922051799003)(230273577357003)(451199024)(64100799003)(82310400011)(1800799012)(186009)(36840700001)(46966006)(40470700004)(40460700003)(53546011)(36860700001)(5660300002)(6286002)(1076003)(47076005)(336012)(26005)(2616005)(16526019)(36756003)(55016003)(7636003)(4001150100001)(426003)(70586007)(70206006)(6916009)(54906003)(966005)(40480700001)(2906002)(83380400001)(82740400003)(41300700001)(356005)(478600001)(7696005)(86362001)(8676002)(8936002)(4326008)(316002)(6666004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 10:20:07.7474 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 611fe35a-c44b-4d88-2916-08dbfa32bff5 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: CY4PEPF0000EE3D.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB6009 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=6f1c35e7a802084271fedcfcf9590785d8c30723 Thanks. Xueming Li --- >From 6f1c35e7a802084271fedcfcf9590785d8c30723 Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Sat, 11 Nov 2023 12:59:41 +0800 Subject: [PATCH] app/testpmd: fix tunnel TSO capability check Cc: Xueming Li [ upstream commit 6d4def820aa7d118f1ebdebf7af8ba6299ac20ee ] Currently, testpmd set tunnel TSO offload even if fail to get dev_info. In this case, the 'tx_offload_capa' in dev_info is a random value, Fixes: 6f51deb903b2 ("app/testpmd: check status of getting ethdev info") Signed-off-by: Huisong Li Reviewed-by: Ferruh Yigit --- app/test-pmd/cmdline.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index d24d16c7e0..a45743dd86 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -4950,39 +4950,33 @@ struct cmd_tunnel_tso_set_result { portid_t port_id; }; -static struct rte_eth_dev_info -check_tunnel_tso_nic_support(portid_t port_id) +static void +check_tunnel_tso_nic_support(portid_t port_id, uint64_t tx_offload_capa) { - struct rte_eth_dev_info dev_info; - - if (eth_dev_info_get_print_err(port_id, &dev_info) != 0) - return dev_info; - - if (!(dev_info.tx_offload_capa & RTE_ETH_TX_OFFLOAD_VXLAN_TNL_TSO)) + 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", port_id); - if (!(dev_info.tx_offload_capa & RTE_ETH_TX_OFFLOAD_GRE_TNL_TSO)) + 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", port_id); - if (!(dev_info.tx_offload_capa & RTE_ETH_TX_OFFLOAD_IPIP_TNL_TSO)) + 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", port_id); - if (!(dev_info.tx_offload_capa & RTE_ETH_TX_OFFLOAD_GENEVE_TNL_TSO)) + 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", port_id); - if (!(dev_info.tx_offload_capa & RTE_ETH_TX_OFFLOAD_IP_TNL_TSO)) + 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", port_id); - if (!(dev_info.tx_offload_capa & RTE_ETH_TX_OFFLOAD_UDP_TNL_TSO)) + 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", port_id); - return dev_info; } static void @@ -4992,6 +4986,7 @@ cmd_tunnel_tso_set_parsed(void *parsed_result, { struct cmd_tunnel_tso_set_result *res = parsed_result; struct rte_eth_dev_info dev_info; + int ret; if (port_id_is_invalid(res->port_id, ENABLED_WARN)) return; @@ -5003,7 +4998,11 @@ cmd_tunnel_tso_set_parsed(void *parsed_result, if (!strcmp(res->mode, "set")) ports[res->port_id].tunnel_tso_segsz = res->tso_segsz; - dev_info = check_tunnel_tso_nic_support(res->port_id); + 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 | -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-12-11 17:56:25.691185000 +0800 +++ 0081-app-testpmd-fix-tunnel-TSO-capability-check.patch 2023-12-11 17:56:23.117652300 +0800 @@ -1 +1 @@ -From 6d4def820aa7d118f1ebdebf7af8ba6299ac20ee Mon Sep 17 00:00:00 2001 +From 6f1c35e7a802084271fedcfcf9590785d8c30723 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 6d4def820aa7d118f1ebdebf7af8ba6299ac20ee ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -19 +21 @@ -index d68418bc67..1fffb07db1 100644 +index d24d16c7e0..a45743dd86 100644 @@ -22 +24 @@ -@@ -5035,39 +5035,33 @@ struct cmd_tunnel_tso_set_result { +@@ -4950,39 +4950,33 @@ struct cmd_tunnel_tso_set_result { @@ -70 +72 @@ -@@ -5077,6 +5071,7 @@ cmd_tunnel_tso_set_parsed(void *parsed_result, +@@ -4992,6 +4986,7 @@ cmd_tunnel_tso_set_parsed(void *parsed_result, @@ -78 +80 @@ -@@ -5088,7 +5083,11 @@ cmd_tunnel_tso_set_parsed(void *parsed_result, +@@ -5003,7 +4998,11 @@ cmd_tunnel_tso_set_parsed(void *parsed_result,