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 1554243B7D for ; Tue, 5 Mar 2024 10:59:36 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1004A42E6E; Tue, 5 Mar 2024 10:59:36 +0100 (CET) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2072.outbound.protection.outlook.com [40.107.100.72]) by mails.dpdk.org (Postfix) with ESMTP id D246242E67 for ; Tue, 5 Mar 2024 10:59:34 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fnnZW2yBJfLpxOUozGa/Ykx2ZquPuuTtoL9OwN7OkOysYxe3u5seuuj+JaTU1lJ6tIh/2q+EfKxqQaKkZJ5F+r/O0Iq1RhPBFj4sabL+WIDjS+cDGd9X2rO1GeSlnl5ZhSCWjtrvZdPafjusdc3Xh7AgRX5q/D9UviZd8p6pPSssAxHixV1f8Da+78b5DzbVDxqjvnfG/pH8etHFygQ1OiWdqWVH6wmKm/chJBaevzE5LWXnCnkY14iuPdzcR0/mBUep8aeoqhoKvAD/VMsKEcwsdQok1P9LafCCFEnGKv7bhEkM5BbS3ktSPIG5H7zBqeGZ5zSO7qaSVfaoN6lrhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=9kxwCkncWxR6xtGtwxNSdqrslKL4yQdGMEHtd5sIGWA=; b=e0vhrlZRl76ZS2Fp3c7VoAhVmYAsoDtLrCH72IgG8xixa97ARO8VF2nqA3MrnkgGQCAj641Vo+KB80U8RdnU20qVaENF54aycj1uar3G5fLRCXsIT+C3bx/LZQUWgPk25rMRkJcndA/+quy9ZWD1CUruhNwuLZGIC+0yZSFbPqPeDxY48XzPUpVNXQCkG7Sr7mDIFY3/h03cDdyoAeO7qrHpemho6FPhDsiyufkKwg0xLf22d6GW3b5JsHX9gZ872QpEnFzGJ/E/mLmaZzcXnANJ9K9/f5a45UL6irVtdO/iAYGpQiIhWss6Uwj/ZnrlzgkYIwDu08oMjAo1xgxjmQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) 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=9kxwCkncWxR6xtGtwxNSdqrslKL4yQdGMEHtd5sIGWA=; b=MI0SfOxW/ae8xmUFuDAMpShgME6XBPSZKX0nlse0swS6m6zsE7hVoVTXDqLvPv0JPe9MzZX63iARp3lAGSv4qh2tCsxo16atDGSiNCIhbJqQWF8TrV6vcLSjZD66Af0ciwYCIE6i72s42MBb8w0cSFUyW7LVt62gRSJsJXUfk7fRv+hlP91kU/3MD2beJPYdPo9w1eJXeViKFurFqgG/BkoRmO3z0n7ypFIMZ2T457hNFiYINORHMB6x2o8WCsgzYBvCyShhFh6iyw+jwKb507vrhK9ucw3f/CRRIpbjwQ++5s6lq7B0snaKd79QG/nKqZjAI/6CZj/nRunEXJ/tkA== Received: from CY5PR15CA0099.namprd15.prod.outlook.com (2603:10b6:930:7::9) by PH7PR12MB7284.namprd12.prod.outlook.com (2603:10b6:510:20b::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.39; Tue, 5 Mar 2024 09:59:32 +0000 Received: from CY4PEPF0000EDD1.namprd03.prod.outlook.com (2603:10b6:930:7:cafe::f9) by CY5PR15CA0099.outlook.office365.com (2603:10b6:930:7::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.39 via Frontend Transport; Tue, 5 Mar 2024 09:59:32 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by CY4PEPF0000EDD1.mail.protection.outlook.com (10.167.241.205) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.11 via Frontend Transport; Tue, 5 Mar 2024 09:59:32 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Tue, 5 Mar 2024 01:59:22 -0800 Received: from nvidia.com (10.126.231.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.1258.12; Tue, 5 Mar 2024 01:59:20 -0800 From: Xueming Li To: Michael Baum CC: Matan Azrad , dpdk stable Subject: patch 'net/mlx5: fix GENEVE TLV option management' has been queued to stable release 23.11.1 Date: Tue, 5 Mar 2024 17:47:49 +0800 Message-ID: <20240305094757.439387-129-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240305094757.439387-1-xuemingl@nvidia.com> References: <20240305094757.439387-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EDD1:EE_|PH7PR12MB7284:EE_ X-MS-Office365-Filtering-Correlation-Id: c5bb97b7-a27e-4f3c-a403-08dc3cfaf489 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AAgoaKfcqwMQxz9y31ijuf6bm5lh4nsQGVOcm19G4cX0u4JhaLPQACeOgt0YYZ8v3kyIwc99ay5IMiyZiKmJ8CKbbgW3zFa4RRHs/51CZwSKXTZrQ8kgCXLD0Svb6QAUYr1vJ9CSfyktdgwtohSD7jLDY/qs6BQ06dxXdI2Ji/2dDG7s4YMpzLK++d//MAQ/+mj9cIafdFzJsGe8HIxWDsTJ8UTMPpw26OmDFJ5NBKFu49gSzMK86OdymQR/z+iK8hEoXE01WZk/Yqbtuofq0Bvbl46mO7nYLF0NlV8Wi6Sk5fNyBMhVZRbTP/8bP5qBbIOJE/cHfabpSZlwjLcFsTw4re4cjYPrACJJB5QWEnf3OMtVbI65eFUYhhkO415wlQ2+8uUw2vU1XqZW1WGbND8hvNHBr0dq/hGDyRPEcf1VIAtmqfWx0NDMynvaUYptkWFjnW4RksYzL7HNkhSlw9WQG6cHm6zF9k9oFoWni6JNuXpip0xiPxONqtF3J9fTtyt1ZYqlz3GX2nwDAPfJ3gD8o2hpmiBtsNexBL+H4JvS3Pqdo+hZR3Dz4SRs2sc2jjV/G9a33iMpRR8wMqbU4mcwgh5bl7ljzb3ExXzC0BdTgpstzMvIrHFvZmM2fmtNw2HDIh4VNC4YDM+yyG/H+jouzzCPRHydIuVS7QgwVELiFNTxc6K2yD8ECroovE9fwL+EHUpWO0xyRvbKRhtdq+ZydPmuYvxuqd+k6S4VT4tBNzCnBLG1kUDZK/LUBSCt X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230031)(36860700004)(82310400014)(376005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2024 09:59:32.0825 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c5bb97b7-a27e-4f3c-a403-08dc3cfaf489 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.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000EDD1.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB7284 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.1 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/31/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=18256299036cc5c55eaa0558376b31000564701f Thanks. Xueming Li --- >From 18256299036cc5c55eaa0558376b31000564701f 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 Cc: Xueming Li [ 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 cea94e889d..07a582810f 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -14273,7 +14273,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; } @@ -15877,9 +15877,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.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 17:39:34.812371027 +0800 +++ 0128-net-mlx5-fix-GENEVE-TLV-option-management.patch 2024-03-05 17:39:31.033566502 +0800 @@ -1 +1 @@ -From 0303967e1127c00e78fc9ce742aa531b943a2a8b Mon Sep 17 00:00:00 2001 +From 18256299036cc5c55eaa0558376b31000564701f Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 0303967e1127c00e78fc9ce742aa531b943a2a8b ] @@ -24 +26,0 @@ -Cc: stable@dpdk.org @@ -33 +35 @@ -index 80eee00813..e1d09d4455 100644 +index cea94e889d..07a582810f 100644 @@ -36 +38 @@ -@@ -14373,7 +14373,7 @@ flow_dv_translate_items_sws(struct rte_eth_dev *dev, +@@ -14273,7 +14273,7 @@ flow_dv_translate_items_sws(struct rte_eth_dev *dev, @@ -45 +47 @@ -@@ -15982,9 +15982,9 @@ flow_dv_destroy(struct rte_eth_dev *dev, struct rte_flow *flow) +@@ -15877,9 +15877,9 @@ flow_dv_destroy(struct rte_eth_dev *dev, struct rte_flow *flow)