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 B9F7E4624E for ; Mon, 17 Feb 2025 18:06:43 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B5DEB400D6; Mon, 17 Feb 2025 18:06:43 +0100 (CET) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mails.dpdk.org (Postfix) with ESMTP id D0D99402BB for ; Mon, 17 Feb 2025 18:06:41 +0100 (CET) Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-4395a06cf43so28530795e9.2 for ; Mon, 17 Feb 2025 09:06:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739812001; x=1740416801; 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=pUcdnLs6yv1phVqbbjKyej0BcCPSLtVyCHA+H6y9UcU=; b=SmARdiXVI2yM0Li634TQ3IYQnktTEd4nWJZF36aRVVrrB+ffOSNt9GkOrAYaixYzRp iDPN2n5y2GkFW8GKpWunpRaBuNHTuG+wvY0KSXEGrlponoN91maq//8o9xxdqYHdpShN RY+UJ3nt3djj1ooSE2x8Ty09fVMfhQz46ao0tmyJ7ovN5CT4Jp9xhQo2FFjDMyuK8GPZ HEzEsuZZWZ5z2UeL2gsbTqT8Aaq42UnLyhpC3GWqnqFa9CN1Yz/KBxUaNaclJCmPgTr1 2mm3W7waeGZwYPSdxliojPZ0OrvLk3jE35JC4aCf9ODXgpJQUzQdeiLGnjPkzNrS2fHB qD+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739812001; x=1740416801; 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=pUcdnLs6yv1phVqbbjKyej0BcCPSLtVyCHA+H6y9UcU=; b=I2PlEiOi+2XmH+7n5Q/DkfU9xX6CkQqvFn4hadVBEtX6Lbd6Lzm/KHOrWSlpvp7PUE lN2jgUrYweXGDPc1gZYCKvIFoG2FT/5VvMwoDoKcnaANwBfVjdlRtNPKaEII0+dk3XPT aqV0AFTvHjjbKs5v8TKomSdO1qb+Es9dqVgylX/9+F8K1r4AzKJrapWnGHN5692cesEb JZmQ1esUvz/SBvA/6/MU7Co5nJ7nGoHpuDAcnQluVVFhMnOspe12QyVm7HhEMSCXHyGz Gti6v6udz17AfN8NRhnN6Co09rrp7uMQgdLrr2LiIhGGBBgHGihPYEzbO8o4afC2acrx xtjg== X-Forwarded-Encrypted: i=1; AJvYcCXPJbkxHSwr5IW6B51TK+WvliyIxmcqczPhkJa4AKVkwu+PwQgJGY6YuRBmAemJjTxoOpFi3hE=@dpdk.org X-Gm-Message-State: AOJu0Yw0qzkmE+zF9qmDTIrgO253ulnRdJciteXoZ2dfFa0mDIoiCDOF RHrEGcWfwLdX3DAOUryRw6Ej7fxUSTsAh5yKIt3jlAJe3Pt3uvvKrtrkyJyqtSyOKg== X-Gm-Gg: ASbGncussLAKHNTPVzRuPekqCWuBdjTP2qsaRRMi7DK6TKRaWU72ZuSUPtkK8fVzt45 LFlL5RvpAQBy02uRxmRDO6CaC0lOkdXY68AfoNYNYeW+JMWwNUryRp6bJtCYIUPMTFKx1+Wv3iP xTGcBo8G8ScDw2Px6WRbGK+xDgRZiiFr7Kvx4T2w442pxGnW9fujO21YebtLdfU8nrj4LWvZqjd OOJ7DULBa1a/voykmypSZgdEAv1tCJiEB5ZNcr1L1oMllGwGn2hohKIPUwGKlisjbR78HC9Uu2p 8J/1d9wIefubHK9tQjZr5A== X-Google-Smtp-Source: AGHT+IHhXgaP7z8B/+VKhiHDUI9t6f7qnxtw7Rg1c+z8TmqCE0DWtWIhYIoVMeiUohw4205Pz6k1jw== X-Received: by 2002:a05:600c:3596:b0:439:4376:cc0 with SMTP id 5b1f17b1804b1-4396e765256mr69491385e9.25.1739812000590; Mon, 17 Feb 2025 09:06:40 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:f83c:95e7:29fd:a997]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-439848a1146sm34680305e9.15.2025.02.17.09.06.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2025 09:06:39 -0800 (PST) From: luca.boccassi@gmail.com 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 22.11.8 Date: Mon, 17 Feb 2025 17:04:05 +0000 Message-ID: <20250217170456.1068278-32-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250217170456.1068278-1-luca.boccassi@gmail.com> References: <20250217170456.1068278-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.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/19/25. 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/6ded800ee12f53831b846b31dcad64081c214bfe Thanks. Luca Boccassi --- >From 6ded800ee12f53831b846b31dcad64081c214bfe 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 [ 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 f66edf1c64..6fe51f70a8 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -7477,7 +7477,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.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-17 16:13:17.994747786 +0000 +++ 0032-net-mlx5-fix-flush-of-non-template-flow-rules.patch 2025-02-17 16:13:16.826441592 +0000 @@ -1 +1 @@ -From 716929be9456b78875d0eb20bc54c13acf99efc0 Mon Sep 17 00:00:00 2001 +From 6ded800ee12f53831b846b31dcad64081c214bfe Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 716929be9456b78875d0eb20bc54c13acf99efc0 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index bfc44f25bf..a2ee237841 100644 +index f66edf1c64..6fe51f70a8 100644 @@ -23 +24 @@ -@@ -8118,7 +8118,6 @@ mlx5_flow_list_flush(struct rte_eth_dev *dev, enum mlx5_flow_type type, +@@ -7477,7 +7477,6 @@ mlx5_flow_list_flush(struct rte_eth_dev *dev, enum mlx5_flow_type type, @@ -30 +31 @@ - MLX5_IPOOL_FOREACH(priv->flows[type], fidx, flow) { +