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 492AB4625C for ; Tue, 18 Feb 2025 13:40:08 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 44BD9402A0; Tue, 18 Feb 2025 13:40:08 +0100 (CET) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2051.outbound.protection.outlook.com [40.107.243.51]) by mails.dpdk.org (Postfix) with ESMTP id 267CF402A0 for ; Tue, 18 Feb 2025 13:40:06 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=mUKBdKnpkxJpc6GYBtoDb3gel7EbPnJ/5EBDigRqgt0kcTyBVX6v2CDJC2JeaC9SOWjLvTfiQD+akPBIBatwvgvNXjlyonsyFvRvF685fgAvxr6wI3rE/ntGuzDdlFtX5KgTu7wF8FxqG5SYMgIvvLQ2ST0qahj/MMvqazMX3ZM+Swe7/4EWccq57M3E5VIXUqgiUA1siuC2DoLGa6nHywlLtBP54/lwp5DDNic4Su5l+O0pUN+vN9ijjKdZxuOBrz8IucCRi+M37/4sHT7HpdrYucPs/yHCYX4Q5cTEUkDfx+DmKz8WgpIvOSnz7/jcHfm/InnPqxU52Q5cGcFBvA== 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=xvnbGJY94+/HjvPm8QH6hsVSejEUWIxx8NM7sLszoxI=; b=K/HvtjgBv3hi+bA+yo355csg6GkqlmVJ5Pgu5M97j3SsKUBKHq19fM6URqUtq5x4K4Ayv/LRfKOS+3Eoc4trT+lqXjSHu07qsyC102MR3wlcBKd5AsTzRmdzTP3EfdOGMLQTsGGzEYJvJfQ9y75stTwTv8IB/+U8UOJxc2hD/LqDCS6b7T1Uxok9htInaOaH/40UfKyWgLMeqtRb0nIaeP0Sm1WhhsV4kw9EEMgigw4Od4PsNC5D1HJSZQhVHD4gWxoT3uw47u8sehp4qUYrL5VXsQ5/ifNo2LrqZ5avwY6idppDaam4tNWvTdrIbQDw1zSCLiK4hBM/UL9tRb4AJw== 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=xvnbGJY94+/HjvPm8QH6hsVSejEUWIxx8NM7sLszoxI=; b=sVVHyV0DZQmi6TVWP5+9TbaUm2nBRZuO7dqnkMk0MDbBi/6rH/KB5vIi1iftCFnyV+WdzCs7FlqYzu87z7QcEMhxSmZucy2bd6xbJyS/twLn37knFTL3/4Jrt1WS0TPzCPDltCZnYwZB/jmzZz+F3OeS7UwF80RZ9kw5Jgw5ztF0OYr9SfqTKKptFsHWH5l4OzDcjE8fZOSjXGPbR4RW+ec9Y7irwyKznxIjy5xtItfzpJ6GtgcxX6zTOdRTw4m2ip7MSmvN2kZYX74mthpS9QlUiSQTN9u0sQ/LtEdueI4rTUbekH3qAItDeSnZkv3UER48M5GtULM3Id8CP7mTbg== Received: from MW4P220CA0018.NAMP220.PROD.OUTLOOK.COM (2603:10b6:303:115::23) by IA0PPF0A63E7557.namprd12.prod.outlook.com (2603:10b6:20f:fc04::bc6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.21; Tue, 18 Feb 2025 12:40:02 +0000 Received: from MWH0EPF000989EC.namprd02.prod.outlook.com (2603:10b6:303:115:cafe::3c) by MW4P220CA0018.outlook.office365.com (2603:10b6:303:115::23) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8398.25 via Frontend Transport; Tue, 18 Feb 2025 12:40:02 +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 MWH0EPF000989EC.mail.protection.outlook.com (10.167.241.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.11 via Frontend Transport; Tue, 18 Feb 2025 12:40:01 +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; Tue, 18 Feb 2025 04:39:51 -0800 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.14; Tue, 18 Feb 2025 04:39:49 -0800 From: Xueming Li To: Maayan Kashani CC: , Bing Zhao , dpdk stable Subject: patch 'net/mlx5: fix flush of non-template flow rules' has been queued to stable release 23.11.4 Date: Tue, 18 Feb 2025 20:34:38 +0800 Message-ID: <20250218123523.36836-44-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250218123523.36836-1-xuemingl@nvidia.com> References: <20250218123523.36836-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: 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: MWH0EPF000989EC:EE_|IA0PPF0A63E7557:EE_ X-MS-Office365-Filtering-Correlation-Id: 67ddf676-172d-4d0e-cf2f-08dd50195cf0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|376014|1800799024|82310400026|13003099007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?C8Mbb9gqHJasEGd1+6VM5xK3lV7IR35gsqCJ85rvAaoqT8prfjd88izbpzA7?= =?us-ascii?Q?zpzXPnJPhGYLjNiBhQVZj4t7OSKssWRsY+QNZcGYUGmXehEJ1Cno4b9eqcqy?= =?us-ascii?Q?5IwNGv9hMpAwuCPOEZ8QK72fp+VRXTfmAzaeqX+P+brImngc5t+QvOQKE1Tc?= =?us-ascii?Q?qSaCrzbAjA6TEuhn64zxsqJ7iROoi6WSQ3/ZiyeTs4SAnYqHHZoGUnZnYxa+?= =?us-ascii?Q?wThHjuimvaAeLauFs5d+DB72DyGqc3zA5oHmfTvjcZNbMlS+JSzCtS8kgFD+?= =?us-ascii?Q?fDelUYLd0M9TlfqRe6iWRk/BZj1jyILcppKpHlmprt9jZJjz4s+MPDa9ZUGK?= =?us-ascii?Q?CO86djRQxhJFIAeH9c3HNfZpTzKKGxsvWtVMSCuQ4+W4f6xUdZnXCbMSvMkJ?= =?us-ascii?Q?FuqXA9eD9l4NR7zyr5frbZe2K9pFvn3ILtTZAotf08pNPcestho5O7220vlM?= =?us-ascii?Q?lBV+H49TuOY8N2VHHgUMEv+SFtgIUgZOuGzInHD0I0Yylc+5WkcwDdi/hlDU?= =?us-ascii?Q?8942RSL7ZX/FkF1RfeR+4NiacB0Mmve/IvhVkd849cdv8OXW6oAAAr1BEI1Z?= =?us-ascii?Q?t8qKZn3ZLqmd1cj1UqNpHIqxg6mUUtA/TqB+1CwD3FJzgrThSeskdxWBWc1+?= =?us-ascii?Q?uuiR6G1KETDJ+C9AB35PLEZfupqF7uo0CDtTulOuhb3jiBUyYhHFOVOt24Ck?= =?us-ascii?Q?JO11SKT4ywu1ssb1nSJFZz5xr0AUBB0rPNOAi6KxWMTDYQB2OaOMZqNvFkiE?= =?us-ascii?Q?NuOv+hiAIMR3OGC0Brye93M1TjB6G6xJXbEeTIPsFt9lWedboo1LBdcUIS92?= =?us-ascii?Q?gYsx5U22yheNrMIojK/g/G6GG5rf8PHFtA9BdTi/JmF42I6JBlvn9we2TC4B?= =?us-ascii?Q?qfqRrZp/ePwOO32zpwrZ/qqv+oBWsI4DwbjqxEyKhUE9hfrja6CfCXGYPVBr?= =?us-ascii?Q?Ng9Ip93eB7ERlQ734x0Ucb8Hy1fzzHxTTOAtwWwv/DwPZU7q2iOEaqibGW8A?= =?us-ascii?Q?Cgo04eYnZzq8bNGIyzkIr0gYf2sQJE2XbhWQRFaBm9LhN5oY3HZCaSWn//U6?= =?us-ascii?Q?Qi6QxegpkT2gJihIcSk4uPkFbyaWwsUjsa+Yh9YW15qsfM0aJlvl/3/+gJtM?= =?us-ascii?Q?Lbio7iLzIQyQ7RzLtiZATUeVbr2thc437luotCJTjF4m495pDoxHELSCcKkQ?= =?us-ascii?Q?L/pqM/xxZmxMLphfVHAcXDJrDAITcv7yTPaTwhYaCdk2uuCOlBO4MDsDevQs?= =?us-ascii?Q?Azc2JCFFelJJ4tYNMExTAY1Ditx+YLI12UoFXoHg7gTExOYlxw/RQ0YKxdld?= =?us-ascii?Q?79ZE9wnx+bCTReycJqRZdU6+ituGofFKs4oy2N/7HC/fhjfe/zPabzWbVT56?= =?us-ascii?Q?ADaONCGm8T37gUgApi8benO3ocpz3mEouUCoW9r+fSBpTqeefSzPwGpPfC5/?= =?us-ascii?Q?J2qTEhOBbITLTM7YnVpUEGOYBmQ9cBah7sf+4sx3SFyCeiirONVTXWCVS/QX?= =?us-ascii?Q?5RHG2UbiedQmH4E=3D?= 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)(36860700013)(376014)(1800799024)(82310400026)(13003099007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2025 12:40:01.9543 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 67ddf676-172d-4d0e-cf2f-08dd50195cf0 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: MWH0EPF000989EC.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PPF0A63E7557 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. 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=ef46fae0d4f7dd2cba8356f2700725d868d56b87 Thanks. Xueming Li --- >From ef46fae0d4f7dd2cba8356f2700725d868d56b87 Mon Sep 17 00:00:00 2001 From: Maayan Kashani Date: Tue, 28 Jan 2025 09:54:05 +0200 Subject: [PATCH] net/mlx5: fix flush of non-template flow rules Cc: Xueming Li [ upstream commit 716929be9456b78875d0eb20bc54c13acf99efc0 ] Fix flow flush for non template flows on top of HWS, in another fix it was added return after releasing template flows. Need to drop the return in order to release non template list of flows. Fixes: 1ea333d2de22 ("net/mlx5: fix Rx queue reference count in flushing flows") Signed-off-by: Maayan Kashani Acked-by: Bing Zhao --- drivers/net/mlx5/mlx5_flow.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 1e9484f372..97f678ff4e 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -8104,7 +8104,6 @@ mlx5_flow_list_flush(struct rte_eth_dev *dev, enum mlx5_flow_type type, priv->hws_rule_flushing = true; flow_hw_q_flow_flush(dev, NULL); priv->hws_rule_flushing = false; - return; } #endif -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-18 19:39:02.270644365 +0800 +++ 0043-net-mlx5-fix-flush-of-non-template-flow-rules.patch 2025-02-18 19:39:00.588244055 +0800 @@ -1 +1 @@ -From 716929be9456b78875d0eb20bc54c13acf99efc0 Mon Sep 17 00:00:00 2001 +From ef46fae0d4f7dd2cba8356f2700725d868d56b87 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 716929be9456b78875d0eb20bc54c13acf99efc0 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index bfc44f25bf..a2ee237841 100644 +index 1e9484f372..97f678ff4e 100644 @@ -23 +25 @@ -@@ -8118,7 +8118,6 @@ mlx5_flow_list_flush(struct rte_eth_dev *dev, enum mlx5_flow_type type, +@@ -8104,7 +8104,6 @@ mlx5_flow_list_flush(struct rte_eth_dev *dev, enum mlx5_flow_type type, @@ -30 +32 @@ - MLX5_IPOOL_FOREACH(priv->flows[type], fidx, flow) { +