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 5452D43835 for ; Tue, 5 Mar 2024 16:36:30 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 65C5242E82; Tue, 5 Mar 2024 16:36:24 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 5F0AD42E82 for ; Tue, 5 Mar 2024 16:36:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709652983; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gtbsloT9RgQCfKWix1OvSKT2XSaoLf8sC7v25Nx/vbc=; b=DVzrTesslg6VYLliD73r9jTA2h2leMPZ/0qJvnRIG3DjpVS5V/ZcsM2gbkbXzABl1ZcBQR pGhWQp1wP/GjgBuTYAknzN6b8McbuhGCjLp3kFbomg76TIvuwErIG+F5bG6EXjKLlO/Ok8 E+bgqbctSuAogesFsy0VEwBDGZVn9qw= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-88-7-fA5Lk7OO2-VGj6arJC6w-1; Tue, 05 Mar 2024 10:36:21 -0500 X-MC-Unique: 7-fA5Lk7OO2-VGj6arJC6w-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7F8EA1C01E8A; Tue, 5 Mar 2024 15:36:20 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id BE3762022EDB; Tue, 5 Mar 2024 15:36:19 +0000 (UTC) From: Kevin Traynor To: Michael Baum Cc: Matan Azrad , dpdk stable Subject: patch 'net/mlx5: fix GENEVE TLV option management' has been queued to stable release 21.11.7 Date: Tue, 5 Mar 2024 15:34:40 +0000 Message-ID: <20240305153449.263666-67-ktraynor@redhat.com> In-Reply-To: <20240305153449.263666-1-ktraynor@redhat.com> References: <20240305153449.263666-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/11/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/5c8bbc6b7d8b1ab647c5ab5fee86f1c68717b405 Thanks. Kevin --- >From 5c8bbc6b7d8b1ab647c5ab5fee86f1c68717b405 Mon Sep 17 00:00:00 2001 From: Michael Baum Date: Mon, 15 Jan 2024 14:13:26 +0200 Subject: [PATCH] net/mlx5: fix GENEVE TLV option management [ upstream commit 0303967e1127c00e78fc9ce742aa531b943a2a8b ] In SW steering, the GENEVE TLV option matching flows must be created using a translation function. This function checks whether this option has already created a DevX object for the matching and either creates the objects or updates the reference counter. After translation, a flag in flow structure is turned on indicating the destroy function to release this DevX object. When the flow rule has meter, the rule may be split, and call translate function more than once per flow causing object reference counter to increase each time without updating the flow flag accordingly. This patch uses this flag as a reference counter which is increased every translation and indicates the destroy function how many destroy DevX to do. Fixes: f15f0c3806d0 ("net/mlx5: create GENEVE TLV option management") Fixes: e440d6cf589e ("net/mlx5: add GENEVE TLV option flow translation") Signed-off-by: Michael Baum Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow_dv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 7cddeab48f..e3132995a3 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -14607,7 +14607,7 @@ flow_dv_destroy(struct rte_eth_dev *dev, struct rte_flow *flow) else if (flow->age) flow_dv_aso_age_release(dev, flow->age); - if (flow->geneve_tlv_option) { + while (flow->geneve_tlv_option) { flow_dv_geneve_tlv_option_resource_release(dev); - flow->geneve_tlv_option = 0; + flow->geneve_tlv_option--; } while (flow->dev_handles) { -- 2.43.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 14:08:56.240607925 +0000 +++ 0067-net-mlx5-fix-GENEVE-TLV-option-management.patch 2024-03-05 14:08:54.751521033 +0000 @@ -1 +1 @@ -From 0303967e1127c00e78fc9ce742aa531b943a2a8b Mon Sep 17 00:00:00 2001 +From 5c8bbc6b7d8b1ab647c5ab5fee86f1c68717b405 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 0303967e1127c00e78fc9ce742aa531b943a2a8b ] + @@ -24 +25,0 @@ -Cc: stable@dpdk.org @@ -29,2 +30,2 @@ - drivers/net/mlx5/mlx5_flow_dv.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) + drivers/net/mlx5/mlx5_flow_dv.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) @@ -33 +34 @@ -index 80eee00813..e1d09d4455 100644 +index 7cddeab48f..e3132995a3 100644 @@ -36,8 +37 @@ -@@ -14374,5 +14374,5 @@ flow_dv_translate_items_sws(struct rte_eth_dev *dev, - */ - if (wks.geneve_tlv_option) -- dev_flow->flow->geneve_tlv_option = wks.geneve_tlv_option; -+ dev_flow->flow->geneve_tlv_option += wks.geneve_tlv_option; - return 0; - } -@@ -15983,7 +15983,7 @@ flow_dv_destroy(struct rte_eth_dev *dev, struct rte_flow *flow) +@@ -14607,7 +14607,7 @@ flow_dv_destroy(struct rte_eth_dev *dev, struct rte_flow *flow) @@ -48 +42 @@ - flow_dev_geneve_tlv_option_resource_release(priv->sh); + flow_dv_geneve_tlv_option_resource_release(dev);