From patchwork Fri Jun 30 11:02:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bing Zhao X-Patchwork-Id: 129160 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 A433842D94; Fri, 30 Jun 2023 13:02:38 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 33D94406B6; Fri, 30 Jun 2023 13:02:38 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2073.outbound.protection.outlook.com [40.107.94.73]) by mails.dpdk.org (Postfix) with ESMTP id 1D59A406B5; Fri, 30 Jun 2023 13:02:37 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NqBpDPIAkrk2QIx/EF5TyvXokH+c5Z21ZAkPnBCe812uoovI3p93rXgt8xUOTuyiuZHR2TXLfWK+b58KwEgh/AT8TB/PBCNRmuMfTC37KEskc56F+BRXn0aSVTE5hAX5Bvjr7Y3FPtf2lfVNPMecL7dGKUdgkFiLNdLwqH54IYNddU9Rm72VcBSnsClUQUiOinwc774jpQNNFI5eNgw5boHJ9KRkcNiiLcJ2J2M2lEB3c+K7KmjDQHXi0knFbQ2SZTkEXcN+hSucK+NNI7Y/IpFWBZyE8F0pIfUkgjk/eMVwmu2wrXkVJpPW2T3vZcu+U6SuH3uC3XWxJYJgs5pO7Q== 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=Q757zGTEyWFzU55uS1if2CBPT9D7e5y690VMKsARmM4=; b=h0G1bZfQX8xe/9Rv/NNagQLtyhQ6tRpvV/ee5KBCB63zdfaZT4/vI/aFXaU8Xz1ZRSuEtHP6hMhiKVLSCyteTipPnUsSfI+FCVYW93IZJJpiuv462pBeIbsJk7dBNnj0n4UtGIi0K0tWmDNxUeECXN6+WsGfFrqlHHHNEQIIDEAc4D4VoDrR07QUa5zOKGhn/5HKwGr9RxQsNUqZnvN6D+SLzIRhy4o9N0i7+pFY3f306G5VorbQGj4eT3zCLu/bK8NpBj+XHj7rOPzKhntkbjCIOyXb4LmOE7NLHwyOpcqBPXqQs7Q1w8PNpnJMKXqMnCdWZgn3nDYpEalR5mpBug== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) 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=Q757zGTEyWFzU55uS1if2CBPT9D7e5y690VMKsARmM4=; b=HQeBR8d0SNnj+VNzBQkS60ZfFA5+XtV0cM473PbkvGyHHNFRTQmWx8v40Q6KpjYd9m8PZ3ICv6G9eJV6H0vqkwmPYmaUr7A8/Gs6Hcqfg0mRY/5MrHqTOYXq7sjjsC4lE5MhupHGF/j4U4ydFvtthBHrJgsg9MTFPNPuwPR5pKAMJQl4JoNNuYbuD75HhGwwwyQbAmdBfjfLTvoxmOhdbzLtjeQ//Ni6PSEJNsVP+BPLe6dwtYthUjfruWzc/LJeRZKhSqxbFTIp/DL9X1+635P4Z8TrKXmsPcNHzRwlB1pPLLpswZ/LDsYsnQojTRL6te91fJTGfq4XV3wqp4Sqzg== Received: from BN9PR03CA0874.namprd03.prod.outlook.com (2603:10b6:408:13c::9) by MN2PR12MB4376.namprd12.prod.outlook.com (2603:10b6:208:26c::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6544.19; Fri, 30 Jun 2023 11:02:35 +0000 Received: from BN8NAM11FT088.eop-nam11.prod.protection.outlook.com (2603:10b6:408:13c:cafe::1f) by BN9PR03CA0874.outlook.office365.com (2603:10b6:408:13c::9) 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 11:02:35 +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 BN8NAM11FT088.mail.protection.outlook.com (10.13.177.81) 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 11:02:34 +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.5; Fri, 30 Jun 2023 04:02:21 -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 04:02:19 -0700 From: Bing Zhao To: , , , , CC: , , Subject: [PATCH v3] net/mlx5: fix the error in VLAN actions creation Date: Fri, 30 Jun 2023 14:02:05 +0300 Message-ID: <20230630110205.434579-1-bingz@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230630105129.434516-1-bingz@nvidia.com> References: <20230630105129.434516-1-bingz@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT088:EE_|MN2PR12MB4376:EE_ X-MS-Office365-Filtering-Correlation-Id: e54cd4d8-4ea7-48c1-8090-08db79598286 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1s7927o0obL91C/brMEf9B3jsIWdZ5fjPLkjpEHkS2nquIrSAGDwkPojmOgTADiduOuqBMnu0si+RwqjUrx0GDPejCmTP/tFhj3TXV6noN51PAPndQYL0flMxJFrJxe5qMCShuJt7tyiH6zYYFan9gqlAHK1zr5+a/BHlPn3DumZLaA0V1Uon4Qv+i/oGOEoivPpuXMpGsx5VvQu2vVXlYXnhPK9vrzW+UuohDkbcuxFBYL1S35I5smvx6ewwtqcJr0ZoLwE2c9oRPmJCWKZ+KvprCGMLEpnthp4S1NCOlph6h+7tyf3feg4ZkYCJPPhg+FaD//vqdgnHcJw37rDaj9Kxz+uMU2xAuJt9aythKyAMC0pPDkGSPbhFj8+tJf3BcZ4DuuuLP2UrGueM45ggzWCcBJ6wjn9c9FLjA5nhk+BAO178kLTCnq2b3CALPYyfItgVhGDbSOc4qyTh/fe6vMDTSuUjlzPh5G9EsRT8wSpXTOK396bstWEkBavkSV+MXZVdKHfOPoT6H87y74tW0VDwOV0E9vICirao1kz6y4WjxShToJf9K+ISC/yFX0NAs5My2BRugZFvOkOmlQk7khVwx4m0K/OfTd+WRiSnI2ikmUB5BlEftBbl7LlX+dafp7oDJIEkalI1kLNlg/uca0PWgHDKGt97d4D0OOa15WPB4PfnsMe4Jqcvg0vXpXkeHe8D4KDJAmNleTbu2fLBO0zxzVKbuGpNpdRVVNrEY4O4RZF5vH2QarwHCbKNvvj 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:(13230028)(4636009)(136003)(396003)(376002)(39860400002)(346002)(451199021)(40470700004)(36840700001)(46966006)(40460700003)(450100002)(4326008)(316002)(70586007)(6636002)(6666004)(478600001)(110136005)(70206006)(54906003)(86362001)(36756003)(47076005)(83380400001)(16526019)(186003)(26005)(336012)(426003)(36860700001)(6286002)(2616005)(82310400005)(1076003)(2906002)(5660300002)(8676002)(8936002)(41300700001)(7696005)(40480700001)(55016003)(356005)(7636003)(82740400003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2023 11:02:34.9929 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e54cd4d8-4ea7-48c1-8090-08db79598286 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: BN8NAM11FT088.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4376 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 clear message explicitly. 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 v3: fix typo --- 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)