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 9473143B7D for ; Tue, 5 Mar 2024 10:59:56 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8B23F4026B; Tue, 5 Mar 2024 10:59:56 +0100 (CET) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2062.outbound.protection.outlook.com [40.107.223.62]) by mails.dpdk.org (Postfix) with ESMTP id A83254014F for ; Tue, 5 Mar 2024 10:59:54 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jFnpJV+Mtd29eqebttgSHORzH1ctPcuq66Qb1ruY8ArpS9GGpnSqclirS6wjc3CRNC4qEFKKm0H9ZvWze3g/ZqY/l7b1BaZ0owRtcx/NTWGeVvp//6vpp+unj42TTLlBnjPxXMPyHnyfdhZnQ/o4OMsFUAMPrjCdhwFDXrXxub4X1UWuD+/hbmqJYyua0lKguMZl6xFRkzLvBLQWszT6+51+DDWZrSjbrT/tm9LC4tWf+ad9hQf9lktnCyYt6TEup6oMJF+ZbRxDGIfxUCfzDd9KhKq+rkRc0RJvuP5qviKXqwP3WUNxhbN0HoVKeKN+kGZlkC8Uf7uoK89H3TSdpQ== 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=3Kz1JNZmjmxTg1rjp5bhOBesLXXt8IlKH6CYZeWtlss=; b=MLU3DFOLL/Jnsamz/YL4BYwnBYga7uHFPeHDDzwxRcCyx1GmTouaROPBHK6I/Mc/+M/Fr6c99Ls1ig43fRqHg0u3ZsMxhDBNRvF4Zx3AbikD34JEL8mjQIsFPMu1nALThYiSKJz99jIjRVKuhA5omlgAg9UP+IPM7l5bIytMwl39UXVjcCLpgvgULdVT3UrJYQUmf2Jy0kznrtgk+g4DrsVvuB9sZGplgc8sraVrTEcjs+N2EDtk4xvDegE2U73KNuU6fBLnLUd74MwkMcTlLWNT+tODs0ysVbgkkXnVmpD6WYbCdu9Z2Ye8VIDzR0v3Kid2bjXWdMx9hrUjVB7F1w== 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=3Kz1JNZmjmxTg1rjp5bhOBesLXXt8IlKH6CYZeWtlss=; b=gBbUKdAj1fevCvxu1ZfPjk6oxwOpSNrnZFKeCIsHLYF0ihgGTnzU0lM5W1d8D2r679UyZ7QBY3Nz+BAQ3AFgo4NW6uFW6I9LKil0pulaKTWihsmOd0D1mRL6yXCjS/CQJLeOVWUyU6RGqYmJUfrUzl8R3aFFDlqkBIGurCb3mwqWzfIZrD01rgqTYDQ7hxMWjB6GIY8WkDVN0skgsoxObqGXZoQbIEX+idKzl0aUnX/bdShQvnXw5iFmHT7FydUAeDkT26oVmORP4j8uBhEV5R82T69r/iQVkBFxp/eN1Lr9SP08+s7Z3PgROHsuIu4bnmKIBDvX69FIM5RjhypSzQ== Received: from DM6PR08CA0051.namprd08.prod.outlook.com (2603:10b6:5:1e0::25) by SN7PR12MB7180.namprd12.prod.outlook.com (2603:10b6:806:2a8::5) 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:52 +0000 Received: from CY4PEPF0000EDD6.namprd03.prod.outlook.com (2603:10b6:5:1e0:cafe::5d) by DM6PR08CA0051.outlook.office365.com (2603:10b6:5:1e0::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.24 via Frontend Transport; Tue, 5 Mar 2024 09:59:51 +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 CY4PEPF0000EDD6.mail.protection.outlook.com (10.167.241.210) 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:51 +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:44 -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:43 -0800 From: Xueming Li To: Michael Baum CC: Suanming Mou , dpdk stable Subject: patch 'net/mlx5: remove GENEVE options length limitation' has been queued to stable release 23.11.1 Date: Tue, 5 Mar 2024 17:47:52 +0800 Message-ID: <20240305094757.439387-132-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: CY4PEPF0000EDD6:EE_|SN7PR12MB7180:EE_ X-MS-Office365-Filtering-Correlation-Id: 2133756a-09a2-4dc1-e929-08dc3cfb0036 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fa5tZ5I5E/CcIkfH1bYYztn59NDLZDRTU1XLD+4e5EuiM7blRF45Rzn2jPhLPLtlZuQwK8Ferqj8W48f03RdBs+hFOU6vbvtLkgXVWAnPMbY5IICzjN1U7ei1wdY9XvrEKFg7AXK9bsEacuAL1bfhuUmEUqrgpd8dLJVIANpPdsVHm3d03nO9rfh0rq6jhowQYXcWRKyGposW14YLLYNWGHx43Ab5EQVhAXIiScXit2RYEpykNYV5E3vyZx/RWHBNT6uV/ZOjlCFExGhkfcDs9crTdIKfLQOB4Q4OjxDAHn8n1Bu+2a4kOKgFLycXvOavEi/pxsR05XC/Rc3EJVNCetvO1bRwjIC+QTljm0w2rFzif1eiVSVITYU3cgg0M4ezeLwm9kT2Tu+DUyCEwWwDCqdh1AkRwGpa776JkoVjt8cQoYzNXHnUzGREXhBlrxa8qganOWP5eTwcd2ybCFOvND46ChWNC9z50PfGi5k9D0G/i3bUP9V6u4ukH6dFAaSoWzF+HeSf2GRfTMkdRk104/x3eu8g8TvLf5ycaQVaEES4mU1Eaj+/xbxlZWpry+A7cW4H4ZvOnH6DcEApvbnyOJTe8+qvDoMmHHU3hDn8bmmiY5130aaYJJSHIHI9WbmmYRH/JqtUutdbiJU06z2dAWnFzw+69cb758Jg8MrDc7Y6WrgnRC9OU895VOr1oM1S/UrSBKLhE5WjB2W24bj+9mmZmtqkO2aWfA2phCIn6LU9HqQFgpBZVavlz+hzdA8 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)(82310400014)(376005)(36860700004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2024 09:59:51.6886 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2133756a-09a2-4dc1-e929-08dc3cfb0036 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: CY4PEPF0000EDD6.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7180 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=22653f6966c1e4fcf8e358ab05d7407053ca6ed3 Thanks. Xueming Li --- >From 22653f6966c1e4fcf8e358ab05d7407053ca6ed3 Mon Sep 17 00:00:00 2001 From: Michael Baum Date: Thu, 25 Jan 2024 15:30:24 +0200 Subject: [PATCH] net/mlx5: remove GENEVE options length limitation Cc: Xueming Li [ upstream commit 48adbc80ba650aab12c00a7545cc33daff83976a ] GENEVE header has field named "opt_len" describing the total length of all GENEVE options in 4-byte granularity. In SW sreering implementation, only single option with single DW data is supported. When matching on GENEVE option data is requested, matching on "opt_len" field is added according to given option length. This behaveior assumes that only packets with single option can be matched, but it is wrong, packet with a few option can be matched but only one of them can match its value. This patch removes the "opt_len" matching unless user ask it explicitly. Fixes: e440d6cf589e ("net/mlx5: add GENEVE TLV option flow translation") Signed-off-by: Michael Baum Acked-by: Suanming Mou --- drivers/net/mlx5/mlx5_flow_dv.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 07a582810f..3fbfea74fb 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -9979,7 +9979,6 @@ flow_dv_translate_item_geneve_opt(struct rte_eth_dev *dev, void *key, const struct rte_flow_item_geneve_opt *geneve_opt_m; const struct rte_flow_item_geneve_opt *geneve_opt_v; const struct rte_flow_item_geneve_opt *geneve_opt_vv = item->spec; - void *misc_v = MLX5_ADDR_OF(fte_match_param, key, misc_parameters); void *misc3_v = MLX5_ADDR_OF(fte_match_param, key, misc_parameters_3); rte_be32_t opt_data_key = 0, opt_data_mask = 0; uint32_t *data; @@ -9998,21 +9997,6 @@ flow_dv_translate_item_geneve_opt(struct rte_eth_dev *dev, void *key, return ret; } } - /* - * Set the option length in GENEVE header if not requested. - * The GENEVE TLV option length is expressed by the option length field - * in the GENEVE header. - * If the option length was not requested but the GENEVE TLV option item - * is present we set the option length field implicitly. - */ - if (!MLX5_GET16(fte_match_set_misc, misc_v, geneve_opt_len)) { - if (key_type & MLX5_SET_MATCHER_M) - MLX5_SET(fte_match_set_misc, misc_v, geneve_opt_len, - MLX5_GENEVE_OPTLEN_MASK); - else - MLX5_SET(fte_match_set_misc, misc_v, geneve_opt_len, - geneve_opt_v->option_len + 1); - } /* Set the data. */ if (key_type == MLX5_SET_MATCHER_SW_V) data = geneve_opt_vv->data; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 17:39:34.905747530 +0800 +++ 0131-net-mlx5-remove-GENEVE-options-length-limitation.patch 2024-03-05 17:39:31.073566503 +0800 @@ -1 +1 @@ -From 48adbc80ba650aab12c00a7545cc33daff83976a Mon Sep 17 00:00:00 2001 +From 22653f6966c1e4fcf8e358ab05d7407053ca6ed3 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 48adbc80ba650aab12c00a7545cc33daff83976a ] @@ -20 +22,0 @@ -Cc: stable@dpdk.org @@ -29 +31 @@ -index c31f726edb..4f8062d0ab 100644 +index 07a582810f..3fbfea74fb 100644 @@ -32 +34 @@ -@@ -10104,7 +10104,6 @@ flow_dv_translate_item_geneve_opt(struct rte_eth_dev *dev, void *key, +@@ -9979,7 +9979,6 @@ flow_dv_translate_item_geneve_opt(struct rte_eth_dev *dev, void *key, @@ -40 +42 @@ -@@ -10123,21 +10122,6 @@ flow_dv_translate_item_geneve_opt(struct rte_eth_dev *dev, void *key, +@@ -9998,21 +9997,6 @@ flow_dv_translate_item_geneve_opt(struct rte_eth_dev *dev, void *key,