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 E1ABAA0548 for ; Sun, 28 Nov 2021 16:02:49 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D49D74068A; Sun, 28 Nov 2021 16:02:49 +0100 (CET) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2056.outbound.protection.outlook.com [40.107.94.56]) by mails.dpdk.org (Postfix) with ESMTP id EE86F4068A for ; Sun, 28 Nov 2021 16:02:47 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mutt4mQ79l/SI6OeRqdkQJwlI4wymfmyNKN/chl3gNdWlTYPtLm6youDdSoISxK1KDJSCUJ7YP5LHcQ0rYu7CRVP/IzzfMdpYBfJqwWxnY+F2OtQWLQH8Q2F2r9Z68NXeqlCCHzy+7CDGTWPTd/PPLMxhvWa94ZMYj5IxDsXNf2p55VRa5Zd2cYyNVtcMeqR0VdJxTDPFevl1mWAh56TP2mOiA2b3SrZN5Ro51lNQjixwVhzEB03fushUpJty/h/QoW9MqosxBjJyHT+V6ErEf2E11W9zwRBfx+exGcultA5vEkDFYZke64pcMVOswjsnkn9XAq/bM8Lbm2ddJnHzQ== 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=/4ROkJboi7mfOGb9Xjww8Tt31Fte4/pNW0B8hGE2mzE=; b=oRQFMDo+V+htkFpHzUgtRIibFtM3dIgZvMkVY4RT/HWrT81guIoeSDz1ajtfKG4OsExKt3MXF786g6Lml61l4LnFw1ZJ3AA/Nh3GRXTM2EBClX4BCVB7XMIgeD+4RuAwc1xSBjJtKx5WmW+KZ2YbVY6YIgdTCdUgAI030xcaBWYc+MuIZEAhNTpnqnPN/m9Q2A0K6lWYekEtet3MPCzkdKTVxOiRZU5ih2y8ifprZYhBDOcxb/BuJrJLX2p0jcV2HUA07GIufLB569kIvZbVXsQ3ITOVFF7c6cAEDbQU9NGcaZxZRTkQrtTYD306eiCF8cvwPn3whwoMZU60qTrtxQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine 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=/4ROkJboi7mfOGb9Xjww8Tt31Fte4/pNW0B8hGE2mzE=; b=t2tFgBDbsRUE2bQBUVbwjD4ex1C39m/Gzn7GMUYbMexIZ3L++4bexBP+Diydg+6vthOxHWoi26FT9bglJWEo+xe2zFOdRz0Nm/zr12hqjeLGbhBDqywq+5PfZ9JnexhlqjaOdpvzYINZfwgHEGnQe2l5LEK5uwKk0LmA1hHQpn+6oPTAuYwJMwKJgqALRSxk+eU6GB0Hq6TRx3nj46Z4zEcfqKpDGAJ82VEH130CKZPYfXGyiRn7o3Dpryba0xb22VO3xq99MVS/2ugVjUBxjrouJ+MqsrdwEziyIsJJjXyCt6ksatUw7ndFcaO4Vv3QHI0X17bS06BuGJwEF0AWjA== Received: from DM3PR11CA0024.namprd11.prod.outlook.com (2603:10b6:0:54::34) by CH0PR12MB5298.namprd12.prod.outlook.com (2603:10b6:610:d5::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23; Sun, 28 Nov 2021 15:02:42 +0000 Received: from DM6NAM11FT050.eop-nam11.prod.protection.outlook.com (2603:10b6:0:54:cafe::af) by DM3PR11CA0024.outlook.office365.com (2603:10b6:0:54::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22 via Frontend Transport; Sun, 28 Nov 2021 15:02:42 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) 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.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT050.mail.protection.outlook.com (10.13.173.111) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4734.22 via Frontend Transport; Sun, 28 Nov 2021 15:02:42 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Sun, 28 Nov 2021 15:02:40 +0000 From: Xueming Li To: Alexander Kozyrev CC: Luca Boccassi , Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: fix GENEVE and VXLAN-GPE flow item matching' has been queued to stable release 20.11.4 Date: Sun, 28 Nov 2021 22:54:17 +0800 Message-ID: <20211128145423.3974892-74-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211128145423.3974892-1-xuemingl@nvidia.com> References: <20211110063216.2744012-1-xuemingl@nvidia.com> <20211128145423.3974892-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6802c6c1-9b65-4015-90e4-08d9b2802090 X-MS-TrafficTypeDiagnostic: CH0PR12MB5298: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bthWhJQCUvSC/X46/OCxtCtHAU4fG0VmXWt1/P7rKHbjwPy3RnI77/j28/aemw2M2DpMIuboIDn4SH+dHgNv6qOuG8HdMIKNwrRYRwQgEDZbAq5bQ7sNbjn5K48y6KvOqkuP8fiQ8DU9RQlyucUoM3XeF0AFWQx4kzO1i6Rdd2+RQwhK7cB1KrZlWBc709UsmxAiLCaJKAl6PsN7ep7io65/+b+hQsQ0aQL6YrX2bjvMWdzRab8gzQSVakp3W1hD9VhNhoBuDHs9U+FYEEz9pEvdqpLFXLcCj48DKH07IzL7pfIUJRrNDHWVjACPgRFZZXHkCYRgJLUjYckiVDIwV19+D1x9iBhqvAlZN55LcDS4ujV5qFZHeK1y3v6LUW4OHbJoC9GhN0CGHpZjaFXULCkfnYyeOT5lpXtMqbo2/6ZWkxZefd2Ta5Ply+lgvyRzkzMZgLRVAhIOlwPaCivJINagxzMreDdXZ7X8d08LZmdIY0CxGDYLJVqgllHbJvBxneeay/3OGdAK+LDJ3Ef7lQP6PYsRVlkgSSCS6r7nm/KjVU58ru5hdNyGSFnrjXnd2Mr/+6DByXLUCGrO+k6E/JsNzWnf0/4mCmCtkkQjBRzYFyCXSay7wGDaPj+v/D3c0hfE+nwjo2KV6dCScYvRsKSnjTuN+DrMB+V5lNK2X8WNJzKXokSSGn8vyyan38qhM78F7ogrTvPEi9FDofgM+iXwpUgfCauVISaJuhHE/1YVLwOKTVy5CBJMnnkSL28/TKd7xa3GiN77yfQlyAV+ZPLn4d8sF1pmGRp5IxaRc4cYMxI5MtmADvtx59ruJl4ybpT2FNxstnjJi/tmz+Z1Jw== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(46966006)(36840700001)(6636002)(7696005)(426003)(508600001)(86362001)(6286002)(53546011)(6666004)(8936002)(2906002)(36756003)(336012)(36860700001)(7636003)(26005)(2616005)(4001150100001)(54906003)(1076003)(356005)(16526019)(37006003)(8676002)(70586007)(70206006)(6862004)(47076005)(82310400004)(186003)(4326008)(83380400001)(5660300002)(55016003)(316002)(966005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2021 15:02:42.0279 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6802c6c1-9b65-4015-90e4-08d9b2802090 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT050.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR12MB5298 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 20.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/30/21. 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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/4bcae288d566dc05afbec4f3525d981fa82842fe Thanks. Xueming Li --- >From 4bcae288d566dc05afbec4f3525d981fa82842fe Mon Sep 17 00:00:00 2001 From: Alexander Kozyrev Date: Wed, 24 Nov 2021 15:26:09 +0200 Subject: [PATCH] net/mlx5: fix GENEVE and VXLAN-GPE flow item matching Cc: Xueming Li [ upstream commit 94421842de9a821778b95b928945ed8ea382302d ] GENEVE and VXLAN-GPE item matching is done similarly to GRE matching. Users can skip the specification of the protocol type and expect that this type is deducted from the inner header type automatically. But the inner header type may not be specified in order to match all the protocol types. In this case, PMD should not specify the protocol type. Check if we have the inner header type before setting the protocol type. Fixes: 690391dd0e8b ("net/mlx5: fix GENEVE protocol type translation") Fixes: 861fa3796f75 ("net/mlx5: fix VXLAN-GPE next protocol translation") Signed-off-by: Alexander Kozyrev Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow_dv.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 582cddf62b..c9711d6e77 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -7245,7 +7245,6 @@ flow_dv_translate_item_vxlan_gpe(void *matcher, void *key, m_protocol = vxlan_m->protocol; v_protocol = vxlan_v->protocol; if (!m_protocol) { - m_protocol = 0xff; /* Force next protocol to ensure next headers parsing. */ if (pattern_flags & MLX5_FLOW_LAYER_INNER_L2) v_protocol = RTE_VXLAN_GPE_TYPE_ETH; @@ -7253,6 +7252,8 @@ flow_dv_translate_item_vxlan_gpe(void *matcher, void *key, v_protocol = RTE_VXLAN_GPE_TYPE_IPV4; else if (pattern_flags & MLX5_FLOW_LAYER_INNER_L3_IPV6) v_protocol = RTE_VXLAN_GPE_TYPE_IPV6; + if (v_protocol) + m_protocol = 0xFF; } MLX5_SET(fte_match_set_misc3, misc_m, outer_vxlan_gpe_next_protocol, m_protocol); @@ -7323,8 +7324,9 @@ flow_dv_translate_item_geneve(void *matcher, void *key, protocol_v = rte_be_to_cpu_16(geneve_v->protocol); if (!protocol_m) { /* Force next protocol to prevent matchers duplication */ - protocol_m = 0xFFFF; protocol_v = mlx5_translate_tunnel_etypes(pattern_flags); + if (protocol_v) + protocol_m = 0xFFFF; } MLX5_SET(fte_match_set_misc, misc_m, geneve_protocol_type, protocol_m); MLX5_SET(fte_match_set_misc, misc_v, geneve_protocol_type, -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-28 22:41:06.913861702 +0800 +++ 0073-net-mlx5-fix-GENEVE-and-VXLAN-GPE-flow-item-matching.patch 2021-11-28 22:41:03.450205293 +0800 @@ -1 +1 @@ -From 94421842de9a821778b95b928945ed8ea382302d Mon Sep 17 00:00:00 2001 +From 4bcae288d566dc05afbec4f3525d981fa82842fe Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 94421842de9a821778b95b928945ed8ea382302d ] @@ -15 +17,0 @@ -Cc: stable@dpdk.org @@ -24 +26 @@ -index 1a9c040f3c..3da122cbb9 100644 +index 582cddf62b..c9711d6e77 100644 @@ -27 +29 @@ -@@ -9057,7 +9057,6 @@ flow_dv_translate_item_vxlan_gpe(void *matcher, void *key, +@@ -7245,7 +7245,6 @@ flow_dv_translate_item_vxlan_gpe(void *matcher, void *key, @@ -35 +37 @@ -@@ -9065,6 +9064,8 @@ flow_dv_translate_item_vxlan_gpe(void *matcher, void *key, +@@ -7253,6 +7252,8 @@ flow_dv_translate_item_vxlan_gpe(void *matcher, void *key, @@ -44 +46 @@ -@@ -9135,8 +9136,9 @@ flow_dv_translate_item_geneve(void *matcher, void *key, +@@ -7323,8 +7324,9 @@ flow_dv_translate_item_geneve(void *matcher, void *key,