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 E0AE945E41 for ; Sat, 7 Dec 2024 09:02:36 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D71D44065A; Sat, 7 Dec 2024 09:02:36 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2067.outbound.protection.outlook.com [40.107.220.67]) by mails.dpdk.org (Postfix) with ESMTP id 710484065A for ; Sat, 7 Dec 2024 09:02:35 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=WPhm4uN9vQLwfRlGcEvnfTeoA256BTWBi1QA/BMbJMNju+r/X7YIbcaAnbN5XOebyKXNGhcZT8En7Uh5KafY6akAheC4HyhCs9spvsesQSWOJOScSbLRbH7+1I28nwKWUQRR+AMo7EJIa8cv/KZ8vugcEW+h9NF/JG6YV711vz7YOXa9o+6ZJaQT7TPrrVS9EMTHowVszVFZFMIsoIZ9ISZC9a9cl8q++4VhAfRgvPaSi6Iu7ewZQ41xOq3+dTrG6QpNel4j3JQ4AYap0DpeW0hr9DjlLoqThBUflwtwZmIcXGlGcto9P8I9sWwViuG/IyNBjsV0MkYAPLjonuUD5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=uW1zk34YxRKVBVI51UCfxvXMFbBODMxpvNL9AEWgEQI=; b=wlsnq5aiBbX3v6PHgelwKcBxGi0VcekplegOkijOLfShqQU126VtaXMqq+wAUi7n3SistW2NW+91fB9b7Q+Oii+Ls4GSYhbpuYk7t4jg9CPZEMqBqSHFmvKF1FM2P8OJBXoNaZkSGHl5Gj9zKS4UMwb3ANtSQmtWybvRHgtR3Qp+qnQ7OuOw4kIbxmM9zEKECKwPuih3Rl6U2Dipfi3lmDjSY703Klat+cS4JaCnNQObgdCPXT9GpDSl//eZI4+oNi1UfvBXcCBNXxjEqu7qf00BOTHevzCgm9mWGPX32NLU4s+JBheH7doDoMxqnwrlWFuEuPr4EalQM+Q0Z4wZEw== 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=uW1zk34YxRKVBVI51UCfxvXMFbBODMxpvNL9AEWgEQI=; b=ISycQMfm7X/SOUSz5jZ+Hu9A5GmMfkRpF1lWqx4DeZvuKchv017ReHRCSq4xgcYQkDbsg0fUrENUzymNEGxAyc+pM+Tm54KFXzqk65/czyiCMbuvgcQpRMHw0NDNGx1hQxc8XOjUWnzy7PLRQgU9zMQpZuHoU7vAvDHRIg4MW8INLt/4hkPbY4Su65j+jt7km3AXoFqVBRjWNjBB8tAdkHh7U28VWWC+8Eh3mvAPqEiPLTWe+95bA+zOv9BhrZ50gMrWKpqWE+pwIhHm2IvrnAomROPiuRYy0KjYOkiAFk0u6aEudiboVzj8LuSwk7OE8j+516Bw2lZXrOF983EAUg== Received: from MW4PR04CA0060.namprd04.prod.outlook.com (2603:10b6:303:6a::35) by SN7PR12MB6885.namprd12.prod.outlook.com (2603:10b6:806:263::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8230.12; Sat, 7 Dec 2024 08:02:30 +0000 Received: from SJ1PEPF00001CDD.namprd05.prod.outlook.com (2603:10b6:303:6a:cafe::92) by MW4PR04CA0060.outlook.office365.com (2603:10b6:303:6a::35) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8230.12 via Frontend Transport; Sat, 7 Dec 2024 08:02:30 +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 SJ1PEPF00001CDD.mail.protection.outlook.com (10.167.242.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8230.7 via Frontend Transport; Sat, 7 Dec 2024 08:02:30 +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.1544.4; Sat, 7 Dec 2024 00:02:19 -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.1544.4; Sat, 7 Dec 2024 00:02:17 -0800 From: Xueming Li To: Gregory Etelson CC: Xueming Li , Suanming Mou , dpdk stable Subject: patch 'net/mlx5: fix GRE flow item translation for root table' has been queued to stable release 23.11.3 Date: Sat, 7 Dec 2024 15:59:32 +0800 Message-ID: <20241207080055.488538-15-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241207080055.488538-1-xuemingl@nvidia.com> References: <20241111062847.216344-122-xuemingl@nvidia.com> <20241207080055.488538-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: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF00001CDD:EE_|SN7PR12MB6885:EE_ X-MS-Office365-Filtering-Correlation-Id: 1ec4a362-39f7-45f0-b6ac-08dd16957f83 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|376014|36860700013|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?c2o2OXN5DpulXBO4DQiMEEtnkdOQz/dWD4OupLmKSQ3efpryPGrRynDXIz8L?= =?us-ascii?Q?OxgjFyk9WzjuZuLTyaOa8T1TW2xWiHdTnmWYz/eK/RLvs/GDuz6v0bNaNOTz?= =?us-ascii?Q?MFPWoNETzb3cDnb1YpaXi3/sW6VhIahf+Mut95YFTUIun6Jgs5KOBca0QoSD?= =?us-ascii?Q?3ATbssC/js5p2LHZO3v0OhxsfxOP9rtX74ulxOc2WCdkxvSCmRCIfqZ8v+Ok?= =?us-ascii?Q?nxkxyj6xzphzcHJYlxvUjA8wfPoTTV/hiWEZAs1g6iYMHLVwfjYKRz8f/0r1?= =?us-ascii?Q?dSeXNT2oe4rt/dbZkXKZ/0TUxQCnRfh09tio9rxUGzMalHnf3NPf/kO0VCry?= =?us-ascii?Q?uRgBqgphPQYZPjrEbTy74ol3+VgyYdwbs6TSyXCHN3rIgMKicd/2qXRNO+/o?= =?us-ascii?Q?qOamiu93XNDN/TZB0YQvYiGGvVBvzZEzrPojPjjryD9GWYjqknNIwx5dwf5Z?= =?us-ascii?Q?UNpjbvstaehGEltKMcCAoeQEO6fz26OU9aY1VLlRsba9GdTtVge4T8zoDaOo?= =?us-ascii?Q?FPbLKWn/Ty3hf+VaX3yWqlZk28CUkilw1325vvKvJN/EiRABsMTzhs3U2PK+?= =?us-ascii?Q?1KJt24mrsM5u6pEysD6epE5pR9YtWfvqu8y44vmhsbYG5feNg0Smz7jbJ+3K?= =?us-ascii?Q?kKPEnNsymctxzmB6tR3p0NSvJk/n5fsKJOtR+akDXeiXnRD2zRLqeBafxfn0?= =?us-ascii?Q?B07KKVVnXzqG9m0EmxgsDkvyGlevcIcLRg2XZ8C46qPriuATv/2ozPPcqIU7?= =?us-ascii?Q?5RaZpIHwDE0UEfUaRyay4P7GXWceU7+AmoCEw9uHSYQiaJ2nzYgm95cIj5TT?= =?us-ascii?Q?lCY+cqBIO9F9y8O8C0MXM3FBnD5v44st67kXayU37Ho6oGrvdAmG9Lgjc7mf?= =?us-ascii?Q?yk2V+QHZKyEW0VBNL3RvDwpIUgWcou9PYyAG2J4igfZMhhk7iTQVyuLZVFEf?= =?us-ascii?Q?LP/i0EAhrLFCDeaGdd2SvjIth1O7th4vA/vaDpyV925O6XYOQdMN6phZK+iE?= =?us-ascii?Q?eGnurteDruWPsTe18Q6FptJy1IiXFFjX+FAwkyhzsxn/QbwWIaJddX3Xmwms?= =?us-ascii?Q?Z7stCFAJ2Qa+ibJcJ1cPSeDoIzCPPq/DI70wJ4hXYQicuzlbr/lpkIEYxVDt?= =?us-ascii?Q?/7VfDrAJSVNX+MdKAtspWBMbsZqBBmxMDZd5qxhsY9yP0jykQcpS5vIE7ASK?= =?us-ascii?Q?Zho+cTRh3E4r5siU660J4kgTc0zBvwFobBAGwOuYi7ukQRLqML1BSFPvy522?= =?us-ascii?Q?fIKfK1VPYr5jhG6PU6Yv1ZXHsJ1DScReJuuTM82U/JgpBMmlPvx41IXlkU+j?= =?us-ascii?Q?PWqBz6BwQ4Ec0SVLTLskwLk/KgrHMBY0zCkRzY7QqkpJ13DHRqan4Gxs0rsb?= =?us-ascii?Q?MF2aYVVFgElV+QMjZoSMRQaPqxvbmTmLQwNkhmi6HdUYXtL/McuYt9aYKbOh?= =?us-ascii?Q?AOKdDMlCovHKNjTMZ7pTtn1GamDeB71f?= 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:(13230040)(1800799024)(376014)(36860700013)(82310400026); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2024 08:02:30.0505 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1ec4a362-39f7-45f0-b6ac-08dd16957f83 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: SJ1PEPF00001CDD.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB6885 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/10/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=e75c93ede016324bcb760712717bb784c4018a88 Thanks. Xueming Li --- >From e75c93ede016324bcb760712717bb784c4018a88 Mon Sep 17 00:00:00 2001 From: Gregory Etelson Date: Sun, 27 Oct 2024 14:39:16 +0200 Subject: [PATCH] net/mlx5: fix GRE flow item translation for root table Cc: Xueming Li [ upstream commit 25ab2cbba31d937e685f0cf9ecce0c680cc4083e ] Flow items translations for the root tables reuse DV code. However, the DV GRE item translation did not initialize the item mask for HWS template. Initialize the mask to fix GRE item translation for root tables when using HWS. Fixes: cd4ab742064a ("net/mlx5: split flow item matcher and value translation") Signed-off-by: Gregory Etelson Acked-by: Suanming Mou --- drivers/net/mlx5/mlx5_flow_dv.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index b447b1598a..09c7068339 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -9476,22 +9476,23 @@ flow_dv_translate_item_gre(void *key, const struct rte_flow_item *item, } gre_crks_rsvd0_ver_m, gre_crks_rsvd0_ver_v; uint16_t protocol_m, protocol_v; - if (key_type & MLX5_SET_MATCHER_M) + if (key_type & MLX5_SET_MATCHER_M) { MLX5_SET(fte_match_set_lyr_2_4, headers_v, ip_protocol, 0xff); - else + if (!gre_m) + gre_m = &rte_flow_item_gre_mask; + gre_v = gre_m; + } else { MLX5_SET(fte_match_set_lyr_2_4, headers_v, ip_protocol, IPPROTO_GRE); - if (!gre_v) { - gre_v = &empty_gre; - gre_m = &empty_gre; - } else { - if (!gre_m) + if (!gre_v) { + gre_v = &empty_gre; + gre_m = &empty_gre; + } else if (!gre_m) { gre_m = &rte_flow_item_gre_mask; + } + if (key_type == MLX5_SET_MATCHER_HS_V) + gre_m = gre_v; } - if (key_type & MLX5_SET_MATCHER_M) - gre_v = gre_m; - else if (key_type == MLX5_SET_MATCHER_HS_V) - gre_m = gre_v; gre_crks_rsvd0_ver_m.value = rte_be_to_cpu_16(gre_m->c_rsvd0_ver); gre_crks_rsvd0_ver_v.value = rte_be_to_cpu_16(gre_v->c_rsvd0_ver); MLX5_SET(fte_match_set_misc, misc_v, gre_c_present, -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-12-06 23:26:44.614033120 +0800 +++ 0014-net-mlx5-fix-GRE-flow-item-translation-for-root-tabl.patch 2024-12-06 23:26:43.873044829 +0800 @@ -1 +1 @@ -From 25ab2cbba31d937e685f0cf9ecce0c680cc4083e Mon Sep 17 00:00:00 2001 +From e75c93ede016324bcb760712717bb784c4018a88 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 25ab2cbba31d937e685f0cf9ecce0c680cc4083e ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index 040727f2e8..dc5263ace3 100644 +index b447b1598a..09c7068339 100644 @@ -24 +26 @@ -@@ -9830,22 +9830,23 @@ flow_dv_translate_item_gre(void *key, const struct rte_flow_item *item, +@@ -9476,22 +9476,23 @@ flow_dv_translate_item_gre(void *key, const struct rte_flow_item *item,