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 573AA45610 for ; Fri, 12 Jul 2024 13:03:30 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4E6FB402E5; Fri, 12 Jul 2024 13:03:30 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2046.outbound.protection.outlook.com [40.107.92.46]) by mails.dpdk.org (Postfix) with ESMTP id F0BE840261 for ; Fri, 12 Jul 2024 13:03:28 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=VYlXk+ujfTd/p5iiyBYJBBkREPC30MW0SLLwXl2XEFr6T5l21R980NLFqeLut6lRahDShD/c0UlCHtD0JNBRQjbP59kMUWxRoJ9AZ815xm8XtRu1iuJXyGpaQwebvZeWGFyeIaybvmocKhU4/ZaoduRGysWPHSegZ/hPqEFYJDAQjaK9MksGv4bQoZSZOUVFYDwPzHm4xcL6AmAvsaC1rt7H6Srp4btnt+Pyhqy/W2UehnqQSEL4+GMAma56xIzn4hssQ0M5V1ykDgWDGaQzIvRN7LY4yHmAxOhci6g/6MIhDIIxB5P2fTkL99g31AjozulmEgQtQvOq6qvgBPijMg== 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=cwTZykPbfPknUf81u5+1cjTYm3+KllcCl5zPHdbDj/4=; b=t5CcxDurPgNqGMMogUNQojcAx4mwRMyPCr3Y2qJFYG31hY85qolwxRMZXYmiZhmyWru6CDNWahT3ZeSGxZUQUb5HWZbAM8sceBqBNWzIQFrBtNVOLTyoDFnGr4XG4tiYLzd06mkcGaI9PVqGhvwYtPvkk3Dk0PRHluEmuM03QEWujdNSvFPlSW6P4CGdGTq1InmImKhkx7ZQG/JqS4Qsr0BVvXL3R/QphIxbEcDtXVpZoy6S034xFssiRAuJVvR835FGLsMXM4ZsOzSNPmm+thFR2X8HJeGJj/Cg6GnNHpFFh7KfY07FLNHPCxqUx9hofP+3I4Cv60SpjZfCkJN+5g== 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 (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=cwTZykPbfPknUf81u5+1cjTYm3+KllcCl5zPHdbDj/4=; b=jUw+ehTkCSLUxzMBBRmGYIQ69hSBKoA1BEXNIddhLHRmeMG8xxZ6NYwd+TFDWMIDOeKi7ITdMBIzltsLyjFxP1WOXcU37Ke6MWLIfM3v6wAzGU193HjKfiKs5ZUPXqXl7d+js+oZHVCIQkFSE0hsSAcRYE0jjqfYG3FDk6j7V3CsgTK/PWf0Ps9ny8TbyMqXA3AMReE4FFrq9enQEFov/kyvKUjc6jmBFjLUEJJUT09iCEdHa+LVhZCzaACGMkRtKXdMr+j4I29eHQC8NiHFW33j+JnW6TP/sDkwyAbZiLAI6IrYizAgCZ9IkeYmgorx78sKZsDxUDYkHlzpsuAEQg== Received: from MN2PR04CA0003.namprd04.prod.outlook.com (2603:10b6:208:d4::16) by MW6PR12MB8998.namprd12.prod.outlook.com (2603:10b6:303:249::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.21; Fri, 12 Jul 2024 11:03:24 +0000 Received: from BL02EPF0001A0FF.namprd03.prod.outlook.com (2603:10b6:208:d4:cafe::1a) by MN2PR04CA0003.outlook.office365.com (2603:10b6:208:d4::16) 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.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 BL02EPF0001A0FF.mail.protection.outlook.com (10.167.242.106) 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:23 +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.1544.4; Fri, 12 Jul 2024 04:03: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.1544.4; Fri, 12 Jul 2024 04:03:04 -0700 From: Xueming Li To: Jiawei Wang CC: Bing Zhao , Dariusz Sosnowski , dpdk stable Subject: patch 'net/mlx5: fix hash Rx queue release in flow sample' has been queued to stable release 23.11.2 Date: Fri, 12 Jul 2024 19:01:41 +0800 Message-ID: <20240712110153.309690-11-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: BL02EPF0001A0FF:EE_|MW6PR12MB8998:EE_ X-MS-Office365-Filtering-Correlation-Id: f46ae232-0bf3-4cb1-1b53-08dca2623fa7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|82310400026|36860700013|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?IkjUfG9sYPAuIicY+4hu6Uf4Iu6kLEM+Y5c//GJ8nHZZpvzwc1VxjJ9fdK59?= =?us-ascii?Q?bIyXgyQKScAKwyZEh/0sUvrRbSXH3HcYW9p7dl3NSWK+jrFvrtrS80hHmCyu?= =?us-ascii?Q?JlnEvNnQNk+CRgNFfRWP2FxPuIoK+LfL4a8xDihBB9BG3tTscJCjusHXxrWf?= =?us-ascii?Q?OoU25XPfMJLiH+La6Bu66calBhNu0Uu30DjVg18JsrK+rCheZA0GloCWQNPy?= =?us-ascii?Q?CxuW2mjiXOsndtvrwwHU1cVtJfE+nKCPBXQvWiiIKDf1NmVwHIwnrJre0yiA?= =?us-ascii?Q?WZEivhcZmokzCepyPrRAxgUsIQEez/P+J3GJJXy5HXfLzS2MQhi5joKji0l/?= =?us-ascii?Q?oQJyxC1LrtmOIibV7FNRWWcVZQhQoeg77vEqD5T5tqGfM16wwfwp/JAx4XR4?= =?us-ascii?Q?t0sUQccm64AKlsO6Yh66N1ez3cxmc82qywcTyflHQ5I65ZPyhMNKmpghO9Q7?= =?us-ascii?Q?Z4FBRvnekr3rJalWth7/SlEVhdxHuVb1qJd/PNygJ07td1Om8JVvqQoUctgU?= =?us-ascii?Q?+7L8Sf07UgXvxlLzp/v6O1HQTPsuT7wYhHfkWjboqhMK0xJGddtJ/NWzGjuf?= =?us-ascii?Q?AscqzPgVA1FAyTbO5IoBzWL4bpImU6VdWHnMVq3UocsU29/j44Jg6oBWohxU?= =?us-ascii?Q?bJeo7hF2VBcoAocOs8kYPqMCMGDz1aCBsAzGEK6h6CJqX8GawckAlSk/wKnJ?= =?us-ascii?Q?YDm6s+El1gp4nZNq+TRBGbvIDf6WSZ4qGIZXpZ/kfDCEHq7/88obtHr+C1uc?= =?us-ascii?Q?wH46nQE0wK0gWI4DWzU8fVe45dWnA/5vMfJZMdOlb/2Inc3v8w67KQorPlU5?= =?us-ascii?Q?Sk+MByy52WyhPO3Gk8Ka9NfbkMUPm1Sf9n6A9J4DzVW3QtzNfjdO1nKhH8do?= =?us-ascii?Q?yN7WCtVW2OAPgE9xS8GvXmcee4eDHk2/IjcqmxS2b/6wgy9rX6EPBv31287y?= =?us-ascii?Q?+kswd5+lYxr6aJQnl5vyT7FGMJU/eLo55pkFp/mQ78/CyZwHEYZtQXyiIkdg?= =?us-ascii?Q?Ba45u7f92ptYUhDa2WGVSqdjECMKS0elrzeYq2A4XJA+gYUz+zIDFKNYDjcQ?= =?us-ascii?Q?KnEPDotoJPJ3o8x/7hYWOElfV0qJRcCWT5xieDExzuTeXQVkGrVY/1RPMqNB?= =?us-ascii?Q?muVgtkPGv7QUBih9KjN1d4hPucrtGPQmizwjNyMl369EoBI99vAc8AcoAVtk?= =?us-ascii?Q?YsNY1qVv7F9hgcsP3ZvKTsDbjrqfhrCSi2N4iA1mRv9R1lKZyT8sYqD/EfJc?= =?us-ascii?Q?6NiXWC2vR09+U/i3TA32/0xuIsmpAnZBGPqX5YCDsGpqKTDMnxBc/gs0kd9p?= =?us-ascii?Q?/15lWjGo2NgH9ar1Bb5S+xwzkAbeWHNllEsSmBA9Wsft8DdaY8lAIOP7hZcD?= =?us-ascii?Q?p6ErTWYILbeeTA8qnG2+3648AEYaiq5AH8T98hW8V7+ilpkeAjsSRc840ylI?= =?us-ascii?Q?FXQvEkslw/sVE504RVMjDHLVXw7OmXU2?= 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:(13230040)(376014)(82310400026)(36860700013)(1800799024); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2024 11:03:23.6147 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f46ae232-0bf3-4cb1-1b53-08dca2623fa7 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: BL02EPF0001A0FF.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW6PR12MB8998 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=82668d33e8f0729fc6ec089a5637b62a0207bdde Thanks. Xueming Li --- >From 82668d33e8f0729fc6ec089a5637b62a0207bdde Mon Sep 17 00:00:00 2001 From: Jiawei Wang Date: Mon, 20 May 2024 18:07:09 +0300 Subject: [PATCH] net/mlx5: fix hash Rx queue release in flow sample Cc: Xueming Li [ upstream commit cf3f6ba146abe613c811a281ceadf7b22ef82ab6 ] While the queue/RSS action was added to sample action lists, the Rx hash queue resource was allocated in the sample action translation to create the sample DR action later. While there's a failure in the flow creation, the Rx hash queue resource of the sample action list was destroyed in the wrong place. This patch adds the checking to release the Rx hash queue resource after the sample action release, to avoid one more extra release if there's a failure. Fixes: ca5eb60ecd5b ("net/mlx5: fix resource release for mirror flow") Signed-off-by: Jiawei Wang Reviewed-by: Bing Zhao Acked-by: Dariusz Sosnowski --- drivers/net/mlx5/mlx5_flow_dv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index b3ccc2063c..b97e00b287 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -15389,7 +15389,8 @@ error: SILIST_FOREACH(priv->sh->ipool[MLX5_IPOOL_MLX5_FLOW], flow->dev_handles, handle_idx, dh, next) { /* hrxq is union, don't clear it if the flag is not set. */ - if (dh->fate_action == MLX5_FLOW_FATE_QUEUE && dh->rix_hrxq) { + if (dh->fate_action == MLX5_FLOW_FATE_QUEUE && dh->rix_hrxq && + !dh->dvh.rix_sample && !dh->dvh.rix_dest_array) { mlx5_hrxq_release(dev, dh->rix_hrxq); dh->rix_hrxq = 0; } else if (dh->fate_action == MLX5_FLOW_FATE_SHARED_RSS) { -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-12 18:40:18.107034147 +0800 +++ 0090-net-mlx5-fix-hash-Rx-queue-release-in-flow-sample.patch 2024-07-12 18:40:14.276594207 +0800 @@ -1 +1 @@ -From cf3f6ba146abe613c811a281ceadf7b22ef82ab6 Mon Sep 17 00:00:00 2001 +From 82668d33e8f0729fc6ec089a5637b62a0207bdde Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit cf3f6ba146abe613c811a281ceadf7b22ef82ab6 ] @@ -18 +20,0 @@ -Cc: stable@dpdk.org @@ -28 +30 @@ -index 04cb9291a8..7330e13787 100644 +index b3ccc2063c..b97e00b287 100644 @@ -31 +33 @@ -@@ -15668,7 +15668,8 @@ error: +@@ -15389,7 +15389,8 @@ error: