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 03932A0032 for ; Sun, 14 Nov 2021 16:36:37 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D464E410DC; Sun, 14 Nov 2021 16:36:37 +0100 (CET) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2062.outbound.protection.outlook.com [40.107.237.62]) by mails.dpdk.org (Postfix) with ESMTP id 04D8040040; Sun, 14 Nov 2021 16:36:35 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=diqEtKdG9VJnuV9gj9OW1h5dV/sVmNK78395iRjmfh32AuomJu2JesV3QZ+wM3bp7anRmnDqr8g55H6JtKgtMGWd4/IRSlI9KibPqOlRgqC2+BvAOxS2qDUmfomRLykSziXtuzqNdrgoP0Ttyd2xcNMVpqIWLt42BIwOAvGZSiRJ6uwP56dLdT8vFXO3dgsI2bA0ZW5ldur5Jq5073ilPHYrqMpfYxaKLFZ4NPswRiKmKdeY1Wc+4zMPGh/YpHpAQ3zHNISzq8eFbpq6uzrShE/bvhNh0fMC2tSlfpc+WwSaor+JPpIeZ8Ix7ers+5j+ma3PanZSIPikXjQdHsyRJw== 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=izG3jHgzSMNIGWulfCG+h4L1W5F95vYP8vKCWaAYSRk=; b=Ur3Gq0kBASI95xINO+nCFT/KebtKO6pXBQcIcv97qvLWX+LWwe/I6frkYLqZFrXSdX7LBeE4JI/8EQTRAz4b0RL5VO6kjaG7yzh/Qu/ictG93UZv5vEi+IlGQFsvA+Y0EgIFZtgmUtzW+INAIU5EV97O1Vr7G8ZKdMF7CoTlW6icJkwWFCFhKzCMZxyV6Ua/AhL4EOIKqFy0/vuZ3k1OrZwoG4i6pmY/mJNpcavg1tQE34mI+xn8smbHrBBwj5TNpMLUFnFAuNVDZZRpnLOWB42w3XEqpnnHoa3NqZS9fkc49+TPvaqEni5K3l1tuS+LKUkshn/voeTd4EhalSrEdw== 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=izG3jHgzSMNIGWulfCG+h4L1W5F95vYP8vKCWaAYSRk=; b=W+rCe1oYjqA6t2uJyV+2ZTChgSkvzsazMn1dfUihzMNYl+t55xN7DPkAOonCjes591pKWQuUdMTqDdlxuhMC/fXJX5f7myMOcr7LihbFqAYCkjxjsPdkQylgQiRvZZEPYqAs+T/7vfIUVrUG3XYThgbHdhS/YeEQa3B86HR8inhy8Gr64NBknvQO4BXmRg00/UmkUZwWa5EBYX9+RqpBOpQFtUafN+3lGJXp6Z5f2lILtu2+F6O+oBp4EfF/El1gUTJsyUvXfPXo3FcC6Qa2+2wwDclMFUSlJ4ZYofOdMZ5Gge0XuyV60ALMmkYCuUBkwz9JeAHDvdITX5cDoZau0g== Received: from DM5PR06CA0073.namprd06.prod.outlook.com (2603:10b6:3:4::11) by BYAPR12MB3253.namprd12.prod.outlook.com (2603:10b6:a03:12f::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.25; Sun, 14 Nov 2021 15:36:34 +0000 Received: from DM6NAM11FT034.eop-nam11.prod.protection.outlook.com (2603:10b6:3:4:cafe::49) by DM5PR06CA0073.outlook.office365.com (2603:10b6:3:4::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.16 via Frontend Transport; Sun, 14 Nov 2021 15:36:34 +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 DM6NAM11FT034.mail.protection.outlook.com (10.13.173.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4690.15 via Frontend Transport; Sun, 14 Nov 2021 15:36:33 +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, 14 Nov 2021 15:36:30 +0000 From: Gregory Etelson To: , CC: , , , "Viacheslav Ovsiienko" , Raslan Darawsheh Subject: [PATCH 1/5] net/mlx5: fix VXLAN-GPE next protocol translation Date: Sun, 14 Nov 2021 17:36:12 +0200 Message-ID: <20211114153617.25085-1-getelson@nvidia.com> X-Mailer: git-send-email 2.33.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 246bdb2b-8fbf-4665-0007-08d9a78489dd X-MS-TrafficTypeDiagnostic: BYAPR12MB3253: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4303; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GTSU2SzHVc78RBmJG6Fd51t6sKXILHPEBDu8T845YKK6GQUU+uLxu9P1RFKbJ/GaUoo/HzFgXmcqdV4xcGlrC56vPZ8zCscnAnD1f4GqermU9JkIM6/jdl65QMah3LO/Qx3Lax4NZyWwvzkX14EZNhvDs4uKFk9PU7PhlxpSu7fDdtYOL0LAMLzBUKqEzZcgsGKsTSyNpkmvMLWUw9XXv/2qwvYlyioNSfSeui9cJ6R22WIi28a9lkCcBlE9eW0rFS2GnK8vMWqiFHa0iNv1yM0jV5GLd6JZW+I2a3yb7MuaqJ9+CamGF3C+bIckGNKUO5Cw4+qyiS4DXcRw+prgPfuy4DO7V/1Hskd2t+J6MkURP/nMDOC1NFbxgnrlQROASfkjNIbacgrCnuZA/Wq5JnQS7pX+uhXEt/FlM07w+3r1G1eTfbuEJMnQTLuJGsioeNcp2RUdkWOkercgvWLiznEsvm+cmqXQnlUbySgJICl+5u8I+TTELW48OAnsC0jOviKZitu9a/HFJMjnBzvfWKKCaJKDG85tWJG9SBs4Dlw209RDqR+tXU+uzyzErAfW8UWveGYbroc9Dj/iIFTlBkFmQYBu9z3QT9MammWmOtSxPeAs0EjTX+FuwIiCSNYNSLc91+CSgMJtWkeZmoRZrwsfXq94jVA3m+2k1OxeuQy1q+HrVpWiMOiOGNv40W8glJio1b55lzoeZol2yqqcVA== 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)(47076005)(55016002)(316002)(8936002)(186003)(16526019)(70586007)(450100002)(86362001)(36906005)(508600001)(8676002)(7696005)(2616005)(1076003)(107886003)(5660300002)(70206006)(6666004)(426003)(36756003)(336012)(36860700001)(6286002)(2906002)(7049001)(83380400001)(356005)(26005)(82310400003)(4326008)(7636003)(110136005)(54906003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2021 15:36:33.9050 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 246bdb2b-8fbf-4665-0007-08d9a78489dd 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: DM6NAM11FT034.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR12MB3253 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 VXLAN-GPE extends VXLAN protocol and provides the next protocol field specifying the first inner header type. The application can assign some explicit value to VXLAN-GPE::next_protocol field or set it to the default one. In the latter case, the rdma-core library cannot recognize the matcher built by PMD correctly, and it results in hardware configuration missing inner headers match. The patch forces VXLAN-GPE::next_protocol assignment if the application did not explicitly assign it to the non-default value Cc: stable@dpdk.org Fixes: 90456726eb80 ("net/mlx5: fix VXLAN-GPE item translation") Signed-off-by: Gregory Etelson --- drivers/net/mlx5/mlx5_flow_dv.c | 76 ++++++++++++++++++--------------- 1 file changed, 42 insertions(+), 34 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 1b4e15dff1..f9acb69cca 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -8962,46 +8962,40 @@ flow_dv_translate_item_vxlan(struct rte_eth_dev *dev, static void flow_dv_translate_item_vxlan_gpe(void *matcher, void *key, - const struct rte_flow_item *item, int inner) + const struct rte_flow_item *item, + const uint64_t pattern_flags) { + static const struct rte_flow_item_vxlan_gpe dummy_vxlan_gpe_hdr = {0, }; const struct rte_flow_item_vxlan_gpe *vxlan_m = item->mask; const struct rte_flow_item_vxlan_gpe *vxlan_v = item->spec; - void *headers_m; - void *headers_v; + /* The item was validated to be on the outer side */ + void *headers_m = MLX5_ADDR_OF(fte_match_param, matcher, outer_headers); + void *headers_v = MLX5_ADDR_OF(fte_match_param, key, outer_headers); void *misc_m = MLX5_ADDR_OF(fte_match_param, matcher, misc_parameters_3); void *misc_v = MLX5_ADDR_OF(fte_match_param, key, misc_parameters_3); - char *vni_m; - char *vni_v; - uint16_t dport; - int size; - int i; + char *vni_m = + MLX5_ADDR_OF(fte_match_set_misc3, misc_m, outer_vxlan_gpe_vni); + char *vni_v = + MLX5_ADDR_OF(fte_match_set_misc3, misc_v, outer_vxlan_gpe_vni); + int i, size = sizeof(vxlan_m->vni); uint8_t flags_m = 0xff; uint8_t flags_v = 0xc; + uint8_t m_protocol, v_protocol; - if (inner) { - headers_m = MLX5_ADDR_OF(fte_match_param, matcher, - inner_headers); - headers_v = MLX5_ADDR_OF(fte_match_param, key, inner_headers); - } else { - headers_m = MLX5_ADDR_OF(fte_match_param, matcher, - outer_headers); - headers_v = MLX5_ADDR_OF(fte_match_param, key, outer_headers); - } - dport = item->type == RTE_FLOW_ITEM_TYPE_VXLAN ? - MLX5_UDP_PORT_VXLAN : MLX5_UDP_PORT_VXLAN_GPE; if (!MLX5_GET16(fte_match_set_lyr_2_4, headers_v, udp_dport)) { MLX5_SET(fte_match_set_lyr_2_4, headers_m, udp_dport, 0xFFFF); - MLX5_SET(fte_match_set_lyr_2_4, headers_v, udp_dport, dport); + MLX5_SET(fte_match_set_lyr_2_4, headers_v, udp_dport, + MLX5_UDP_PORT_VXLAN_GPE); + } + if (!vxlan_v) { + vxlan_v = &dummy_vxlan_gpe_hdr; + vxlan_m = &dummy_vxlan_gpe_hdr; + } else { + if (!vxlan_m) + vxlan_m = &rte_flow_item_vxlan_gpe_mask; } - if (!vxlan_v) - return; - if (!vxlan_m) - vxlan_m = &rte_flow_item_vxlan_gpe_mask; - size = sizeof(vxlan_m->vni); - vni_m = MLX5_ADDR_OF(fte_match_set_misc3, misc_m, outer_vxlan_gpe_vni); - vni_v = MLX5_ADDR_OF(fte_match_set_misc3, misc_v, outer_vxlan_gpe_vni); memcpy(vni_m, vxlan_m->vni, size); for (i = 0; i < size; ++i) vni_v[i] = vni_m[i] & vxlan_v->vni[i]; @@ -9011,10 +9005,22 @@ flow_dv_translate_item_vxlan_gpe(void *matcher, void *key, } MLX5_SET(fte_match_set_misc3, misc_m, outer_vxlan_gpe_flags, flags_m); MLX5_SET(fte_match_set_misc3, misc_v, outer_vxlan_gpe_flags, flags_v); - MLX5_SET(fte_match_set_misc3, misc_m, outer_vxlan_gpe_next_protocol, - vxlan_m->protocol); - MLX5_SET(fte_match_set_misc3, misc_v, outer_vxlan_gpe_next_protocol, - vxlan_v->protocol); + 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; + else if (pattern_flags & MLX5_FLOW_LAYER_INNER_L3_IPV4) + v_protocol = RTE_VXLAN_GPE_TYPE_IPV4; + else if (pattern_flags & MLX5_FLOW_LAYER_INNER_L3_IPV6) + v_protocol = RTE_VXLAN_GPE_TYPE_IPV6; + } + MLX5_SET(fte_match_set_misc3, misc_m, + outer_vxlan_gpe_next_protocol, m_protocol); + MLX5_SET(fte_match_set_misc3, misc_v, + outer_vxlan_gpe_next_protocol, m_protocol & v_protocol); } /** @@ -12644,6 +12650,7 @@ flow_dv_translate(struct rte_eth_dev *dev, .std_tbl_fix = true, }; const struct rte_flow_item *integrity_items[2] = {NULL, NULL}; + const struct rte_flow_item *tunnel_item = NULL; if (!wks) return rte_flow_error_set(error, ENOMEM, @@ -13437,11 +13444,9 @@ flow_dv_translate(struct rte_eth_dev *dev, last_item = MLX5_FLOW_LAYER_VXLAN; break; case RTE_FLOW_ITEM_TYPE_VXLAN_GPE: - flow_dv_translate_item_vxlan_gpe(match_mask, - match_value, items, - tunnel); matcher.priority = MLX5_TUNNEL_PRIO_GET(rss_desc); last_item = MLX5_FLOW_LAYER_VXLAN_GPE; + tunnel_item = items; break; case RTE_FLOW_ITEM_TYPE_GENEVE: flow_dv_translate_item_geneve(match_mask, match_value, @@ -13573,6 +13578,9 @@ flow_dv_translate(struct rte_eth_dev *dev, integrity_items, item_flags); } + if (item_flags & MLX5_FLOW_LAYER_VXLAN_GPE) + flow_dv_translate_item_vxlan_gpe(match_mask, match_value, + tunnel_item, item_flags); #ifdef RTE_LIBRTE_MLX5_DEBUG MLX5_ASSERT(!flow_dv_check_valid_spec(matcher.mask.buf, dev_flow->dv.value.buf)); -- 2.33.1