From patchwork Fri Jun 30 10:51:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bing Zhao X-Patchwork-Id: 129159 X-Patchwork-Delegate: rasland@nvidia.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id F407042D94; Fri, 30 Jun 2023 12:52:04 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CA07040EDB; Fri, 30 Jun 2023 12:52:04 +0200 (CEST) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2047.outbound.protection.outlook.com [40.107.102.47]) by mails.dpdk.org (Postfix) with ESMTP id 0FD03406B5; Fri, 30 Jun 2023 12:52:04 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kTgq/3Ea0//yS1cF9tbTopuUBZxg8/DpmzW9wgsEZUJtYwXEz291UWWN6Bzxjq9Q8neV/roiOF35R/kEfb1MMbMnGAH8/8o3XzrOLKBoAQ1xCJPTK6N5KoH0RB6zl1JtHBoRLauq2hqSqB6tP+LEVRvuBh2Grznz3oVsJWVrQbW+VyS6rlCigkhVZ/QRFc6iXlmEpLxt1TSNfqbT+xXbqZu+x2eSiCKD8rxcp9oXYlM+7he6AiwM/ig64Ba9at3wYt7JdQrIpvo2euYfOLl/FOtB5NZO0g+98H07GKFNdYDVQRUJyJQVy15nwKN4K/Dc0o0tO2WdvLJflCiUS7VS6w== 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=fOhIssYgC3iSDcpuSP8kxAFQndrjnkQ6yI6gVknc+hA=; b=dmHdeskjj9Nvb9opoVLDvz0jpxvsoT+XMnGy2YskdRHdmkek76qri/kT0U6yRdkT4aCeaDAyFKl9dETioAuj6SHU+tY59n3SbJSKfYc8MJQgdQans5OKOxwStY1PwiQRwr+F8Es0S/yJmbCQHbW/TO68f1ZY2g7PsXlFOoOuJ4mZIWzcZ8Np09NnAc7TXuFO6Zb+j7ud1qMVBoLjz7dEFHlh53UIWg6D/0s4S8NQ4/Pm3hZBL7DAOM4CA9Ool8n+PmhTmxg7eGUI8PJ/yjk4kDPxjh3v2/FDCClhmfSejisDGX6kQjF3qf9M3RoWmhq8+Qf53bgVcr68KMg60R5ePg== 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=fOhIssYgC3iSDcpuSP8kxAFQndrjnkQ6yI6gVknc+hA=; b=dpW7nY2Ezs0uVl4q2vE4jQDpYT/UxgWeneavB9GlMGKa9kYpfu0f+qU6wt+4NI35Bi3hwE43yURIEshXwKtOeaOTNE+l8u6rX4GGwwSPL//9AMogW17HFDpeFKwPqV8Sa2OOyTr+FbhozU1Jl0vusZ9GV1gSEo2mK7IgfifKO5RumDBsQqBLx06UMI1ExalT5FrYcl/zvKvil1dbuFogkgng540iRl92/ijw8LnDygjORIAJrPnHVGz6A0VW33QbowGZ5dS0R7cWMlcdd3FMs1E1K9dbtxbgQ/raG8CHB88CC/WYY5vmzNITnwOhVJ+FriL2vwAsX/eMNUXXY2Lx+Q== Received: from MW4PR04CA0183.namprd04.prod.outlook.com (2603:10b6:303:86::8) by BL1PR12MB5754.namprd12.prod.outlook.com (2603:10b6:208:391::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.26; Fri, 30 Jun 2023 10:52:01 +0000 Received: from CO1NAM11FT043.eop-nam11.prod.protection.outlook.com (2603:10b6:303:86:cafe::16) by MW4PR04CA0183.outlook.office365.com (2603:10b6:303:86::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6544.22 via Frontend Transport; Fri, 30 Jun 2023 10:52:01 +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 CO1NAM11FT043.mail.protection.outlook.com (10.13.174.193) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.49 via Frontend Transport; Fri, 30 Jun 2023 10:52:00 +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; Fri, 30 Jun 2023 03:51:50 -0700 Received: from nvidia.com (10.126.230.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.37; Fri, 30 Jun 2023 03:51:47 -0700 From: Bing Zhao To: , , , , CC: , , Subject: [PATCH v2] net/mlx5: fix the error in VLAN actions creation Date: Fri, 30 Jun 2023 13:51:29 +0300 Message-ID: <20230630105129.434516-1-bingz@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230630063950.432641-1-bingz@nvidia.com> References: <20230630063950.432641-1-bingz@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.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: CO1NAM11FT043:EE_|BL1PR12MB5754:EE_ X-MS-Office365-Filtering-Correlation-Id: fe75b31a-0810-44b9-a758-08db7958087d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CkaWFqAyNOxFzJlUgspL/WlbTKB723gRv1PYbHBbJ5EcP/O2deKgqwpt5hmTNTYKHWo8+YR2HN6zwQSOintUTNGo8JUhUxNwanG+ffe/xP7mJkuQZ5K2aYH4D+exUKkJ8CwBTkkgwaUD7E6pHgfgu+zsE2XQIOk8beibHJwXNpAnHIjnl0Vyc9FiDy0ehL2iBCbUgD5FFLvvjnK2i2v4Cm4NwrEHRL9w/aVQZ/MNbqqilX2mE0clcRBxipvmy6A8zEW5SoPMTiUohG5d3nEpIS8HBp1YZNxLqPMOjQx6akXr40pE90sWVRTmfJTCwHWznXwfbJU/zm+s3QZV5gOxr8rfOAecmNPKo+YXQnJZBshSerfOwu6QuAPomKOm4iQ16pKFKy742IbIZHpipynUUEu/mjNXnA7Dszhyn1HpOimhfYUlQlt6uLKaVNKHmH5ziiyEr74x6cOnvWotAsuZWF3Bq1LXJ38jq40G3lMjIhlFZdFf4qOxQz9l2JRxXyj/87rUJMEsDRx4qDSEBtpwAU0VM4BOtL59uS045DaQz2eIVfjahUqbZasta6E2wVanzi3K8/PtnY2BtmFheglLd+XL9sHE4OsM4V/CSLTdydZJfSLTsQhPmrI4KTI5lzT1xzsRDPGF3LiNTvK8NKxkqjvpNpQ+sULNx4FjkYay6DUc9vKhiQycqOPVr7p0E9UfK/+9KI4kOKcC8idTmrQ6l6Hq+MCcbJVqyMEM+b9OXIm/6Nm2xt4kDjXKh1uCG/Dw 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)(396003)(39860400002)(346002)(136003)(376002)(451199021)(40470700004)(46966006)(36840700001)(82310400005)(8676002)(36860700001)(2906002)(356005)(16526019)(186003)(1076003)(36756003)(41300700001)(40460700003)(316002)(5660300002)(70206006)(86362001)(55016003)(70586007)(4326008)(8936002)(82740400003)(6636002)(40480700001)(450100002)(7636003)(478600001)(6286002)(7696005)(26005)(47076005)(6666004)(2616005)(54906003)(83380400001)(426003)(110136005)(336012); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2023 10:52:00.8186 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fe75b31a-0810-44b9-a758-08db7958087d 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: CO1NAM11FT043.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5754 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org 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 explict message. Fixes: 773ca0e91ba1 ("net/mlx5: support VLAN push/pop/modify with HWS") Cc: getelson@nvidia.com Cc: stable@dpdk.org Signed-off-by: Bing Zhao Acked-by: Ori Kam --- v2: add CC stable --- 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 20941b4fc7..36a7f0989c 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -7125,27 +7125,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; } @@ -7920,8 +7921,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)