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 B61E441D8D for ; Mon, 27 Feb 2023 08:14:07 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B30E541153; Mon, 27 Feb 2023 08:14:07 +0100 (CET) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2081.outbound.protection.outlook.com [40.107.237.81]) by mails.dpdk.org (Postfix) with ESMTP id 583DB410DC for ; Mon, 27 Feb 2023 08:14:06 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WCypF3nQnbarWMxIor6+7FOhJdFYRXveFmkLBt1pKtoqLpXD4y/yR1HvyvJRXhcJUg9TkcMWkPvHRLGMcPhrYoJvvIUYRUzqUzKrrC4jureoXDofyyh9qk1BdMi1Kg57obKKaAPo15EkP8bhbS+Aedz/kX2BT4Q7j9e3D2S6B4n7Mb7W6HnTwGbRw14mBrcumplXFP9ubkQIsis20TztlbpRZsDAI09gccHVED5/1ilweI2sP4pIqtONbgzNByDsSWcTSSaieAj2lsuUYMvRRe36B7etm7bkDQgZPuLrCDhjDW4sPvw7bFU66YaxBtHzmhcjpbhdnYUEDaAF+fi3cQ== 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=765IpwIfqbJbBxZq90bI14kXuyII+Ac6TV6rNUHPWgI=; b=DydkdJPERX5NHI3i8h/jsM8sKNNz/nwmvUrXPxVg1fux/HYRhyB3wlm09pZMi1smxsChNP2AHRivnoJrOjuiLUvnnbxrDLD+DTd2oddzNbOWt0bhJ0eNgXfuXLZTJeS2Vb7ad3XuqCEGx3/AqsJI2RUaPds2ghJ4V0OL1u37jzwWW9rkNUxgGVOTdA1MoPHU61KgoGYCCwj4XGwlgrLctPE1YfAeR0uXoJE2gkjxfjKbbQHgXbuFNZ/5zukwoH5/mUWV3U+hlflx7f7uoTCeX1iAJi6Ipz0xEP36CYE/kW4iCxWjKCfQeMZ4lSQZodGjjQ4oRK2qt7Jry6IKeKvSLQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) 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 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=765IpwIfqbJbBxZq90bI14kXuyII+Ac6TV6rNUHPWgI=; b=tahU/KKBrqUAWezgikgs55Wa+N3Xal0W0R53AhHMWPk/jrrkAsUFHBMWEvjtNkD/3pnQmFczVqc6hXCV+0l+WFCIP6UbkbmUgjvA9paKpXTjHy9JCm7Kx5jp65oGAPlaR/7+5rPBIsc/o6jsox8ljJOJsXTw/IbgqengxPS9FRsZ67quSDeclkovLz1JEr91ushD0fzFhjEXjzP4IL6YvzHrwWx0QEWMi80NutmNaE5XW7Mc73dri1SS6Sp7LXmidK4TNNHhSRwZLgCFaGD2iRhAXhmsnFF37u3de/nRkQTdTRvzRruBZ+L5YcyWmPajSeSFsdjivBsDTLIBZCXaig== Received: from BN6PR17CA0052.namprd17.prod.outlook.com (2603:10b6:405:75::41) by DS0PR12MB8295.namprd12.prod.outlook.com (2603:10b6:8:f6::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.26; Mon, 27 Feb 2023 07:14:04 +0000 Received: from BL02EPF00010209.namprd05.prod.outlook.com (2603:10b6:405:75:cafe::8e) by BN6PR17CA0052.outlook.office365.com (2603:10b6:405:75::41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.28 via Frontend Transport; Mon, 27 Feb 2023 07:14:04 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by BL02EPF00010209.mail.protection.outlook.com (10.167.241.198) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.12 via Frontend Transport; Mon, 27 Feb 2023 07:14:04 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Sun, 26 Feb 2023 23:13:55 -0800 Received: from nvidia.com (10.126.230.37) 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.986.37; Sun, 26 Feb 2023 23:13:52 -0800 From: Xueming Li To: Suanming Mou CC: Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: fix GENEVE resource overwrite' has been queued to stable release 22.11.2 Date: Mon, 27 Feb 2023 15:00:27 +0800 Message-ID: <20230227070107.15664-119-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230227070107.15664-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230227070107.15664-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.37] 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: BL02EPF00010209:EE_|DS0PR12MB8295:EE_ X-MS-Office365-Filtering-Correlation-Id: ea23ad8e-afd1-480d-3cd3-08db1892358a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dyshzYA0h/5pA1U9SZrysQB/nN729bV9bhlWIlhgh2LcKr4MZF2vU67AnY4cganxa70OuPxNgHzRTnN3gptbN/rSUmsSEbl55nAjB3EVRyp/TZxkRBDAs/TSSV3AiJfYJGWtBvzIaSARdAGzDucGfVeo3RBFgU0DZ+gAZOXUP47wMn9/2c4Z24W/3M/wUFY3SGmtkNncTfR1S5OlhWd6bnhl7Zds0SQ3ce71S07zSwBAtb9ig2TsE6ZfBmnY5UX3xCGezBOdd1IlEwskHeTSJUbeodRJHq0g9Nqapn9M9yCv+19sNd1Fz2LxuLa9s/nwE7CIgtFA9gNMeq9ajrsCyhaLl6hsrDFV10cHJwKstOCwXkNk6cZew3EvBmMs35Cquw1O/+nSBmZwt62N0Tr1MV9Dd8EJ62FcBWbg8BLtIaemnxKX59OsHdk9SQLVUG1CJ9oDdwJ2eYj+L8t7SHFKRQpT7i7oGP7NW514vlngVnNfGx1qeU6tNeWepllGU4aEvIL0EIRvt1qloTHfZmwMg3yqOPt5vwYQ53qyW8DayjUl2Jt/8APqxlLhDhg3j2lWaQUA11Iownxv86NZvyAyLuffo6BCicrxwqwqJD3g9xPCOrSLbJaJvqMn0Arg81aUmD8tubwlpXPiYdYS1LKaeXX5c6jLrmoHJn6DYc3xCprw+3aRG8SDa7ne/rF2rTpVXCA5SQOsI11kHVeqD5ZVK7biixTLJOvQDPBgSiwNHy4PAd7Jh73F2lGQ+kWnHtEjdm8km3RzbjGnDAoZUoYko6czvUUq+fHh4bMpoFLuxho= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230025)(4636009)(346002)(376002)(39860400002)(396003)(136003)(451199018)(36840700001)(40470700004)(46966006)(316002)(83380400001)(37006003)(36756003)(6636002)(82310400005)(54906003)(86362001)(966005)(16526019)(6286002)(40460700003)(5660300002)(70586007)(36860700001)(1076003)(8676002)(8936002)(6862004)(70206006)(41300700001)(4326008)(426003)(6666004)(47076005)(478600001)(2616005)(26005)(53546011)(186003)(7696005)(55016003)(40480700001)(336012)(2906002)(7636003)(356005)(82740400003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2023 07:14:04.3414 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ea23ad8e-afd1-480d-3cd3-08db1892358a 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF00010209.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB8295 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.2 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/01/23. 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=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=4434048bbecd86cafba6e27af7f4ff3871b1773f Thanks. Xueming Li --- >From 4434048bbecd86cafba6e27af7f4ff3871b1773f Mon Sep 17 00:00:00 2001 From: Suanming Mou Date: Wed, 23 Nov 2022 13:57:12 +0200 Subject: [PATCH] net/mlx5: fix GENEVE resource overwrite Cc: Xueming Li [ upstream commit 579c00411ac87970b685de80239bc35b74e7a33e ] Currently, one rte_flow may be split to multiple sub mlx5_flows. While GENEVE option resource was allocated in the first mlx5_flow, the flag will be overwritten by next sub mlx5_flow. This caused GENEVE option resource leakage. This commit adds the check of GENEVE option resource to avoid the GENEVE option flag be overwritten. Fixes: cd4ab742064a ("net/mlx5: split flow item matcher and value translation") Signed-off-by: Suanming Mou Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow_dv.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 62c38b87a1..7ca909999b 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -13717,7 +13717,12 @@ flow_dv_translate_items_sws(struct rte_eth_dev *dev, * is the suffix flow. */ dev_flow->handle->layers |= wks.item_flags; - dev_flow->flow->geneve_tlv_option = wks.geneve_tlv_option; + /* + * Update geneve_tlv_option flag only it is set in workspace. + * Avoid be overwritten by other sub mlx5_flows. + */ + if (wks.geneve_tlv_option) + dev_flow->flow->geneve_tlv_option = wks.geneve_tlv_option; return 0; } -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-27 14:08:44.723854500 +0800 +++ 0120-net-mlx5-fix-GENEVE-resource-overwrite.patch 2023-02-27 14:08:40.889237000 +0800 @@ -1 +1 @@ -From 579c00411ac87970b685de80239bc35b74e7a33e Mon Sep 17 00:00:00 2001 +From 4434048bbecd86cafba6e27af7f4ff3871b1773f Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 579c00411ac87970b685de80239bc35b74e7a33e ] @@ -15 +17,0 @@ -Cc: stable@dpdk.org @@ -24 +26 @@ -index bf98c26018..9e5db6b945 100644 +index 62c38b87a1..7ca909999b 100644 @@ -27 +29 @@ -@@ -13793,7 +13793,12 @@ flow_dv_translate_items_sws(struct rte_eth_dev *dev, +@@ -13717,7 +13717,12 @@ flow_dv_translate_items_sws(struct rte_eth_dev *dev,