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 9A342454E9 for ; Tue, 25 Jun 2024 02:03:08 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7C3FB42795; Tue, 25 Jun 2024 02:03:08 +0200 (CEST) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mails.dpdk.org (Postfix) with ESMTP id 6CB6B410DC for ; Tue, 25 Jun 2024 02:03:06 +0200 (CEST) Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-366f747705dso893125f8f.2 for ; Mon, 24 Jun 2024 17:03:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719273786; x=1719878586; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ilIWG5yLXfWj/bgYJm8yNQBydEC6/+pbNkFGYuA29YM=; b=CvrET3sY4jGG9T5am4al4bAs5IZejtzhxuQNWFTNVA9laZeglMni57lmvxj5rCUF5I jSTIgBxjcvztSLxvLTDvv+aPgMaF/mRz2p5Rc6FANF1gHHs0x6NZnweSDusSf27vlpVg o6KCVIPXl81XoHvsQbT1Wkfc3ZYKA/26MfC4F6n4OQRlvBTXxqOLx+M6mR6dmbCrFry7 mwXDdXUx9ReT6mOk1MUf3dSZC0tzq0wgE8uCxFD2/58qO2LWNRwTAGSqz1eatNKzQ9Ss iOlQTY+Oa2K385y1dT6ICtRWDRZH4RO4xzF7idG7NAb+xUQ/tRYk1QKNTtBvOR+205Tb ALcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719273786; x=1719878586; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ilIWG5yLXfWj/bgYJm8yNQBydEC6/+pbNkFGYuA29YM=; b=XDD9zX1r5/UB3KEShAeeZ2jUaqkLgUIObS48Eyf2yuSIkAbxONv2KZdG5reTJ05V8I BuRQfHac0487JbW58PunN3965c9zsUPRHznh/NCSAMyrnMZv1/X+v5JO5T5n7SRdMSv9 frABsNQZnTABSg4T4nhmTyDqDTdB1Iq16UiZj+6Q7YMz6u724jFBGsmloVbszLtEeNBL vhfzEivyC0e6JAN0Q/aD4bCBcMEGU+AuWo2fNjimA5/FxGXFUWvsfX+5nN5bSF2m+kZ6 hiUOLwCW/Tk2icXBBJK/9Dxe+ArFWnx9L16RnV/MzFMBppA03T8Pn5hxIsnddv5oYS1w 5qHg== X-Forwarded-Encrypted: i=1; AJvYcCWOnmcISoSfXXTUB10DKCcQ7c660C7yJW6+OCZYFMvRmTvdfNP15cyuPWwREUiFnAtGCldNgGMaiyjZG5+7ACk= X-Gm-Message-State: AOJu0YwSHcVSNI/KBlnQvDmsi99e0pUIalnNdlrM0P0/ZzdN+5ClpAy6 DK1cj+EEMWpeTRdwQPKOX0xvNctnw9r305PG54pHF/n30GKu8pzS6+W8SyH/ X-Google-Smtp-Source: AGHT+IFx9o2XwXwFaACbEfgzrgCs93+AbZioy/LnJdrtJZajFaEArf6Uyz9Pf0a8s9NtZsgRlBIFnA== X-Received: by 2002:a5d:680f:0:b0:360:82c7:f07f with SMTP id ffacd0b85a97d-366e9632631mr4174471f8f.57.1719273786004; Mon, 24 Jun 2024 17:03:06 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:7aef:1aaa:3dff:d546]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3663a8c8f50sm11290007f8f.109.2024.06.24.17.03.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jun 2024 17:03:05 -0700 (PDT) From: luca.boccassi@gmail.com 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 22.11.6 Date: Tue, 25 Jun 2024 00:58:58 +0100 Message-Id: <20240624235907.885628-72-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240624235907.885628-1-luca.boccassi@gmail.com> References: <20240624235907.885628-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 22.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/27/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://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/c8ee47f1a628a73945e85d5b7eaaf290dfeebf3e Thanks. Luca Boccassi --- >From c8ee47f1a628a73945e85d5b7eaaf290dfeebf3e 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 [ 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 1069b84157..f8431386e0 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -14882,7 +14882,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.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-06-25 00:22:17.266755069 +0100 +++ 0072-net-mlx5-fix-hash-Rx-queue-release-in-flow-sample.patch 2024-06-25 00:22:13.257187117 +0100 @@ -1 +1 @@ -From cf3f6ba146abe613c811a281ceadf7b22ef82ab6 Mon Sep 17 00:00:00 2001 +From c8ee47f1a628a73945e85d5b7eaaf290dfeebf3e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit cf3f6ba146abe613c811a281ceadf7b22ef82ab6 ] + @@ -18 +19,0 @@ -Cc: stable@dpdk.org @@ -28 +29 @@ -index 04cb9291a8..7330e13787 100644 +index 1069b84157..f8431386e0 100644 @@ -31 +32 @@ -@@ -15668,7 +15668,8 @@ error: +@@ -14882,7 +14882,8 @@ error: