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 490F143C60 for ; Thu, 7 Mar 2024 02:37:46 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3ECB342F35; Thu, 7 Mar 2024 02:37:46 +0100 (CET) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mails.dpdk.org (Postfix) with ESMTP id BF09F42F0D for ; Thu, 7 Mar 2024 02:37:44 +0100 (CET) Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-33dcd8dec88so152218f8f.1 for ; Wed, 06 Mar 2024 17:37:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709775464; x=1710380264; 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=gq/F7ZuKKy3S6Web6YjEissw1tF7pyGdV17qGeoM/kU=; b=Rdzmt45bEG3uH4L1DBFoFoVXGZPk64HdslGlP3NBrqIuQM4/LAPpzOw+oPCDvv1PCO nxrkLKoNU425uQyKL4nn0pTjpYPRNclGoVK3vSGYX0k97hKax+TQ3j3RucdUZGGWL5y7 B1ZwINwUpbYhhh3PMq16voM2+ysd7q2rsZx8QSxpKtDMEKUTbKX2AvwMIZxSSbG30IDo 51gPUgiRBtPZtTYk2u2nb3eYb9g5vdHPP0b4T041+9vn0haORzPdtaYAo/UfxIWB/9Xy zCo2WNanS4eJRgUR1xOBwG+vG4/sEOpbf4Xzb5wiIsOLuYjv9LjMTk15OvLF9M/DX/zW gV3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709775464; x=1710380264; 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=gq/F7ZuKKy3S6Web6YjEissw1tF7pyGdV17qGeoM/kU=; b=oTZ20BBg1LVhtvUU+VjZuDw9u3lE5Vn3t93DnukOBMwaz9uT4vdJIX4ry5mu209ij1 HzCt3S+pt4B3S+O5M3ek3ptaciSXcMY5otC9FGQOHx2+IVDb8NvEdouJlylT4Nfo7smj xDE48lqn113bQEjGNiScIeC8uN+IO53ZVWy9FPHNVgs+jAMu+g7C4c9P8Tbnf95IDj4Y YxLqrf96dRkr7Tg5bV3QgsPiY/FWZCj5b5TWrs0AP/RxPhvUDEbai/XVo6VZ8rybSApQ GkQDlR5A5i7ylGFyUtcf508NhbdfFa9m17gRGebV7+jC/vlq2OIthKS7Ly3GxW7Lwxdk Sz1g== X-Forwarded-Encrypted: i=1; AJvYcCXSSfyzvWMyn0TD4cBXz0t7g2XaDabzaThU0dfxrDBQxqkjpBLOeICLpq3yZXI+Gt7d1PDV7qkaiR9MECKoE0Y= X-Gm-Message-State: AOJu0YzuK5L1ww2XTkcRc7xkPYYNF6zwd93F46ZV0ZFw6MejLqkdzT4M Y7bZv7qa7THBhDGRFKEAzVv30wdFlu3ZmZgVGV6P0PDzMCemuLjDRlfSJd8XI50= X-Google-Smtp-Source: AGHT+IGP3OfCC2bJq90HhsG+PsK7ZdgzYkDRKail4iQt4ILWIIzrkD+3BFP2n9sFTlW+AFPTfH5+DA== X-Received: by 2002:adf:f250:0:b0:33d:22a3:28bc with SMTP id b16-20020adff250000000b0033d22a328bcmr10654465wrp.63.1709775464427; Wed, 06 Mar 2024 17:37:44 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:7aef:1aaa:3dff:d546]) by smtp.gmail.com with ESMTPSA id q13-20020a5d61cd000000b0033e11ff6284sm18165018wrv.12.2024.03.06.17.37.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Mar 2024 17:37:43 -0800 (PST) From: luca.boccassi@gmail.com To: Michael Baum Cc: Matan Azrad , dpdk stable Subject: patch 'net/mlx5: fix GENEVE TLV option management' has been queued to stable release 22.11.5 Date: Thu, 7 Mar 2024 01:31:53 +0000 Message-Id: <20240307013159.1735343-96-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240307013159.1735343-1-luca.boccassi@gmail.com> References: <20240307013159.1735343-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.5 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/09/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/b328c4501cc25a3ad3244edfd27995df68365318 Thanks. Luca Boccassi --- >From b328c4501cc25a3ad3244edfd27995df68365318 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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 077306f048..a566e61f49 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -13770,7 +13770,7 @@ flow_dv_translate_items_sws(struct rte_eth_dev *dev, * Avoid be overwritten by other sub mlx5_flows. */ 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; } @@ -15370,9 +15370,9 @@ flow_dv_destroy(struct rte_eth_dev *dev, struct rte_flow *flow) flow_dv_aso_ct_release(dev, flow->ct, NULL); else if (flow->age) flow_dv_aso_age_release(dev, flow->age); - if (flow->geneve_tlv_option) { + while (flow->geneve_tlv_option) { flow_dev_geneve_tlv_option_resource_release(priv->sh); - flow->geneve_tlv_option = 0; + flow->geneve_tlv_option--; } while (flow->dev_handles) { uint32_t tmp_idx = flow->dev_handles; -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-07 01:05:42.868424891 +0000 +++ 0096-net-mlx5-fix-GENEVE-TLV-option-management.patch 2024-03-07 01:05:35.062945619 +0000 @@ -1 +1 @@ -From 0303967e1127c00e78fc9ce742aa531b943a2a8b Mon Sep 17 00:00:00 2001 +From b328c4501cc25a3ad3244edfd27995df68365318 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 0303967e1127c00e78fc9ce742aa531b943a2a8b ] + @@ -24 +25,0 @@ -Cc: stable@dpdk.org @@ -33 +34 @@ -index 80eee00813..e1d09d4455 100644 +index 077306f048..a566e61f49 100644 @@ -36 +37 @@ -@@ -14373,7 +14373,7 @@ flow_dv_translate_items_sws(struct rte_eth_dev *dev, +@@ -13770,7 +13770,7 @@ flow_dv_translate_items_sws(struct rte_eth_dev *dev, @@ -45 +46 @@ -@@ -15982,9 +15982,9 @@ flow_dv_destroy(struct rte_eth_dev *dev, struct rte_flow *flow) +@@ -15370,9 +15370,9 @@ flow_dv_destroy(struct rte_eth_dev *dev, struct rte_flow *flow)