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 BFFC745610 for ; Fri, 12 Jul 2024 13:03:32 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B75E2402E5; Fri, 12 Jul 2024 13:03:32 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2055.outbound.protection.outlook.com [40.107.237.55]) by mails.dpdk.org (Postfix) with ESMTP id A4842402E5 for ; Fri, 12 Jul 2024 13:03:29 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=en5px9UVotW7wGu4b14pWz3fs2kDwZkz0Fis8ZuvhgD6vYqjJJqxp16zcaokymENv1zQIED8quloku3j8YUIk9LEy7K27Cizmf9qFpccC449PWyJGUvETljv3xouo1iSynxfDoQF9QdJDrOilTKFfYdjncDUEYlLKNXAYtj0f3lOWJrbZfNtw3E1NerqqocXc+51nCfTs7oSGhsKkJSy2aPkkkiwn1Kq6RDVNOsxcEC9byMsBXnIdNw6lzd5qYaCLqU+0/8c9iwnaLxnqJkNcFRcz4KQr/vMQJBf61cgHB8ba08UiDmG5osjVfvKZIemjWins7XWWtQy+CJP7UfAqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=2WgAxYcIcMAdVn+g3n5vGHe5VvsgYMVeex/Ads/vYjA=; b=R5+H6P0LXei1Jc8yFmti7ioD8lxWH7AC7UD4oswiLUcyxLim6102vitmqH9C0r+wgjacHMb+NMfTEUokgV1UHNbmMTnoj6NONeXw0+qPi+UBAhhNyA5H0Ho1nL6JZmbNfopmEAm/14MsnS2tsOXpqkvQEQjlh7Ly+o+XSlDcR6iqHMD8URb/b+mfO0G/BXcP4Xas4PmQtVeL7tHTPGXgzMPSOWPFGRq8AuxrWZEJz+FdDfFo+xRC32+ZXQMr9vK673xEjsBSPoqBfyeMCiehscPueGDhPKu3uTOcl64XBLDfghYR0lsChgeOMw2leRhF224oo5u/vOdLCo9Qs9Mu1g== 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=2WgAxYcIcMAdVn+g3n5vGHe5VvsgYMVeex/Ads/vYjA=; b=qSpLIjk3CfgVv2PGi0OHVn190qdv+fhVSZuBvce/QXk+YwM+cEpEX7eQNN41fNjVg6Mk6G+6sxns+EdQl9u6wvzx5WWPq7whIUM9ZXquDYJMWUHjKSQ5SmEuZzpcYKQWoN/XoSSv3VgTDE59mITEC813AqgTfMAXvCFM4FwOdcQSwaG0WEJ3L6trMH+tZ6TLMHgm3d+3pqfJOipSd5jm+YLR7oFY4c35aj6Yb5MCeBY8dKgsAlsdkuZS1DHUoPuNXb2+IcxULyqQ2cSgVY1LW3wEBYx2mzLLSkXKfP2qTKT70vSlkzxkNUnKwxytLz0QK3kAWxXzd/cl4YPdN8yYUw== Received: from PH8PR07CA0032.namprd07.prod.outlook.com (2603:10b6:510:2cf::6) by SN7PR12MB6742.namprd12.prod.outlook.com (2603:10b6:806:26e::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.33; Fri, 12 Jul 2024 11:03:24 +0000 Received: from SJ5PEPF000001E9.namprd05.prod.outlook.com (2603:10b6:510:2cf:cafe::d3) by PH8PR07CA0032.outlook.office365.com (2603:10b6:510:2cf::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.23 via Frontend Transport; Fri, 12 Jul 2024 11:03:24 +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 SJ5PEPF000001E9.mail.protection.outlook.com (10.167.242.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.17 via Frontend Transport; Fri, 12 Jul 2024 11:03:24 +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.1544.4; Fri, 12 Jul 2024 04:03:11 -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.1544.4; Fri, 12 Jul 2024 04:03:09 -0700 From: Xueming Li To: Alexander Kozyrev CC: Dariusz Sosnowski , dpdk stable Subject: patch 'net/mlx5: break flow resource release loop' has been queued to stable release 23.11.2 Date: Fri, 12 Jul 2024 19:01:43 +0800 Message-ID: <20240712110153.309690-13-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240712110153.309690-1-xuemingl@nvidia.com> References: <20240712104528.308638-1-xuemingl@nvidia.com> <20240712110153.309690-1-xuemingl@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: SJ5PEPF000001E9:EE_|SN7PR12MB6742:EE_ X-MS-Office365-Filtering-Correlation-Id: 69efb9a6-ea93-4464-8143-08dca2624027 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|36860700013|1800799024|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?jSOqtjxe1Bh2y3vUu89z0SvG2PRPFRBD9NtRJ1Gh4c5O84zqQaaLBMkloct8?= =?us-ascii?Q?YVqLMvf+JkEVqI/QXDk046LScZXGausyS+JcGzFBD3ABqGy9LEH2l25avRth?= =?us-ascii?Q?8Jf8Mjfm9z2ElQV+1VTKXyNFwSsXY6iKLganVhNGIDPJx2C9J9CChpZNcDKe?= =?us-ascii?Q?V7z69psmvNoIaXOWuegzKT5ET87ypb2iOBYU8saOdsfgRk5GwwgZTKRSciPT?= =?us-ascii?Q?EJhczlPo5/ay2IXWMQ94DBXPdR/u1rZm3egquAY0enwsgmQG8IN4GiF/3PwV?= =?us-ascii?Q?cXB7rRX7vrEjxTv60/YM15iK6oqQN65iYcEE6Ar9JrtDUcvXHAaUKni6JaK/?= =?us-ascii?Q?s6MFjKG9HCDXglBU8+cYjCg5QYAwvtBcbr766DJ/pwlwn23YQAMNz/jpNzMI?= =?us-ascii?Q?0YB3dOTbnfazBLbIaGfL48aIQZsBkf6i4BnVwghK87r0KWn/NFqT2LMUrm17?= =?us-ascii?Q?lYovmIaROZ17I7aULNqm4yQriLH5P7mgsMLIvDZ60WxUowFPNQB0NFsbg2CM?= =?us-ascii?Q?4Uh/MnhbrdX7/KOj0SoFsav2OIvphzx8EGL3j6849qO0jSe2+EC4WE42h7V1?= =?us-ascii?Q?rhFVSEE3lQZEce38Wqdyu8Wjkkmd6PcaMzMW2RGG/QKnoucVhX2i/dPnXODv?= =?us-ascii?Q?GPfA2DLkq+7zu5Rmds1v2o3fiROFUnncVajnJ6g/HE7RfQdail1SjsIu3ni6?= =?us-ascii?Q?+whv8QYAstm6Sy/8BEg2uAQZZ9PYWDoNocN8nHeVpXE6Xszno9o+5wr+HFgQ?= =?us-ascii?Q?UhXTwtUTHBTYpMCw30jhIqYUJuMcHX1Komv2RnGbPsXsmh3hXnB2KLquWFdS?= =?us-ascii?Q?M24bOzPKvoP1SCLFuLzwMgLbSL1nirUsYCnpPjNZtlXi6/SAaoDlu5JAdpy2?= =?us-ascii?Q?RZaFFC0HjkjLbL2+ia8yLtt/A6YFaHqX9RDZjhRIlZaatwy0W9EhxAFQyX69?= =?us-ascii?Q?mlMU/p9wVYQeLXXnjBd2+PX65vbvG6kjOfpLa70ouCUFur5fTFMxf4n0A1Dz?= =?us-ascii?Q?qFNzlneIuZGq2l38vb+XNXv9LKblvuMoRuThhojF5k72FQPDn2UkTSkgG9kB?= =?us-ascii?Q?C8zgrsmfNC6u2ZASqnIieikPs4I/Nmlvh/nnk5uUv+Aj9K8Fx5gbbvdWglJu?= =?us-ascii?Q?WewkZtHw5gaOvdxhJkdLLWHgwGcsMBMtpzeJIrNw7YGB+Cm4GrbeJIo3Z87B?= =?us-ascii?Q?CBASl3gGFVdgXP1pFs1eZ5xIQ2JtoImoauViOuF29dTpu+Rq+McJEWMqWLv4?= =?us-ascii?Q?2koDlSvJd9oZ/4jzEYoKvp2587XfVuuxKcEwIAKg307FZt+YQReDJNsb5cI5?= =?us-ascii?Q?IId+7q5fqVAxqG0YDkWhzEF7UZ7caL6Id9XFs4//6b8vr1TAtdOL1+U86pGP?= =?us-ascii?Q?tAJgF7W09vBEcQ8v1aQ5PIMknX0Zk9jTDUu5vRK/+uKP6nMETHn7tMfOkJ6U?= =?us-ascii?Q?gLHsbHy8APEVrZUf0LqhHX6HFhhpK1QY?= 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:(13230040)(376014)(36860700013)(1800799024)(82310400026); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2024 11:03:24.6124 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 69efb9a6-ea93-4464-8143-08dca2624027 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: SJ5PEPF000001E9.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB6742 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 Hi, FYI, your patch has been queued to stable release 23.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/14/24. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=a5a685a9f08f63eec57884f61ea46b058c79fdc7 Thanks. Xueming Li --- >From a5a685a9f08f63eec57884f61ea46b058c79fdc7 Mon Sep 17 00:00:00 2001 From: Alexander Kozyrev Date: Thu, 30 May 2024 00:46:32 +0300 Subject: [PATCH] net/mlx5: break flow resource release loop Cc: Xueming Li [ upstream commit 4fcb7a05e38172aed60f87a6287bb2ee3d9828fd ] There is a loop inside the flow_hw_resource_release() function that tries to free all the template patterns and tables until they are successfully released. But some of the tables may be still in use in case of the ungraceful application termination. Which causes the forever loop in the app on the exit. Don't wait for the tables release and try them to free only once and proceed with the exit. Fixes: d1559d66ed2d ("net/mlx5: add table management") Signed-off-by: Alexander Kozyrev Acked-by: Dariusz Sosnowski --- drivers/net/mlx5/mlx5_flow_hw.c | 62 +++++++++++++++++++-------------- 1 file changed, 36 insertions(+), 26 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index 39e68b39f7..9667bad68e 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -4663,7 +4663,7 @@ flow_hw_table_destroy(struct rte_eth_dev *dev, return rte_flow_error_set(error, EBUSY, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, - "table in use"); + "table is in use"); } LIST_REMOVE(table, next); for (i = 0; i < table->nb_item_templates; i++) @@ -6706,7 +6706,7 @@ flow_hw_actions_template_destroy(struct rte_eth_dev *dev, return rte_flow_error_set(error, EBUSY, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, - "action template in using"); + "action template is in use"); } if (template->action_flags & flag) mlx5_free_srh_flex_parser(dev); @@ -7124,7 +7124,7 @@ flow_hw_pattern_template_destroy(struct rte_eth_dev *dev, return rte_flow_error_set(error, EBUSY, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, - "item template in using"); + "item template is in use"); } if (template->item_flags & (MLX5_FLOW_ITEM_OUTER_IPV6_ROUTING_EXT | MLX5_FLOW_ITEM_INNER_IPV6_ROUTING_EXT)) @@ -9798,10 +9798,10 @@ void flow_hw_resource_release(struct rte_eth_dev *dev) { struct mlx5_priv *priv = dev->data->dev_private; - struct rte_flow_template_table *tbl; - struct rte_flow_pattern_template *it; - struct rte_flow_actions_template *at; - struct mlx5_flow_group *grp; + struct rte_flow_template_table *tbl, *temp_tbl; + struct rte_flow_pattern_template *it, *temp_it; + struct rte_flow_actions_template *at, *temp_at; + struct mlx5_flow_group *grp, *temp_grp; uint32_t i; if (!priv->dr_ctx) @@ -9811,25 +9811,35 @@ flow_hw_resource_release(struct rte_eth_dev *dev) flow_hw_cleanup_ctrl_fdb_tables(dev); flow_hw_cleanup_tx_repr_tagging(dev); flow_hw_cleanup_ctrl_rx_tables(dev); - while (!LIST_EMPTY(&priv->flow_hw_grp)) { - grp = LIST_FIRST(&priv->flow_hw_grp); - flow_hw_group_unset_miss_group(dev, grp, NULL); - } - while (!LIST_EMPTY(&priv->flow_hw_tbl_ongo)) { - tbl = LIST_FIRST(&priv->flow_hw_tbl_ongo); - flow_hw_table_destroy(dev, tbl, NULL); - } - while (!LIST_EMPTY(&priv->flow_hw_tbl)) { - tbl = LIST_FIRST(&priv->flow_hw_tbl); - flow_hw_table_destroy(dev, tbl, NULL); - } - while (!LIST_EMPTY(&priv->flow_hw_itt)) { - it = LIST_FIRST(&priv->flow_hw_itt); - flow_hw_pattern_template_destroy(dev, it, NULL); - } - while (!LIST_EMPTY(&priv->flow_hw_at)) { - at = LIST_FIRST(&priv->flow_hw_at); - flow_hw_actions_template_destroy(dev, at, NULL); + grp = LIST_FIRST(&priv->flow_hw_grp); + while (grp) { + temp_grp = LIST_NEXT(grp, next); + claim_zero(flow_hw_group_unset_miss_group(dev, grp, NULL)); + grp = temp_grp; + } + tbl = LIST_FIRST(&priv->flow_hw_tbl_ongo); + while (tbl) { + temp_tbl = LIST_NEXT(tbl, next); + claim_zero(flow_hw_table_destroy(dev, tbl, NULL)); + tbl = temp_tbl; + } + tbl = LIST_FIRST(&priv->flow_hw_tbl); + while (tbl) { + temp_tbl = LIST_NEXT(tbl, next); + claim_zero(flow_hw_table_destroy(dev, tbl, NULL)); + tbl = temp_tbl; + } + it = LIST_FIRST(&priv->flow_hw_itt); + while (it) { + temp_it = LIST_NEXT(it, next); + claim_zero(flow_hw_pattern_template_destroy(dev, it, NULL)); + it = temp_it; + } + at = LIST_FIRST(&priv->flow_hw_at); + while (at) { + temp_at = LIST_NEXT(at, next); + claim_zero(flow_hw_actions_template_destroy(dev, at, NULL)); + at = temp_at; } for (i = 0; i < MLX5_HW_ACTION_FLAG_MAX; i++) { if (priv->hw_drop[i]) -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-12 18:40:18.206711635 +0800 +++ 0092-net-mlx5-break-flow-resource-release-loop.patch 2024-07-12 18:40:14.306594203 +0800 @@ -1 +1 @@ -From 4fcb7a05e38172aed60f87a6287bb2ee3d9828fd Mon Sep 17 00:00:00 2001 +From a5a685a9f08f63eec57884f61ea46b058c79fdc7 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 4fcb7a05e38172aed60f87a6287bb2ee3d9828fd ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -23 +25 @@ -index e8c06387f8..53c6cc5961 100644 +index 39e68b39f7..9667bad68e 100644 @@ -26 +28 @@ -@@ -5062,7 +5062,7 @@ flow_hw_table_destroy(struct rte_eth_dev *dev, +@@ -4663,7 +4663,7 @@ flow_hw_table_destroy(struct rte_eth_dev *dev, @@ -35 +37 @@ -@@ -7362,7 +7362,7 @@ flow_hw_actions_template_destroy(struct rte_eth_dev *dev, +@@ -6706,7 +6706,7 @@ flow_hw_actions_template_destroy(struct rte_eth_dev *dev, @@ -44 +46 @@ -@@ -7986,7 +7986,7 @@ flow_hw_pattern_template_destroy(struct rte_eth_dev *dev, +@@ -7124,7 +7124,7 @@ flow_hw_pattern_template_destroy(struct rte_eth_dev *dev, @@ -53 +55 @@ -@@ -10787,10 +10787,10 @@ void +@@ -9798,10 +9798,10 @@ void @@ -68 +70,2 @@ -@@ -10802,25 +10802,35 @@ flow_hw_resource_release(struct rte_eth_dev *dev) +@@ -9811,25 +9811,35 @@ flow_hw_resource_release(struct rte_eth_dev *dev) + flow_hw_cleanup_ctrl_fdb_tables(dev); @@ -71 +73,0 @@ - flow_hw_action_template_drop_release(dev);