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 B2AA54301F for ; Thu, 10 Aug 2023 02:02:21 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AC7C240DD8; Thu, 10 Aug 2023 02:02:21 +0200 (CEST) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2040.outbound.protection.outlook.com [40.107.212.40]) by mails.dpdk.org (Postfix) with ESMTP id 9B8EC406B6 for ; Thu, 10 Aug 2023 02:02:20 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KFKaQNm7RsmdziwX8kQpWbhlYsl4vX4YxLS2otp2Jlz1nRmNE3o6CfT0ypGY4x7R52RZQYoD7/Axposqx609XE/0gI8ZEfgiD6xhYHPPXW/S3NyWV4T9PslPZC+/gMIo1SdO/dE7zVHcLe8chC+odl2IxfvAMFphZwW2FNJIHWak4oonN1HKcHATQeW+kO9OmnGy0ulU7DTJByXugX1JE0zPXBACpD4mC8ln90aFc3wVF6SeH+fbTSB7aVBvbCWXLlhZDeiUWKMNYxd0SJ3w4xJNI0BeopF9rz0GH6XJGk4IYvVFLyDZ0cMDPkKLSmCCKCcuoXLq8/PqglytV+nCOQ== 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=bI1YEsy/bpjLpkm1Osy4R51o/IpQxrUDfLuoQBlgssg=; b=SbpnUYWJ68ucU1ZBQjX1S2TqEF1PUh+AJdpVd0L/naRs90ia3gMHA4c2qYSNFUzlv9VRXkmGPr/tNqlwU/ggsZNHKMkUCOitSya581+78NmyvpO0VDcUEQCF2QCOcR+5lRkYPz+cEIgqX0FvWpxIbSAfVHUeTBgXMb8uU9WgK4Gu40/ms2a86mAvL3Vtt/0yUh88PfvmsCCOvu4WeRV7M/f7sGdJyt+BMfawewbq8vOoyH4hlTpqk27grCuNeOT+H5yybeiNMvsc07QI39OEGVkmQ2k3r1K5QS9SE+aULGffigz4gdVzfq2oHRF6ZHGINPJ3lpCPSthygwkOtHmiyg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=dpdk.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 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=bI1YEsy/bpjLpkm1Osy4R51o/IpQxrUDfLuoQBlgssg=; b=OnuvjQdeo+zmBZsFCFz/9qBn9AVgxCGQCA8ZaQx/Y0Falwh56ws9vq+WzGsdwbAL9fDg3y5/PDjFEApR0DA27jKufDTFDoxXTjk6KmVmQD8VMoku7HgHlvZoV6dEcViwcRJA/wcFNCDT7EoLqe8Wl0jDpgdkg6n7HhVo8D378zMRmd1Q4iqABVzxASnsxqPJqqIPWmAZwna26IAadD+1u7PCNe02HvzbwmWN6eZX04Tuqbr4z4X61jeKzKKZ8oHak85XMs1gHGCSU03Ofc17OynLhjUK+Xi+i4BqIylCdHzqGqqa9SKaCNpULOyFTwXHT2K054X85G84zd95J/s/nw== Received: from CYZPR14CA0028.namprd14.prod.outlook.com (2603:10b6:930:a0::7) by PH7PR12MB7138.namprd12.prod.outlook.com (2603:10b6:510:1ee::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.30; Thu, 10 Aug 2023 00:02:19 +0000 Received: from CY4PEPF0000EDD0.namprd03.prod.outlook.com (2603:10b6:930:a0:cafe::f6) by CYZPR14CA0028.outlook.office365.com (2603:10b6:930:a0::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.30 via Frontend Transport; Thu, 10 Aug 2023 00:02:18 +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 CY4PEPF0000EDD0.mail.protection.outlook.com (10.167.241.204) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.19 via Frontend Transport; Thu, 10 Aug 2023 00:02:18 +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.5; Wed, 9 Aug 2023 17:02:06 -0700 Received: from nvidia.com (10.126.230.37) 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.37; Wed, 9 Aug 2023 17:02:04 -0700 From: Xueming Li To: Bing Zhao CC: Ori Kam , dpdk stable Subject: patch 'net/mlx5: fix error in VLAN actions creation' has been queued to stable release 22.11.3 Date: Thu, 10 Aug 2023 07:58:57 +0800 Message-ID: <20230809235947.1187-25-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230809235947.1187-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> <20230809235947.1187-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.37] 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: CY4PEPF0000EDD0:EE_|PH7PR12MB7138:EE_ X-MS-Office365-Filtering-Correlation-Id: 9375d8a5-014e-410c-8cb4-08db99351053 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: d93KYJaHSQ0FLT1JgFgFOLgjIfDlwuNaH8WoS6FFK1S0gdH6fYabxE2OMM44QPXb7eyVrN7GPIBbVtO9wMLsBmTAUBrPlsAP3k2Z7KnqYCYQwzkWK12nnP73SX9jZDZe/Kyp2EtsJ4qIvXq27NETaQHK/HD6Gr/GWkSxVbxvqaJ6ZCtZxQciQ305ESGnSkwYMWuFFtPC/+MfMVyAraj3win4OHkt83mz4R8pSxou0iJyltptfWB5sMeYeFh+YyAnvBKLUHA9X16FkGRca6jciJpMyD5g7xqyX/pxmxKIrPlF71RObVXtH2hCW4h7SkSJZ+TxjEdOAyg3cT8fmhXfWWd0ntVZfoDHlsq501NqWX3fnppu9P/EmqQ1KhnA4hh/zqmlVEwTiZ+fJdM4Tgva1Zu7WC8GlKlw814o81wbvo5NQRNfu3XqpCdHoPOIej2jK4PiEWobBVnuArntURcAnQ3LNB0acL5BPB6RAgezhshuYQ7fo/YFU+pAwmJNo4Vr07X2vusRsHS/j2oe7YaKRl4MlrCVfOUiuNB983oa4lXBx6ysC3hAPmPuTs8qG3JpLDYwvJ6UOwPWWvtMtBQYDeP5kiKErCBzUe0WJN/a0npdbmKLZ5lFOnigr6vwS2YKRHoMYM7RQypLuk93cWu796nacMMrq5ztMdqhZlEJh9TJpWLu7O1dcOTPcy3Niv4Y0RRcfi0mtbBVYsfUB4qPlMGe5Wji5XDWVxnoLFUT5ADpQI1VNxYdzVAcX8xrSHSVvgs0GUKgJeQvYuE0UtYpIA== 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:(13230028)(4636009)(39860400002)(346002)(376002)(136003)(396003)(451199021)(82310400008)(1800799006)(186006)(40470700004)(36840700001)(46966006)(426003)(40460700003)(83380400001)(7636003)(6286002)(16526019)(2906002)(336012)(2616005)(55016003)(40480700001)(37006003)(54906003)(86362001)(478600001)(36756003)(316002)(53546011)(82740400003)(1076003)(26005)(6666004)(5660300002)(41300700001)(7696005)(8936002)(8676002)(6862004)(36860700001)(70586007)(966005)(356005)(6636002)(70206006)(4326008)(47076005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Aug 2023 00:02:18.8034 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9375d8a5-014e-410c-8cb4-08db99351053 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: CY4PEPF0000EDD0.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB7138 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/11/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=cd3b1b95407047a472742bf6606c71cbe34015a1 Thanks. Xueming Li --- >From cd3b1b95407047a472742bf6606c71cbe34015a1 Mon Sep 17 00:00:00 2001 From: Bing Zhao Date: Fri, 30 Jun 2023 14:02:05 +0300 Subject: [PATCH] net/mlx5: fix error in VLAN actions creation Cc: Xueming Li [ upstream commit 90923d80e22a80a2f97a1f11b340b15991a7c86a ] When a failure occurs during the VLAN actions creating, the value of "rte_errno" is already set by the mlx5dr_action_create*. The value can be returned directly to reflect the actual reason. In the meanwhile, the "rte_flow_error" structure should also be set with clear message explicitly. Fixes: 773ca0e91ba1 ("net/mlx5: support VLAN push/pop/modify with HWS") Signed-off-by: Bing Zhao Acked-by: Ori Kam --- drivers/net/mlx5/mlx5_flow_hw.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index 5fe4cfa071..a3fd87b16f 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -6447,27 +6447,28 @@ flow_hw_create_vlan(struct rte_eth_dev *dev) MLX5DR_ACTION_FLAG_HWS_FDB }; + /* rte_errno is set in the mlx5dr_action* functions. */ for (i = MLX5DR_TABLE_TYPE_NIC_RX; i <= MLX5DR_TABLE_TYPE_NIC_TX; i++) { priv->hw_pop_vlan[i] = mlx5dr_action_create_pop_vlan(priv->dr_ctx, flags[i]); if (!priv->hw_pop_vlan[i]) - return -ENOENT; + return -rte_errno; priv->hw_push_vlan[i] = mlx5dr_action_create_push_vlan(priv->dr_ctx, flags[i]); if (!priv->hw_pop_vlan[i]) - return -ENOENT; + return -rte_errno; } if (priv->sh->config.dv_esw_en && priv->master) { priv->hw_pop_vlan[MLX5DR_TABLE_TYPE_FDB] = mlx5dr_action_create_pop_vlan (priv->dr_ctx, MLX5DR_ACTION_FLAG_HWS_FDB); if (!priv->hw_pop_vlan[MLX5DR_TABLE_TYPE_FDB]) - return -ENOENT; + return -rte_errno; priv->hw_push_vlan[MLX5DR_TABLE_TYPE_FDB] = mlx5dr_action_create_push_vlan (priv->dr_ctx, MLX5DR_ACTION_FLAG_HWS_FDB); if (!priv->hw_pop_vlan[MLX5DR_TABLE_TYPE_FDB]) - return -ENOENT; + return -rte_errno; } return 0; } @@ -7079,8 +7080,11 @@ flow_hw_configure(struct rte_eth_dev *dev, } } ret = flow_hw_create_vlan(dev); - if (ret) + if (ret) { + rte_flow_error_set(error, -ret, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, "Failed to VLAN actions."); goto err; + } if (_queue_attr) mlx5_free(_queue_attr); if (port_attr->flags & RTE_FLOW_PORT_FLAG_STRICT_QUEUE) -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-08-09 21:51:20.166302900 +0800 +++ 0078-net-mlx5-fix-error-in-VLAN-actions-creation.patch 2023-08-09 21:51:18.234352000 +0800 @@ -1 +1 @@ -From 90923d80e22a80a2f97a1f11b340b15991a7c86a Mon Sep 17 00:00:00 2001 +From cd3b1b95407047a472742bf6606c71cbe34015a1 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 90923d80e22a80a2f97a1f11b340b15991a7c86a ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -23 +25 @@ -index 0c72324617..cbdac2996c 100644 +index 5fe4cfa071..a3fd87b16f 100644 @@ -26 +28 @@ -@@ -7129,27 +7129,28 @@ flow_hw_create_vlan(struct rte_eth_dev *dev) +@@ -6447,27 +6447,28 @@ flow_hw_create_vlan(struct rte_eth_dev *dev) @@ -59 +61 @@ -@@ -7921,8 +7922,11 @@ flow_hw_configure(struct rte_eth_dev *dev, +@@ -7079,8 +7080,11 @@ flow_hw_configure(struct rte_eth_dev *dev,