From patchwork Fri Jun 30 09:25:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bing Zhao X-Patchwork-Id: 129152 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 C4EE442D94; Fri, 30 Jun 2023 11:26:25 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9CB2F406B5; Fri, 30 Jun 2023 11:26:25 +0200 (CEST) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2050.outbound.protection.outlook.com [40.107.101.50]) by mails.dpdk.org (Postfix) with ESMTP id E93914021F; Fri, 30 Jun 2023 11:26:23 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QCXMW/ObK+XAD9xbOzpFMwCPCLeqahXhI6pt+0jyOzIvgqH9iBaZPRhIyt4xAjRJtlzO6WmcBoB9UcnqDTgpn5nyCjxe2Txb+dGqReIH/RJBSN2laYUREPCpV4BkR06eCdqKyRNKuhgFZTZ+fkufUgmS616n2y8/TWFL8GKja2UpJif9C/iMcA0vW6i+TGI8ZlDI4aqNNEavqr4eYBcbTuNPemqvjBL/LbewoJxoBN9h7z3+Wvyp6B1ziLB0MB2Xyjz9USRXLbmcN3QnTzem9PqVQXmMcBsCARbMnIq2t27sPXKT4vXQd++4+RpEYU0rvdf+lBKUuDxrvFUv4gFxrw== 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=Gdrsa++2c5ur+he/1ICffOPSNkxihdLCnSWrV1SD4oc=; b=YWAJpCscR/NDug8q9kdm2EyBcJnxjYOiUyoWGuMsLiacl+rjZklrUCJBt5ywLgdvqBf4PmrNXcFSx9YJaBvov60M0pZtyDvTE2DlfpIJnrynExPzpheJ44Tn6fUgkuA+c6HynhNa67Dp2XXTRKvXBjMRmbAuprv/eeq/jekr/SW4nz6FKDNJPGmBsri3Rd7kaZtdq3qgUZmf/qeKxy/hhGv8Z39dKsrQAelzP7O6CuGArICUq1qUmLpkC+f43wFi7We+6jUt84bQwX0zSows8bm3mbMJCcm6iyh/zT0IK1931u0jk0QEc6UMuKlYyz5dGAGO/8v/U4+nhal89CZopg== 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=Gdrsa++2c5ur+he/1ICffOPSNkxihdLCnSWrV1SD4oc=; b=jgi/lEjgRvVaTIa2l5M0ab4dBFNsWZHBZnSHVGihvG7lPcPhG77BSDXUGd+/J/bw5BkEzboxy2HDlstYC+3ytboeqRyUOlWy6d4jVhrSjiFMcIPJqmsspS3FetRlWNLSvwKvfokpVUV399lQ1sBVtNDkWp43ul/52POTXZWPYEk2T0d8tCIZekXKD6EeDETBj2D0Nxm4luCR6KFVvVfdtchHu5xJI6dDKDCiN0BuB63pefRUoiUW4FD1sCktZK5PIUq/jJidp+yYip/6N248p2gmTSSHZD3KJCf7FGTtIpsCB7HC1sBqZzlT7v3CtLP4xVo8wVsDB3n8ebz7yvCFWw== Received: from BN0PR04CA0208.namprd04.prod.outlook.com (2603:10b6:408:e9::33) by IA1PR12MB8333.namprd12.prod.outlook.com (2603:10b6:208:3fe::15) 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 09:26:20 +0000 Received: from BN8NAM11FT099.eop-nam11.prod.protection.outlook.com (2603:10b6:408:e9:cafe::7c) by BN0PR04CA0208.outlook.office365.com (2603:10b6:408:e9::33) 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 09:26:20 +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 BN8NAM11FT099.mail.protection.outlook.com (10.13.177.197) 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 09:26:20 +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 02:26:07 -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 02:26:05 -0700 From: Bing Zhao To: , , , , CC: , , Subject: [PATCH v2] net/mlx5: fix the error set in control tables create Date: Fri, 30 Jun 2023 12:25:51 +0300 Message-ID: <20230630092551.434020-1-bingz@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230630063637.432552-1-bingz@nvidia.com> References: <20230630063637.432552-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: BN8NAM11FT099:EE_|IA1PR12MB8333:EE_ X-MS-Office365-Filtering-Correlation-Id: 09a942f1-9109-4a07-31a6-08db794c1087 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jJMzmSQlZRCeaq4YeX33z/WzTIvP7oY9vjcZHBGcN6EgzNip02rkjIPFGUJ+lvt9oB3rbrmWKd0P2z0gTYIijb6UN3R3dOFUSSsJEYmNFXL5QBKmpaG6l1+4PYxfjgrdqQ2dQdPFUNIBRb3Pgo7r7NfsyQ18vB7sLIlTsY3ru7BGq43yrEFVRTt+nqBF9shA1lEIvt60jk+gK9JEMbaREDERf9z6qKAhlehnAWopLc8Sw2phcWfSBt/KjPx6K0n4dhv8jz0+dUUtrViZKsjLZ4L/t6vZkhn6hf01Qx3Yw1CEbINDDCB6Lu8OljLMw53mcmeDoDSFiAAS2hoeJqAuOBF6KX9748AC48BQmzh22+CrVFy7zWvCtyaRHMFVCpHJJAqErwVXMpXIWlhMK0pBpNBiYD39mO9xixzi2fNPT8s33Ri/v4BBMkNZ6fjAdf30EomXy+zdf8F//2Vc75Hdk0hZRcWlL/Ck9Sq9Ji+TgOCdQhYKK4BhiGTF+U5SWR3V7oy0PGthNDrMvErRqnQfo1Zusmx9xs5Oiqp7N8gxbBiwfxA+qCJZNmMBBw/wal9wS8BPhvcIMLfgn8V9ghEKkSJFzngPA6OjhbgJrS+RfcfxdxvnSR/mP+2xeU63PCC6gZD5sEmeAd+wfeTNw5aVGO8a+PgQZKZ70gHXVLSBB7P6//Ld0xZggFt5peJfbzt8K/dXffv3cBbKFsrtxyC4s6fEimb9g+wWc82U12d4CU/dZls2CpA4qGGKRtma7wtn 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)(346002)(39860400002)(136003)(376002)(396003)(451199021)(36840700001)(40470700004)(46966006)(55016003)(336012)(426003)(47076005)(40460700003)(83380400001)(30864003)(2616005)(2906002)(7636003)(356005)(82740400003)(36860700001)(40480700001)(36756003)(8936002)(8676002)(82310400005)(110136005)(5660300002)(86362001)(450100002)(54906003)(41300700001)(70586007)(6636002)(4326008)(70206006)(6666004)(316002)(7696005)(478600001)(16526019)(6286002)(186003)(1076003)(26005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2023 09:26:20.2796 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 09a942f1-9109-4a07-31a6-08db794c1087 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: BN8NAM11FT099.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB8333 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 some failure occurrs in the flow_hw_create_ctrl_tables(), the "rte_flow_error" should be set properly with all needed information. Then the rte_errno and the "message" will reflect the actual failure. This will also solve the crash when trying to access the "message". Fixes: 1939eb6f660c ("net/mlx5: support flow port action with HWS") Fixes: 483181f7b6dd ("net/mlx5: support device control of representor matching") Fixes: ddb68e47331e ("net/mlx5: add extended metadata mode for HWS") Cc: dsosnowski@nvidia.com Cc: stable@dpdk.org Signed-off-by: Bing Zhao Reviewed-by: Suanming Mou Acked-by: Ori Kam --- v2: add CC stable --- drivers/net/mlx5/mlx5_flow_hw.c | 176 +++++++++++++++++++------------- 1 file changed, 106 insertions(+), 70 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index 87584c1e94..4163fe23e6 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -5421,7 +5421,7 @@ flow_hw_pattern_template_create(struct rte_eth_dev *dev, struct rte_flow_pattern_template *it; struct rte_flow_item *copied_items = NULL; const struct rte_flow_item *tmpl_items; - uint64_t orig_item_nb; + uint32_t orig_item_nb; struct rte_flow_item port = { .type = RTE_FLOW_ITEM_TYPE_REPRESENTED_PORT, .mask = &rte_flow_item_ethdev_mask, @@ -6242,12 +6242,15 @@ flow_hw_esw_mgr_regc_marker(struct rte_eth_dev *dev) * * @param dev * Pointer to Ethernet device. + * @param error + * Pointer to error structure. * * @return * Pointer to flow pattern template on success, NULL otherwise. */ static struct rte_flow_pattern_template * -flow_hw_create_ctrl_esw_mgr_pattern_template(struct rte_eth_dev *dev) +flow_hw_create_ctrl_esw_mgr_pattern_template(struct rte_eth_dev *dev, + struct rte_flow_error *error) { struct rte_flow_pattern_template_attr attr = { .relaxed_matching = 0, @@ -6277,7 +6280,7 @@ flow_hw_create_ctrl_esw_mgr_pattern_template(struct rte_eth_dev *dev) }, }; - return flow_hw_pattern_template_create(dev, &attr, items, NULL); + return flow_hw_pattern_template_create(dev, &attr, items, error); } /** @@ -6290,12 +6293,15 @@ flow_hw_create_ctrl_esw_mgr_pattern_template(struct rte_eth_dev *dev) * * @param dev * Pointer to Ethernet device. + * @param error + * Pointer to error structure. * * @return * Pointer to flow pattern template on success, NULL otherwise. */ static struct rte_flow_pattern_template * -flow_hw_create_ctrl_regc_sq_pattern_template(struct rte_eth_dev *dev) +flow_hw_create_ctrl_regc_sq_pattern_template(struct rte_eth_dev *dev, + struct rte_flow_error *error) { struct rte_flow_pattern_template_attr attr = { .relaxed_matching = 0, @@ -6328,7 +6334,7 @@ flow_hw_create_ctrl_regc_sq_pattern_template(struct rte_eth_dev *dev) }, }; - return flow_hw_pattern_template_create(dev, &attr, items, NULL); + return flow_hw_pattern_template_create(dev, &attr, items, error); } /** @@ -6338,12 +6344,15 @@ flow_hw_create_ctrl_regc_sq_pattern_template(struct rte_eth_dev *dev) * * @param dev * Pointer to Ethernet device. + * @param error + * Pointer to error structure. * * @return * Pointer to flow pattern template on success, NULL otherwise. */ static struct rte_flow_pattern_template * -flow_hw_create_ctrl_port_pattern_template(struct rte_eth_dev *dev) +flow_hw_create_ctrl_port_pattern_template(struct rte_eth_dev *dev, + struct rte_flow_error *error) { struct rte_flow_pattern_template_attr attr = { .relaxed_matching = 0, @@ -6362,7 +6371,7 @@ flow_hw_create_ctrl_port_pattern_template(struct rte_eth_dev *dev) }, }; - return flow_hw_pattern_template_create(dev, &attr, items, NULL); + return flow_hw_pattern_template_create(dev, &attr, items, error); } /* @@ -6372,12 +6381,15 @@ flow_hw_create_ctrl_port_pattern_template(struct rte_eth_dev *dev) * * @param dev * Pointer to Ethernet device. + * @param error + * Pointer to error structure. * * @return * Pointer to flow pattern template on success, NULL otherwise. */ static struct rte_flow_pattern_template * -flow_hw_create_tx_default_mreg_copy_pattern_template(struct rte_eth_dev *dev) +flow_hw_create_tx_default_mreg_copy_pattern_template(struct rte_eth_dev *dev, + struct rte_flow_error *error) { struct rte_flow_pattern_template_attr tx_pa_attr = { .relaxed_matching = 0, @@ -6398,10 +6410,8 @@ flow_hw_create_tx_default_mreg_copy_pattern_template(struct rte_eth_dev *dev) .type = RTE_FLOW_ITEM_TYPE_END, }, }; - struct rte_flow_error drop_err; - RTE_SET_USED(drop_err); - return flow_hw_pattern_template_create(dev, &tx_pa_attr, eth_all, &drop_err); + return flow_hw_pattern_template_create(dev, &tx_pa_attr, eth_all, error); } /** @@ -6412,12 +6422,15 @@ flow_hw_create_tx_default_mreg_copy_pattern_template(struct rte_eth_dev *dev) * * @param dev * Pointer to Ethernet device. + * @param error + * Pointer to error structure. * * @return * Pointer to flow actions template on success, NULL otherwise. */ static struct rte_flow_actions_template * -flow_hw_create_ctrl_regc_jump_actions_template(struct rte_eth_dev *dev) +flow_hw_create_ctrl_regc_jump_actions_template(struct rte_eth_dev *dev, + struct rte_flow_error *error) { uint32_t marker_mask = flow_hw_esw_mgr_regc_marker_mask(dev); uint32_t marker_bits = flow_hw_esw_mgr_regc_marker(dev); @@ -6484,7 +6497,7 @@ flow_hw_create_ctrl_regc_jump_actions_template(struct rte_eth_dev *dev) set_reg_v.dst.offset = rte_bsf32(marker_mask); rte_memcpy(set_reg_v.src.value, &marker_bits, sizeof(marker_bits)); rte_memcpy(set_reg_m.src.value, &marker_mask, sizeof(marker_mask)); - return flow_hw_actions_template_create(dev, &attr, actions_v, actions_m, NULL); + return flow_hw_actions_template_create(dev, &attr, actions_v, actions_m, error); } /** @@ -6496,13 +6509,16 @@ flow_hw_create_ctrl_regc_jump_actions_template(struct rte_eth_dev *dev) * Pointer to Ethernet device. * @param group * Destination group for this action template. + * @param error + * Pointer to error structure. * * @return * Pointer to flow actions template on success, NULL otherwise. */ static struct rte_flow_actions_template * flow_hw_create_ctrl_jump_actions_template(struct rte_eth_dev *dev, - uint32_t group) + uint32_t group, + struct rte_flow_error *error) { struct rte_flow_actions_template_attr attr = { .transfer = 1, @@ -6532,8 +6548,8 @@ flow_hw_create_ctrl_jump_actions_template(struct rte_eth_dev *dev, } }; - return flow_hw_actions_template_create(dev, &attr, actions_v, actions_m, - NULL); + return flow_hw_actions_template_create(dev, &attr, actions_v, + actions_m, error); } /** @@ -6542,12 +6558,15 @@ flow_hw_create_ctrl_jump_actions_template(struct rte_eth_dev *dev, * * @param dev * Pointer to Ethernet device. + * @param error + * Pointer to error structure. * * @return * Pointer to flow action template on success, NULL otherwise. */ static struct rte_flow_actions_template * -flow_hw_create_ctrl_port_actions_template(struct rte_eth_dev *dev) +flow_hw_create_ctrl_port_actions_template(struct rte_eth_dev *dev, + struct rte_flow_error *error) { struct rte_flow_actions_template_attr attr = { .transfer = 1, @@ -6577,8 +6596,7 @@ flow_hw_create_ctrl_port_actions_template(struct rte_eth_dev *dev) } }; - return flow_hw_actions_template_create(dev, &attr, actions_v, actions_m, - NULL); + return flow_hw_actions_template_create(dev, &attr, actions_v, actions_m, error); } /* @@ -6587,12 +6605,15 @@ flow_hw_create_ctrl_port_actions_template(struct rte_eth_dev *dev) * * @param dev * Pointer to Ethernet device. + * @param error + * Pointer to error structure. * * @return * Pointer to flow actions template on success, NULL otherwise. */ static struct rte_flow_actions_template * -flow_hw_create_tx_default_mreg_copy_actions_template(struct rte_eth_dev *dev) +flow_hw_create_tx_default_mreg_copy_actions_template(struct rte_eth_dev *dev, + struct rte_flow_error *error) { struct rte_flow_actions_template_attr tx_act_attr = { .egress = 1, @@ -6657,11 +6678,9 @@ flow_hw_create_tx_default_mreg_copy_actions_template(struct rte_eth_dev *dev) .type = RTE_FLOW_ACTION_TYPE_END, }, }; - struct rte_flow_error drop_err; - RTE_SET_USED(drop_err); return flow_hw_actions_template_create(dev, &tx_act_attr, actions, - masks, &drop_err); + masks, error); } /** @@ -6674,6 +6693,8 @@ flow_hw_create_tx_default_mreg_copy_actions_template(struct rte_eth_dev *dev) * Pointer to flow pattern template. * @param at * Pointer to flow actions template. + * @param error + * Pointer to error structure. * * @return * Pointer to flow table on success, NULL otherwise. @@ -6681,7 +6702,8 @@ flow_hw_create_tx_default_mreg_copy_actions_template(struct rte_eth_dev *dev) static struct rte_flow_template_table* flow_hw_create_ctrl_sq_miss_root_table(struct rte_eth_dev *dev, struct rte_flow_pattern_template *it, - struct rte_flow_actions_template *at) + struct rte_flow_actions_template *at, + struct rte_flow_error *error) { struct rte_flow_template_table_attr attr = { .flow_attr = { @@ -6698,7 +6720,7 @@ flow_hw_create_ctrl_sq_miss_root_table(struct rte_eth_dev *dev, .external = false, }; - return flow_hw_table_create(dev, &cfg, &it, 1, &at, 1, NULL); + return flow_hw_table_create(dev, &cfg, &it, 1, &at, 1, error); } @@ -6712,6 +6734,8 @@ flow_hw_create_ctrl_sq_miss_root_table(struct rte_eth_dev *dev, * Pointer to flow pattern template. * @param at * Pointer to flow actions template. + * @param error + * Pointer to error structure. * * @return * Pointer to flow table on success, NULL otherwise. @@ -6719,7 +6743,8 @@ flow_hw_create_ctrl_sq_miss_root_table(struct rte_eth_dev *dev, static struct rte_flow_template_table* flow_hw_create_ctrl_sq_miss_table(struct rte_eth_dev *dev, struct rte_flow_pattern_template *it, - struct rte_flow_actions_template *at) + struct rte_flow_actions_template *at, + struct rte_flow_error *error) { struct rte_flow_template_table_attr attr = { .flow_attr = { @@ -6736,7 +6761,7 @@ flow_hw_create_ctrl_sq_miss_table(struct rte_eth_dev *dev, .external = false, }; - return flow_hw_table_create(dev, &cfg, &it, 1, &at, 1, NULL); + return flow_hw_table_create(dev, &cfg, &it, 1, &at, 1, error); } /* @@ -6748,6 +6773,8 @@ flow_hw_create_ctrl_sq_miss_table(struct rte_eth_dev *dev, * Pointer to flow pattern template. * @param at * Pointer to flow actions template. + * @param error + * Pointer to error structure. * * @return * Pointer to flow table on success, NULL otherwise. @@ -6755,7 +6782,8 @@ flow_hw_create_ctrl_sq_miss_table(struct rte_eth_dev *dev, static struct rte_flow_template_table* flow_hw_create_tx_default_mreg_copy_table(struct rte_eth_dev *dev, struct rte_flow_pattern_template *pt, - struct rte_flow_actions_template *at) + struct rte_flow_actions_template *at, + struct rte_flow_error *error) { struct rte_flow_template_table_attr tx_tbl_attr = { .flow_attr = { @@ -6769,14 +6797,8 @@ flow_hw_create_tx_default_mreg_copy_table(struct rte_eth_dev *dev, .attr = tx_tbl_attr, .external = false, }; - struct rte_flow_error drop_err = { - .type = RTE_FLOW_ERROR_TYPE_NONE, - .cause = NULL, - .message = NULL, - }; - RTE_SET_USED(drop_err); - return flow_hw_table_create(dev, &tx_tbl_cfg, &pt, 1, &at, 1, &drop_err); + return flow_hw_table_create(dev, &tx_tbl_cfg, &pt, 1, &at, 1, error); } /** @@ -6789,6 +6811,8 @@ flow_hw_create_tx_default_mreg_copy_table(struct rte_eth_dev *dev, * Pointer to flow pattern template. * @param at * Pointer to flow actions template. + * @param error + * Pointer to error structure. * * @return * Pointer to flow table on success, NULL otherwise. @@ -6796,7 +6820,8 @@ flow_hw_create_tx_default_mreg_copy_table(struct rte_eth_dev *dev, static struct rte_flow_template_table * flow_hw_create_ctrl_jump_table(struct rte_eth_dev *dev, struct rte_flow_pattern_template *it, - struct rte_flow_actions_template *at) + struct rte_flow_actions_template *at, + struct rte_flow_error *error) { struct rte_flow_template_table_attr attr = { .flow_attr = { @@ -6813,7 +6838,7 @@ flow_hw_create_ctrl_jump_table(struct rte_eth_dev *dev, .external = false, }; - return flow_hw_table_create(dev, &cfg, &it, 1, &at, 1, NULL); + return flow_hw_table_create(dev, &cfg, &it, 1, &at, 1, error); } /** @@ -6822,12 +6847,14 @@ flow_hw_create_ctrl_jump_table(struct rte_eth_dev *dev, * * @param dev * Pointer to Ethernet device. + * @param error + * Pointer to error structure. * * @return - * 0 on success, EINVAL otherwise + * 0 on success, negative values otherwise */ static __rte_unused int -flow_hw_create_ctrl_tables(struct rte_eth_dev *dev) +flow_hw_create_ctrl_tables(struct rte_eth_dev *dev, struct rte_flow_error *error) { struct mlx5_priv *priv = dev->data->dev_private; struct rte_flow_pattern_template *esw_mgr_items_tmpl = NULL; @@ -6840,96 +6867,107 @@ flow_hw_create_ctrl_tables(struct rte_eth_dev *dev) struct rte_flow_actions_template *tx_meta_actions_tmpl = NULL; uint32_t xmeta = priv->sh->config.dv_xmeta_en; uint32_t repr_matching = priv->sh->config.repr_matching; + int ret; /* Create templates and table for default SQ miss flow rules - root table. */ - esw_mgr_items_tmpl = flow_hw_create_ctrl_esw_mgr_pattern_template(dev); + esw_mgr_items_tmpl = flow_hw_create_ctrl_esw_mgr_pattern_template(dev, error); if (!esw_mgr_items_tmpl) { DRV_LOG(ERR, "port %u failed to create E-Switch Manager item" " template for control flows", dev->data->port_id); - goto error; + goto err; } - regc_jump_actions_tmpl = flow_hw_create_ctrl_regc_jump_actions_template(dev); + regc_jump_actions_tmpl = flow_hw_create_ctrl_regc_jump_actions_template(dev, error); if (!regc_jump_actions_tmpl) { DRV_LOG(ERR, "port %u failed to create REG_C set and jump action template" " for control flows", dev->data->port_id); - goto error; + goto err; } MLX5_ASSERT(priv->hw_esw_sq_miss_root_tbl == NULL); priv->hw_esw_sq_miss_root_tbl = flow_hw_create_ctrl_sq_miss_root_table - (dev, esw_mgr_items_tmpl, regc_jump_actions_tmpl); + (dev, esw_mgr_items_tmpl, regc_jump_actions_tmpl, error); if (!priv->hw_esw_sq_miss_root_tbl) { DRV_LOG(ERR, "port %u failed to create table for default sq miss (root table)" " for control flows", dev->data->port_id); - goto error; + goto err; } /* Create templates and table for default SQ miss flow rules - non-root table. */ - regc_sq_items_tmpl = flow_hw_create_ctrl_regc_sq_pattern_template(dev); + regc_sq_items_tmpl = flow_hw_create_ctrl_regc_sq_pattern_template(dev, error); if (!regc_sq_items_tmpl) { DRV_LOG(ERR, "port %u failed to create SQ item template for" " control flows", dev->data->port_id); - goto error; + goto err; } - port_actions_tmpl = flow_hw_create_ctrl_port_actions_template(dev); + port_actions_tmpl = flow_hw_create_ctrl_port_actions_template(dev, error); if (!port_actions_tmpl) { DRV_LOG(ERR, "port %u failed to create port action template" " for control flows", dev->data->port_id); - goto error; + goto err; } MLX5_ASSERT(priv->hw_esw_sq_miss_tbl == NULL); priv->hw_esw_sq_miss_tbl = flow_hw_create_ctrl_sq_miss_table(dev, regc_sq_items_tmpl, - port_actions_tmpl); + port_actions_tmpl, error); if (!priv->hw_esw_sq_miss_tbl) { DRV_LOG(ERR, "port %u failed to create table for default sq miss (non-root table)" " for control flows", dev->data->port_id); - goto error; + goto err; } /* Create templates and table for default FDB jump flow rules. */ - port_items_tmpl = flow_hw_create_ctrl_port_pattern_template(dev); + port_items_tmpl = flow_hw_create_ctrl_port_pattern_template(dev, error); if (!port_items_tmpl) { DRV_LOG(ERR, "port %u failed to create SQ item template for" " control flows", dev->data->port_id); - goto error; + goto err; } jump_one_actions_tmpl = flow_hw_create_ctrl_jump_actions_template - (dev, MLX5_HW_LOWEST_USABLE_GROUP); + (dev, MLX5_HW_LOWEST_USABLE_GROUP, error); if (!jump_one_actions_tmpl) { DRV_LOG(ERR, "port %u failed to create jump action template" " for control flows", dev->data->port_id); - goto error; + goto err; } MLX5_ASSERT(priv->hw_esw_zero_tbl == NULL); priv->hw_esw_zero_tbl = flow_hw_create_ctrl_jump_table(dev, port_items_tmpl, - jump_one_actions_tmpl); + jump_one_actions_tmpl, + error); if (!priv->hw_esw_zero_tbl) { DRV_LOG(ERR, "port %u failed to create table for default jump to group 1" " for control flows", dev->data->port_id); - goto error; + goto err; } /* Create templates and table for default Tx metadata copy flow rule. */ if (!repr_matching && xmeta == MLX5_XMETA_MODE_META32_HWS) { - tx_meta_items_tmpl = flow_hw_create_tx_default_mreg_copy_pattern_template(dev); + tx_meta_items_tmpl = + flow_hw_create_tx_default_mreg_copy_pattern_template(dev, error); if (!tx_meta_items_tmpl) { DRV_LOG(ERR, "port %u failed to Tx metadata copy pattern" " template for control flows", dev->data->port_id); - goto error; + goto err; } - tx_meta_actions_tmpl = flow_hw_create_tx_default_mreg_copy_actions_template(dev); + tx_meta_actions_tmpl = + flow_hw_create_tx_default_mreg_copy_actions_template(dev, error); if (!tx_meta_actions_tmpl) { DRV_LOG(ERR, "port %u failed to Tx metadata copy actions" " template for control flows", dev->data->port_id); - goto error; + goto err; } MLX5_ASSERT(priv->hw_tx_meta_cpy_tbl == NULL); - priv->hw_tx_meta_cpy_tbl = flow_hw_create_tx_default_mreg_copy_table(dev, - tx_meta_items_tmpl, tx_meta_actions_tmpl); + priv->hw_tx_meta_cpy_tbl = + flow_hw_create_tx_default_mreg_copy_table(dev, tx_meta_items_tmpl, + tx_meta_actions_tmpl, error); if (!priv->hw_tx_meta_cpy_tbl) { DRV_LOG(ERR, "port %u failed to create table for default" " Tx metadata copy flow rule", dev->data->port_id); - goto error; + goto err; } } return 0; -error: +err: + /* Do not overwrite the rte_errno. */ + ret = -rte_errno; + if (ret == 0) + ret = rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, + "Failed to create control tables."); if (priv->hw_esw_zero_tbl) { flow_hw_table_destroy(dev, priv->hw_esw_zero_tbl, NULL); priv->hw_esw_zero_tbl = NULL; @@ -6958,7 +6996,7 @@ flow_hw_create_ctrl_tables(struct rte_eth_dev *dev) flow_hw_pattern_template_destroy(dev, regc_sq_items_tmpl, NULL); if (esw_mgr_items_tmpl) flow_hw_pattern_template_destroy(dev, esw_mgr_items_tmpl, NULL); - return -EINVAL; + return ret; } static void @@ -7834,11 +7872,9 @@ flow_hw_configure(struct rte_eth_dev *dev, NULL, "Failed to create vport actions."); goto err; } - ret = flow_hw_create_ctrl_tables(dev); - if (ret) { - rte_errno = -ret; + ret = flow_hw_create_ctrl_tables(dev, error); + if (ret) goto err; - } } if (!priv->shared_host) flow_hw_create_send_to_kernel_actions(priv);