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 BA5A7A0548 for ; Sun, 28 Nov 2021 16:02:44 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B47834111B; Sun, 28 Nov 2021 16:02:44 +0100 (CET) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam08on2066.outbound.protection.outlook.com [40.107.102.66]) by mails.dpdk.org (Postfix) with ESMTP id 944D44111B for ; Sun, 28 Nov 2021 16:02:43 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OG9fDr/DHSccbiiCMHFPLY/fWtBuTBRkQfjANtMkxRSgAFc8o1pH3n8cM03ojsyPQJf835ETg04ajMAe+IVSK1hqAcoiR2qqtd3MjkQzhUbrICuUGCNSFzuTcNr/SVSOh0bHFgSXNkiOCXzryBDiqHHKbbLMNJVYLmxXsFCRgqJ/hpA18yxRUhcJeHHl/wX0cSRA9rBb80hoKgiCexs0y7e3jOLLL1W5LuIsAYBlzjzD4zf5GVv3HQpD+qIlIeJ6TY7ofYrh2HL1YXMhEmEzxo5HbFioo2+9bxx/kQoV8bPwu6mknB7uHKZWxvx9vZN6JHhhkRilBdERGoocgdTgtw== 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=TLOSI/T0yQ/ifWJykNfvOK92Cif18CmXhbFhSB6dhro=; b=nwpM63q9cZ1S/SryxWcGUYqNa94npU/oeJDgLWP5EV5796x0Sa9wEQdHevnZ8/qavWUOg6IY6GYfLiIAcL4PDYwXooeJVZZvYq9MGB2yr41dAQNTcsN0eleQjxutm10GK5Tc4WM/5CjAA7dTwvJhTjDuCotL3M8sT3EPX2s3CO2Lk5I7KI504jRIVeqRUb6XbkdszJQVa+swNwaIN8iL1JYleH3EEm0GQf/4zN/XC6+37dfPbMfR6lDR/zmkreHbuMBxLBBm7LnyRbSaKlWE2gE5iIh+OiBrIChaHKIiisoiby11DO6psTeAPYUNANGvUlS/c5UTJO7rg5vFs6r2+Q== 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=TLOSI/T0yQ/ifWJykNfvOK92Cif18CmXhbFhSB6dhro=; b=m5pNizaJu7nQfgMmvGKER6miizrj3xDze3GEeJPHPjq+WA+efsPnSbwEsI9wb/X9ge1qBfRP7Jg0sfuRiQKLmhnkSB7Ym4KkpdrHbtS6RiQUdPhJb0sZHtaeJ1wmVYUv+6KTp1dC9wKKgQzOSD8XH5k7QJwHv4CQLbxGoryymkKN9jgtkPmz4k0kFOfhu+sP40x7GKVl99giz/O4R7PI1zLU0pbqm/9Ekl/C88b62mvZmHTKbRSA8geNr5yzKLxWZkbOzpSY3J6I2Lp48sMx3sTr89hyZ7iKeSNUinnjO/dXDOrZsx/QNKByfZqgNV2ydlrLAspWt8+gN8KWIF4y2g== Received: from DM3PR11CA0020.namprd11.prod.outlook.com (2603:10b6:0:54::30) by MWHPR1201MB0126.namprd12.prod.outlook.com (2603:10b6:301:57::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22; Sun, 28 Nov 2021 15:02:41 +0000 Received: from DM6NAM11FT050.eop-nam11.prod.protection.outlook.com (2603:10b6:0:54:cafe::1b) by DM3PR11CA0020.outlook.office365.com (2603:10b6:0:54::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.24 via Frontend Transport; Sun, 28 Nov 2021 15:02:40 +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:40 +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:39 +0000 From: Xueming Li To: Alexander Kozyrev CC: Luca Boccassi , Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: fix GRE flow item matching' has been queued to stable release 20.11.4 Date: Sun, 28 Nov 2021 22:54:16 +0800 Message-ID: <20211128145423.3974892-73-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: ffd36d7d-f882-47f2-65ff-08d9b2801fdb X-MS-TrafficTypeDiagnostic: MWHPR1201MB0126: 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: HDku/8FJSPtvGNLyYq/OEaMSD4GciEAWZYNMIXdNBW0C0jO+vSQsjCcr31nBKzm4SDrxinfElounvQ7RzViFN8xym/VRb49GrKxrP/jA3e2HHwt0KRpBtwHSt+SAoKJR9Ul2UTYTLmT9U1P6G1Xme7pn5pLvoTTsVJtHKqvI2uiqn5sxKsPK49/aN7DKeKOLi3KE+fj8QhbSLK5C32FCSBPbLA751011SoWr3ik/TZ/l4WEvpcc0f8Vyq8ki1Ssk/lXxBLdHAJEfxJteMgdRa45OXczvPpHMhy8GbU0JIxBQ5CGb37adswj4TIT4clERZTfPPVzKe4kjOfONkXKv+6xeRDu3OT9i4FJB+RzF9s9eXPQZcQKjV4Y73P02XDUzr1i9H3tiLTpLW0dDWFk/Zn9J1JIcDwpjKlqmF5SN3BonvU/UBdwCBRA4+vtZVV/df8osx7FD/Y/muImsssRqmea6dInp7okpOyBcZG3+k85ezI6Ge94Z+GpoH2B3sOFxMZfNPVtSW9ych4rcV1J4JH8S9yFxAkooxiRTwX/QdkuOtcehJPl39aCPb2JKtgqbREB82tsiYIu1aO6HaspYr0dReNgb94UKMHJlKzZEWY0nKaF9co8SdVtsYbzV9Fml3awk8GXIHrooXN8D8MY0gB73pYkpn6MRKtx87CxJBxPgIh1/ekEMxeMw82J6TvNL9qk9NdoOjgYVddxsw4sppVa+wtZOnM/CJ7jBksbD8w8pUz7jdnmho2VdoXsOiXljcaYq2i63ys/XvkPZA/z+LCuRx5iwC/i4QGA16EuQWFknwENV/mxre2rGpuRGb/bE2ACQD1LhnNEmJ61rvbIdkw== 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)(36840700001)(46966006)(356005)(4326008)(4001150100001)(6286002)(6862004)(508600001)(2906002)(7636003)(966005)(55016003)(36756003)(82310400004)(36860700001)(86362001)(83380400001)(37006003)(7696005)(53546011)(2616005)(54906003)(8936002)(316002)(70586007)(8676002)(70206006)(5660300002)(1076003)(16526019)(47076005)(6666004)(426003)(186003)(26005)(336012)(6636002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2021 15:02:40.8346 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ffd36d7d-f882-47f2-65ff-08d9b2801fdb 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: MWHPR1201MB0126 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/7d4d3d56e969f262d11775afa3a303d4dadde445 Thanks. Xueming Li --- >From 7d4d3d56e969f262d11775afa3a303d4dadde445 Mon Sep 17 00:00:00 2001 From: Alexander Kozyrev Date: Wed, 24 Nov 2021 06:32:34 +0200 Subject: [PATCH] net/mlx5: fix GRE flow item matching Cc: Xueming Li [ upstream commit 9e61533df27fc4d76080da20a7e8f9c9e7e1b90f ] GRE protocol type is implicitly set in the matching translation in case an application doesn't specify any type explicitly in a flow rule. It is extracted from the inner header type, but this type may be absent. In this case, GRE item matching is broken. Check if we have the inner header type before setting it to allow matching on all GRE packets. Fixes: be26e81bfc1c ("net/mlx5: fix GRE protocol type translation") Signed-off-by: Alexander Kozyrev Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow_dv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 8804b9816d..582cddf62b 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -7062,8 +7062,9 @@ flow_dv_translate_item_gre(void *matcher, void *key, protocol_v = rte_be_to_cpu_16(gre_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, gre_protocol, protocol_m); MLX5_SET(fte_match_set_misc, misc_v, gre_protocol, -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-28 22:41:06.861847095 +0800 +++ 0072-net-mlx5-fix-GRE-flow-item-matching.patch 2021-11-28 22:41:03.440205474 +0800 @@ -1 +1 @@ -From 9e61533df27fc4d76080da20a7e8f9c9e7e1b90f Mon Sep 17 00:00:00 2001 +From 7d4d3d56e969f262d11775afa3a303d4dadde445 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 9e61533df27fc4d76080da20a7e8f9c9e7e1b90f ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index 9979d16f74..1a9c040f3c 100644 +index 8804b9816d..582cddf62b 100644 @@ -25 +27 @@ -@@ -8823,8 +8823,9 @@ flow_dv_translate_item_gre(void *matcher, void *key, +@@ -7062,8 +7062,9 @@ flow_dv_translate_item_gre(void *matcher, void *key,