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 A1FA143DE5 for ; Wed, 3 Apr 2024 10:41:44 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9B642402CE; Wed, 3 Apr 2024 10:41:44 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2072.outbound.protection.outlook.com [40.107.92.72]) by mails.dpdk.org (Postfix) with ESMTP id 0F67F4025C for ; Wed, 3 Apr 2024 10:41:44 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=h54S4KkZ8qhEIx0BTjGZBOjAsfBJKun2zSihGKMAdyyKqkDlQKVUsc/go7N4DQd5QyYl02WWvuquz/Z3nXk57NxJwjTTjE85ARumbQIoAGMG70davgn6ALtwws7hooTOE/bfU7/fkf0n6c210bqOCzF2BHHZ7OaL6IFi6FzLol57V3mjzBNRj41Z3d4PW276Q+esOZOAKMWQHQesQaz85VsIjL70GbHvwDcCz2JXsBPH5BULstnyIAzfY+HSk20hfM0+uxcJOtDPY8no6qUmi4VENMClKuZHxWxC2kyWaQQy/wB741VLgsqe4oeYLjtJKXRBvn0FDo/pxjdUoKRV1w== 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=Ud3dhCNIKncyZDR3oisaKw317IoV5eOMJsHhqbeZKyA=; b=VrQa/Ra/XmPaqOwGqodKNJdf+UIpNFVueRCt6eyZUlICdMtogpU/NoZ+si9CZU1ob/+BAS74UQFcYXSzTqRl9wOP/m8bxfc3btPEvU4xTLB+DWEJDnjBUeoIS0Tbo2USBygbRcTA7nMPI6VcOOdJeHV/saoLWxSOV+cfhd64Z7KRsyYMu2ktf2IXk0Sn+x/wfrlpnNFyYiO3HaMrjBGbXZAX7xM3mSzuXhh8L8deSU6f3a4j3jxCP4D22wCZ1kwN1CdTiyU6Ac/lQ28DR9Gq08fFVspRUgh2/+nk3eOIhRjVHVkKP4KT/cWOxUQiAVHAjUIl42tj0+/NR/j8a0TS4w== 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 (0) 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=Ud3dhCNIKncyZDR3oisaKw317IoV5eOMJsHhqbeZKyA=; b=mB2/ytvNj8nW4UWE7KSc29f7yPUO78Ax9cEsx2plAflnBYLro2x1RPTDrDS0afjCPeLaZXSKWfIG4EA4hhy8BSYnVnTB4IOIcnUOWHZKQ9N1dzy5RJMJLu6F3vawgJ4JSUq3aSP+R68lLAbMnTCdPXs2BPXsqhSSaXlYrV+Uk6tqNd/iKuB3h24XSrDHpK9ftlUFH8utnH7ljUNSUu8chHhRGrJF2M1K5rVt1/EvfplPXL0u6BMvTw6iHBx7FFmsV7aE7tWhuM+CfHlWD31L2iXAJ0vp+Wh0JwWk2+8iMayyocNwj9PZ6DF9G29or9AnFBrl4gM2X8ygzoztNu5JWQ== Received: from CH0PR07CA0002.namprd07.prod.outlook.com (2603:10b6:610:32::7) by LV8PR12MB9183.namprd12.prod.outlook.com (2603:10b6:408:193::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Wed, 3 Apr 2024 08:41:42 +0000 Received: from CH2PEPF0000013C.namprd02.prod.outlook.com (2603:10b6:610:32:cafe::d4) by CH0PR07CA0002.outlook.office365.com (2603:10b6:610:32::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46 via Frontend Transport; Wed, 3 Apr 2024 08:41:41 +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 CH2PEPF0000013C.mail.protection.outlook.com (10.167.244.73) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7452.22 via Frontend Transport; Wed, 3 Apr 2024 08:41:41 +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.41; Wed, 3 Apr 2024 01:41:28 -0700 Received: from nvidia.com (10.126.231.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.1258.12; Wed, 3 Apr 2024 01:41:26 -0700 From: Dariusz Sosnowski To: Matan Azrad , Viacheslav Ovsiienko , Gregory Etelson , Michael Baum CC: , Ori Kam Subject: [PATCH 22.11] net/mlx5: fix rollback on failed flow configure Date: Wed, 3 Apr 2024 10:41:06 +0200 Message-ID: <20240403084106.23765-1-dsosnowski@nvidia.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] 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: CH2PEPF0000013C:EE_|LV8PR12MB9183:EE_ X-MS-Office365-Filtering-Correlation-Id: 2f7d5c21-681f-4965-2bd2-08dc53b9e295 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gjpq1tn3PvAZWA9hBnCIIzKFYGExXGk4UUfawoNQnWkBehYNBbftvzmy4dnDXfu1L5uTmLDBi7ekTZJ3XO64uQBTrNmCJ3QM8uoTXOvgaWkIFP2QSSwBW+euM9HPtmkhBMBWAECKAA8A0/LAxgSpITVAChcB/iVRhsGSEkKyM7+QHI43o5jvqb6M0ne1aEx+cXJU8dI58Od8Oha/6vg6C57sRd6XPuZwl2xYKWWmpZmwXNseeI8GPd59ZQntvcUqazKPXbjg2ShCm3oWhU2YtjU8joGplqi6Ifsmhm+DM+E4yDlOE+omE4+WG5L4ytPSb+aIMfk609YzKXDmobKmaER8WyyCp9fyH3n9rKyXnO2QLhR4CG0ZYxE/1gJrVvg2q+C/DIYuHlpvX3kZQEK1i2LUgNoJUk7vaEYgph8WSqQqM+VL3OifUwkv3LAi/GAMcD0phYj2M6mPPJVrBk2aDKMrE69XvtrjTTl+YRgpRrIT5O/zfcoSaYrx3Iv6n25JNLUuQQ3ZAp+lNYX1N9Tajzql3SWPfnoVIKSCsspi0mAj5gw2H3w0s9jiVvYQhVaI0vRE9lBGLP/0bWkai73gMlXKNoKSPY109tLDd+vit3I4TSqElrEzlFuuLSYwKLkMCvyIG8x946s51AC8KWxRD4MYtXv4au/fY1s/ktfuCzCquBlSEogYLhiG9Lr3Za8l4Lk9/FE0DR+Y98XWmdiGRlEWcEGCZJpxviLSGyYmeRDhdH/dTBnEAp5qNc8ngEgn 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:(13230031)(36860700004)(82310400014)(376005)(1800799015); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Apr 2024 08:41:41.3687 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2f7d5c21-681f-4965-2bd2-08dc53b9e295 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: CH2PEPF0000013C.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV8PR12MB9183 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 [ upstream commit 727283742a372359241fafec07f3648d3261e763 ] If rte_flow_configure() failed, then some port resources were either not freed, nor reset to the default state. As a result, assumptions in other places in PMD were invalidated and that lead to segmentation faults during release of HW Steering resources when port was closed. This patch adds missing resource release to rollback procedure in mlx5 PMD implementation of rte_flow_configure(). Whole rollback procedure is reordered for clarity, to resemble reverse order of resource allocation. Fixes: 1939eb6f660c ("net/mlx5: support flow port action with HWS") Fixes: 840f09fbae03 ("net/mlx5: create NAT64 actions during configuration") Fixes: 773ca0e91ba1 ("net/mlx5: support VLAN push/pop/modify with HWS") Fixes: 04a4de756e14 ("net/mlx5: support flow age action with HWS") Fixes: a190f25e6a93 ("net/mlx5: improve pattern template validation") Cc: stable@dpdk.org Signed-off-by: Dariusz Sosnowski Acked-by: Ori Kam --- drivers/net/mlx5/mlx5_flow_hw.c | 37 ++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index 3b854ce73d..fd3e51bf0d 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -7375,6 +7375,14 @@ flow_hw_configure(struct rte_eth_dev *dev, priv->hws_strict_queue = 1; return 0; err: + priv->hws_strict_queue = 0; + flow_hw_destroy_vlan(dev); + if (priv->hws_age_req) + mlx5_hws_age_pool_destroy(priv); + if (priv->hws_cpool) { + mlx5_hws_cnt_pool_destroy(priv->sh, priv->hws_cpool); + priv->hws_cpool = NULL; + } if (priv->hws_ctpool) { flow_hw_ct_pool_destroy(dev, priv->hws_ctpool); priv->hws_ctpool = NULL; @@ -7383,23 +7391,29 @@ flow_hw_configure(struct rte_eth_dev *dev, flow_hw_ct_mng_destroy(dev, priv->ct_mng); priv->ct_mng = NULL; } - if (priv->hws_age_req) - mlx5_hws_age_pool_destroy(priv); - if (priv->hws_cpool) { - mlx5_hws_cnt_pool_destroy(priv->sh, priv->hws_cpool); - priv->hws_cpool = NULL; - } flow_hw_cleanup_ctrl_fdb_tables(dev); flow_hw_free_vport_actions(priv); + if (priv->hw_def_miss) { + mlx5dr_action_destroy(priv->hw_def_miss); + priv->hw_def_miss = NULL; + } + flow_hw_cleanup_tx_repr_tagging(dev); for (i = 0; i < MLX5_HW_ACTION_FLAG_MAX; i++) { - if (priv->hw_drop[i]) + if (priv->hw_drop[i]) { mlx5dr_action_destroy(priv->hw_drop[i]); - if (priv->hw_tag[i]) + priv->hw_drop[i] = NULL; + } + if (priv->hw_tag[i]) { mlx5dr_action_destroy(priv->hw_tag[i]); + priv->hw_drop[i] = NULL; + } } - flow_hw_destroy_vlan(dev); - if (dr_ctx) + mlx5_flow_meter_uninit(dev); + flow_hw_cleanup_ctrl_rx_tables(dev); + if (dr_ctx) { claim_zero(mlx5dr_context_close(dr_ctx)); + priv->dr_ctx = NULL; + } if (priv->hw_q) { for (i = 0; i < nb_q_updated; i++) { rte_ring_free(priv->hw_q[i].indir_iq); @@ -7414,6 +7428,7 @@ flow_hw_configure(struct rte_eth_dev *dev, } if (_queue_attr) mlx5_free(_queue_attr); + priv->nb_queue = 0; /* Do not overwrite the internal errno information. */ if (ret) return ret; @@ -7466,6 +7481,8 @@ flow_hw_resource_release(struct rte_eth_dev *dev) if (priv->hw_tag[i]) mlx5dr_action_destroy(priv->hw_tag[i]); } + if (priv->hw_def_miss) + mlx5dr_action_destroy(priv->hw_def_miss); flow_hw_destroy_vlan(dev); flow_hw_free_vport_actions(priv); if (priv->acts_ipool) { -- 2.39.2