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 2A0A242D94; Fri, 30 Jun 2023 11:47:09 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F1920406B5; Fri, 30 Jun 2023 11:47:08 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2043.outbound.protection.outlook.com [40.107.237.43]) by mails.dpdk.org (Postfix) with ESMTP id C29EA4021F; Fri, 30 Jun 2023 11:47:06 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Qa1RUHhJgM7kj+HmmtHivQnSSfV3BfPgQ5yDazQS7Mtz4DFEZL1YMJNEUY0QRfYjGLRgauBrfw19ZUVIQ5FE3DFMAq3Nb3fhg1Zske/vRZ6vZjqRmmSMce0tEFX+iHuS5voX1+SJlQFOqLU/EORFvUhK6/9aCT86IERZkUuct2VpEx0XXRTp5Ie8TXv67zJBm6Y8joqCm9WVTWa8BnpSzbxIbQRWEg27b0YEtB+S0zpAy4p9UDetsBurAtWI/jGFpR4yC32rhb5aCRa85cn905e7cD47da3uungcZRlELNpIpBU4U+/yWoiu5/1sTVnxlRlJk4VI8aMh+oF/RKgAIw== 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=GRkCgh0Y3NvEQCUAc9wfQOHOtvk5s2jIeLGzYq4IJ8g=; b=RpS+AB+TUHf1K76h60Mks1kbH7dWBRzIzlmEEFxQkj5EaDB95XIzCFH0kCV0uJV2EhzpKaxXxlBkE+rY0+LFtteDgF1hWKGX3uoBrwd/xBUll2ZDb4Tpg9iCwfs9uRpljPpLBRn6EKt7mpSv9RdB/8wZpAon2439dWk2kAk4h7iF8EKoR1CQt8Z8HyVAkznVOJJIdCZpoFo1a7ApNbRBo0s9N/UqH/eTO2Dvn6U/mJ1Ra3sqxemOK02A2/mcHrDS6P/ybdxxQEsyl8QwVPo6KLaFs0I5k3kNSqHm0JfIxMYtZb6rhBpTsalXUcvftiyPj91/k7NVGhDGJjqt1CIEyw== 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=GRkCgh0Y3NvEQCUAc9wfQOHOtvk5s2jIeLGzYq4IJ8g=; b=oLPbQ7nAugmjwAnxWGcLIpXuCkN9+XbzVWhckZ81wTe+VwxgGHis0SwEpqftQswZwi3YXtMke4gXK2TSagItkJ20zzKDKzxObtvUbZOsy5kMNORiPxnzXXYBIk1l6HvmitIUz8RNAl4fExP71JY8gv9M7+n9kJK/LeVFdXUXTjmPU1fbFyG/nqczxz43VgTjCeBGOF4vbbVMTQno/+EmxJxUujTgj5ZyPKYHTqIJmxhnQzyZnChmb/1nxZdvyc9vDhIBQTwIdpf+j0kzFO/jQWgpr/aHNLPVQC9j+tEyvV1gTAbUBq+nRP/1hAimP8DaC9uakftJzlu3leACr1k/Mg== Received: from BN0PR07CA0019.namprd07.prod.outlook.com (2603:10b6:408:141::9) by PH7PR12MB5807.namprd12.prod.outlook.com (2603:10b6:510:1d3::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.23; Fri, 30 Jun 2023 09:47:04 +0000 Received: from BN8NAM11FT115.eop-nam11.prod.protection.outlook.com (2603:10b6:408:141:cafe::ba) by BN0PR07CA0019.outlook.office365.com (2603:10b6:408:141::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 09:47:04 +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 BN8NAM11FT115.mail.protection.outlook.com (10.13.177.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.43 via Frontend Transport; Fri, 30 Jun 2023 09:47:04 +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:46:52 -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:46:49 -0700 From: Bing Zhao To: , , , , CC: , , Subject: [PATCH v3] net/mlx5: fix the error set in control tables create Date: Fri, 30 Jun 2023 12:46:35 +0300 Message-ID: <20230630094635.434124-1-bingz@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230630092551.434020-1-bingz@nvidia.com> References: <20230630092551.434020-1-bingz@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain 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: BN8NAM11FT115:EE_|PH7PR12MB5807:EE_ X-MS-Office365-Filtering-Correlation-Id: 0e802958-ef3b-4c22-6e8d-08db794ef618 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3FL2GhzR2LXalhJ0zAYUrLeWcOBWYDjterqcLO6xjPdBEGpbjY+ncC8hx0tSr8GBRhn/l2W092waA5fjBPxRd0nUSi4MxdzE3ppw7SfTceDsPSvhZTrSlSuIQ0uTBhEklnQjB0+GOqLFWrbNjuhd+KYHZiO0Kv1NcEFlOIYHOW7bzB3O6HaIVtowtujyCEdqmrl7gwFmpYoa+AVRpc9NiBcSotDgO8Us6otR3Rxhtyg/KDszkTrrvDbxPtdAxa60DJDnn4OCm8QfleXVdfkas8mmNYrKJ9FNkqL3kux57JjEJxJ3tZTTRASKgQBRxlEl8Um5GuL/xjTNPE7GHp4rl26aAOI2VuBQW9UdENAu+2HKDjfco0udEaRdBHiRP4E5ycYsVwcWveI/GhMLphQrox+uvqmrXgqGVan5TyCdYSyDK0R3CSaypCnzjtyRY7+2enbMIVzQu9K+k5WYVB/HWSY4kcH4NixpeXgGdpLqaBo5hEdrVK6EN91wSlWCsRdOPcZFqoLUuScsFlBLNdPyr1DM7fznNdZPJJi88r/pgxHuMQO0NI0QCk9rP5VDn9UJSwSttsaZeDywgWa4P7xF/7DAP3BmjxQXYqAPDhLGj4fxC34RKnVqjV7e09eS/A4phZEFtHxa+7pvBZ0atgfuX7aAB/Oi5Fq31hIw9UNQfaLvo/he+88bGzuWEPI04jOCny9NEMWWIl+55je+qYYpiHfjp1I2tAj34t2Le8lsH//CaMfkAh4dCU3Mz17Z8739 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)(376002)(346002)(136003)(396003)(39860400002)(451199021)(46966006)(36840700001)(40470700004)(16526019)(6666004)(40460700003)(2906002)(186003)(55016003)(7696005)(30864003)(82310400005)(40480700001)(86362001)(82740400003)(83380400001)(7636003)(2616005)(426003)(336012)(47076005)(356005)(1076003)(6286002)(36860700001)(110136005)(41300700001)(54906003)(26005)(478600001)(70206006)(316002)(36756003)(450100002)(4326008)(70586007)(6636002)(5660300002)(8676002)(8936002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2023 09:47:04.4232 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0e802958-ef3b-4c22-6e8d-08db794ef618 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: BN8NAM11FT115.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB5807 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 occurs 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 v3: fix the typo --- 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); -- 2.34.1