From patchwork Thu Jan 11 07:00:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gavin Li X-Patchwork-Id: 135839 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7AF624388E; Thu, 11 Jan 2024 08:01:33 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 331D94067A; Thu, 11 Jan 2024 08:01:28 +0100 (CET) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2041.outbound.protection.outlook.com [40.107.236.41]) by mails.dpdk.org (Postfix) with ESMTP id C3227402F1 for ; Thu, 11 Jan 2024 08:01:26 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YbBfWIZ7eS+2jrkodIVL/0J5xxcovq2BEnXZkjML1REEoRs8zO62qRn4Xiv0fZhU/VWP0c6hW/EiN4ULabUIYc/O/auXf1drT7/RhTs/Siq6t/lYW0i68vWauNnssCBzJGbLrJb0dZ8OnSgDPPf72jnhlLEHempa/xujK5V176CQpV2rUnKlLW3kmQQVAZq5EVuORuhY1CxWZCNO+yDOSbCJbrBYG17ZMM9bguk6xt1xvkU6Ce/5waVgHj8svlMJjJoM+Do3nE/vyZjnplgzANAi86JE9IeucD/td8qL9E0kxnXPBx64VXk4WJeAdg5nd8s/rkgeyeJb9wPTcSaGNA== 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=0bV0EGE7SlWSHQEc59hSXdF1/9TjNiGDorf1RUShI0Y=; b=BxXMjB4T94KnaaOspuVxjJNpAcjz3eI4F0GdhZay+CtWE4/rYJO2OLuDmOExl0M6zu17amCqf2zD08uJ4si0uZ94huYF6x5h2JHRoQpkMe/wfCoBP5ZxA7XQQkgUwqcmltMN4BlCXMYwYpiEdC6oTPjGCOx5X1ThE6/kmcm2/3OkUoN+yHupgtdEDB2YbsdHp6Nm3MmKopS2aWF/ZA+kDAuG4VvG0g/A3a7xjko+HTSQxyewGtn9FQWCSDiiFsfwppkGuVOGH5LaRNrIvQb/83PGTth+17soKgQPMOKur9IOI1goLuLU39WpIQ79C40GMnMqvrStCPprrTJQbyW4ig== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) 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=0bV0EGE7SlWSHQEc59hSXdF1/9TjNiGDorf1RUShI0Y=; b=aEKyzHA3KgUAsu6QG4qlqzjZ+nG3oc6keHjMUPrMRp7cKuKVH5O4tpJXnqoFb++ETZA1jmcXPhrcAladHfwc3Cmnpp+2vzbCpOUOBfpWq2JiYscaWUhAcli7c/mCKXBZ9EmtBVNAAOsIbthhppMHNQlXrt4tE11GSD2fMhy6Pvd4cqleGvs7A6K2a4m2lOx8drlVVYPbklsWMWfOVwNuY4CYXBPPe10M6gYInaxuh+K876er9MC35PDp6psQhjEe39lGZ7hTwhHK6Yd6fKXNlkUi1IBzBQg9am/PXO0dc22jVdv8QTkUWTuKTsCICKA9EjW0tPgMCXiGIN9qDhyCgg== Received: from BYAPR05CA0092.namprd05.prod.outlook.com (2603:10b6:a03:e0::33) by BY5PR12MB4869.namprd12.prod.outlook.com (2603:10b6:a03:1d9::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7181.18; Thu, 11 Jan 2024 07:01:24 +0000 Received: from SJ5PEPF000001CA.namprd05.prod.outlook.com (2603:10b6:a03:e0::4) by BYAPR05CA0092.outlook.office365.com (2603:10b6:a03:e0::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7181.17 via Frontend Transport; Thu, 11 Jan 2024 07:01:24 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by SJ5PEPF000001CA.mail.protection.outlook.com (10.167.242.39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7181.14 via Frontend Transport; Thu, 11 Jan 2024 07:01:24 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Wed, 10 Jan 2024 23:01:14 -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.986.41; Wed, 10 Jan 2024 23:01:11 -0800 From: Gavin Li To: , , , , , , , , CC: , Subject: [RFC 3/5] net/mlx5: support VXLAN-GPE reserved fields matching Date: Thu, 11 Jan 2024 09:00:41 +0200 Message-ID: <20240111070043.1276161-4-gavinl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240111070043.1276161-1-gavinl@nvidia.com> References: <20240111070043.1276161-1-gavinl@nvidia.com> MIME-Version: 1.0 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: SJ5PEPF000001CA:EE_|BY5PR12MB4869:EE_ X-MS-Office365-Filtering-Correlation-Id: 3f53bcea-2606-47a9-cc31-08dc12731f9d X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VKR0N6pkTLoVLMQfGeclZLmsjgHaSBbvafBfQYMztmMCn4h+780JetN86uKULfGXdf+PsMJCq5CYdh/uCPggg0HpH5pEngLl0yDzkSHyfCohWapEYoKLM/e+XpjsjKZ/kJidRKCSK82cnYJu0Rrj5DzrjNhQFUYiUuAv8HGxjldn5q7N9nowBey6xh7GBWHOFLMYRMgqA9t6CcqVvxxuu/aunSWC/gJP337ffjyU91Cq3r26PtG5W0CgXQlSZDVGual0bDZmXcwizLgezzGzJxgOSqmRUM0LwcdoPnVATdKozst4vP7OYzs0Y8hl7yiV8yvh0CPKeTCdu6e4lmt5Ra/1VF+MbI5VlBr7Qz0aMpETOI8X0rOpmJEkZNKm6TCaXHxbetEmT9MuF0HzZQUBk6DTA80dwsX3gdYM5BpN9ErLmzD8ZCtC5d57G0aZC1u9A25jLbleetotu3JKnLit5m/uXZw1jm6cuNBopdcVoH2OmprFamwm3wzXSTVJn+l/PjV641PPlr62rzt3x6oy/LaBMfGeDqwS6+x5vs1a2PVBsBdBfmWrKVRK3HzWK9oBS14zJqnn0e51lUwkV0DOw9G/8wP/VbaOEwL0ObdUUGepuAvQl74UXMeQ/lmrzvohtmuyRGP6ECsCtWFXAUDlh73d1lhrFnmZplZdlxz+fyb3lKdmIMnoAGUr3Zpl4BzX3lCO4CHyr/99Qbm89wiiBw== X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(39860400002)(136003)(396003)(346002)(376002)(230922051799003)(451199024)(64100799003)(1800799012)(186009)(82310400011)(46966006)(36840700001)(83380400001)(40480700001)(55016003)(47076005)(82740400003)(110136005)(316002)(478600001)(54906003)(7636003)(6636002)(70586007)(356005)(4326008)(5660300002)(8936002)(6666004)(7696005)(8676002)(36860700001)(107886003)(70206006)(26005)(2906002)(336012)(6286002)(41300700001)(16526019)(1076003)(2616005)(36756003)(86362001)(426003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jan 2024 07:01:24.0429 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3f53bcea-2606-47a9-cc31-08dc12731f9d 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SJ5PEPF000001CA.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4869 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org This adds matching on the reserved fields of VXLAN-GPE header (the 16-bits before Next Protocol and the last 8-bits). To support all the header fields, tunnel_header_0_1 should be supported by FW and misc5_cap is set. If one of the reserved fields is matched on, misc5 is used for matching. Otherwise, keep using misc3 Signed-off-by: Gavin Li Reviewed-by: Dariusz Sosnowski --- doc/guides/nics/mlx5.rst | 5 +++++ drivers/net/mlx5/mlx5_flow.c | 5 +++++ drivers/net/mlx5/mlx5_flow_dv.c | 32 ++++++++++++++++++++++++++------ 3 files changed, 36 insertions(+), 6 deletions(-) diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst index 7bfd6c6aeb..27384d5a86 100644 --- a/doc/guides/nics/mlx5.rst +++ b/doc/guides/nics/mlx5.rst @@ -311,6 +311,11 @@ Limitations Group zero's behavior may differ which depends on FW. Matching value equals 0 (value & mask) is not supported. +- Matching on VXLAN-GPE header fields: + + - ``rsvd0``/``rsvd1`` matching support depends on FW version when using DV flow + engine (``dv_flow_en`` = 1). + - L3 VXLAN and VXLAN-GPE tunnels cannot be supported together with MPLSoGRE and MPLSoUDP. - MPLSoGRE is not supported in HW steering (``dv_flow_en`` = 2). diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index ffa183dc1b..9b6f483d3f 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -3316,6 +3316,11 @@ mlx5_flow_validate_item_vxlan_gpe(const struct rte_flow_item *item, "no outer UDP layer found"); if (!mask) mask = &rte_flow_item_vxlan_gpe_mask; + if (priv->sh->misc5_cap && priv->sh->tunnel_header_0_1) { + nic_mask.rsvd0[0] = 0xff; + nic_mask.rsvd0[1] = 0xff; + nic_mask.rsvd1 = 0xff; + } ret = mlx5_flow_item_acceptable (item, (const uint8_t *)mask, (const uint8_t *)&nic_mask, diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 97f55003c3..f3589da654 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -9813,14 +9813,10 @@ flow_dv_translate_item_vxlan_gpe(void *key, const struct rte_flow_item *item, vxlan_v = vxlan_m; else if (key_type == MLX5_SET_MATCHER_HS_V) vxlan_m = vxlan_v; - for (i = 0; i < size; ++i) - vni_v[i] = vxlan_m->hdr.vni[i] & vxlan_v->hdr.vni[i]; if (vxlan_m->hdr.flags) { flags_m = vxlan_m->hdr.flags; flags_v = vxlan_v->hdr.flags; } - MLX5_SET(fte_match_set_misc3, misc_v, outer_vxlan_gpe_flags, - flags_m & flags_v); m_protocol = vxlan_m->hdr.protocol; v_protocol = vxlan_v->hdr.protocol; if (!m_protocol) { @@ -9839,8 +9835,32 @@ flow_dv_translate_item_vxlan_gpe(void *key, const struct rte_flow_item *item, if (key_type & MLX5_SET_MATCHER_M) v_protocol = m_protocol; } - MLX5_SET(fte_match_set_misc3, misc_v, - outer_vxlan_gpe_next_protocol, m_protocol & v_protocol); + /* + * If only match flags/protocol/vni field, keep using misc3 for matching. + * If need to match rsvd0 or rsvd1, using misc5 and do not need using misc3. + */ + if (!(vxlan_m->hdr.rsvd0[0] || vxlan_m->hdr.rsvd0[1] || vxlan_m->hdr.rsvd1)) { + for (i = 0; i < size; ++i) + vni_v[i] = vxlan_m->hdr.vni[i] & vxlan_v->hdr.vni[i]; + MLX5_SET(fte_match_set_misc3, misc_v, outer_vxlan_gpe_flags, + flags_m & flags_v); + MLX5_SET(fte_match_set_misc3, misc_v, + outer_vxlan_gpe_next_protocol, m_protocol & v_protocol); + } else { + uint32_t tunnel_v; + void *misc5_v = MLX5_ADDR_OF(fte_match_param, key, misc_parameters_5); + + tunnel_v = (flags_m & flags_v) << 24 | + (vxlan_v->hdr.rsvd0[0] & vxlan_m->hdr.rsvd0[0]) << 16 | + (vxlan_v->hdr.rsvd0[1] & vxlan_m->hdr.rsvd0[1]) << 8 | + (m_protocol & v_protocol); + MLX5_SET(fte_match_set_misc5, misc5_v, tunnel_header_0, tunnel_v); + tunnel_v = (vxlan_v->hdr.vni[0] & vxlan_m->hdr.vni[0]) << 24 | + (vxlan_v->hdr.vni[1] & vxlan_m->hdr.vni[1]) << 16 | + (vxlan_v->hdr.vni[2] & vxlan_m->hdr.vni[2]) << 8 | + (vxlan_v->hdr.rsvd1 & vxlan_m->hdr.rsvd1); + MLX5_SET(fte_match_set_misc5, misc5_v, tunnel_header_1, tunnel_v); + } } /**