From patchwork Wed Aug 9 07:40:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haifei Luo X-Patchwork-Id: 130033 X-Patchwork-Delegate: rasland@nvidia.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 59FB143016; Wed, 9 Aug 2023 09:41:35 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4AB4E43262; Wed, 9 Aug 2023 09:41:35 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2056.outbound.protection.outlook.com [40.107.223.56]) by mails.dpdk.org (Postfix) with ESMTP id 4158143262 for ; Wed, 9 Aug 2023 09:41:33 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=n7IYa5Vl8IR5tsm1QNKWf1hEEVa9Qz0fZtkBmiKy3DGv+K5cZDQJdKXgPCJcw/6cBkjpBbECDRvLADtskZEWhDGwa6j0O+JQ+uCO08+x1Z16KPIiDXH/6yewmXS7h6VTmdcBGFADJ3fl4zSW8wZDng3M7mY2eC638HePw78baC5ULailyZeYMLfkoIRDIwh5frtbdLjCCSeHNqxA90d04jOja3PhUoJs664VV6RnKhWIuBefzH97ulBSEQEdneOLdIfeSYtTbCKg3ZbbDcqZCWF+f32d6e45nni1EFjogXcAgpmBn/zaFUDtkBR2hwoDyGO3m6cYYjgw0XcIH1Z/UQ== 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=mN71+IEPokjhbRASXK2bzzkoD5F5olkwrDHT8ExYxaM=; b=M5lciSi+iJDm1tdNyEVc2OVgWgtsDys3s1/pHKnZpjBibFIuTaKQubMBVM0Z5O9ZkVUiKkJJ4qYDNNq2SuobZj5Z94znbIqyDLyaEiGD4IgtOhIfN0T4+UWgaCF2uu8anXBq7pGd8MJ80WxNjNTxe9lvkWIzlJ8XKOQ53sT9gw412D7DJD6Xqr8AhgE/vbLttXK9zVD0mAqY4n2V6z08bysevHKi2wzZt+kOe5cs+KFwKr7s6rEYvykBnBTV7ff2qJYRpB90BweW6+ahLoWHFndG1JjeJdAdEMwyuFh7RHveHHYcdb1zGfm5bOnDAnJAEvnlLS26+owZkdYuNdCYZg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=intel.com 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 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=mN71+IEPokjhbRASXK2bzzkoD5F5olkwrDHT8ExYxaM=; b=LAj+sr04xV4HSCYVC+5xhZRJ26ekzfh3FS8HNv/r2kN1ERfvLOeWGGTSE6uAPWuCU7Peb3lfnkOobSsJCsMmMoAh1GNJwpUF8ItrqEoxigVQlDGcPPLOKm8BDwaqEMNIwWuYpekOzYwb9MqtKDNzYnaTdvWmQYGvAwwt1EihSm4cIo8t6OCF1dPN59jZ5fFprEHVwrTIQlnPg4HKkN7zjEeNJrUKihvTxbw5xYQ0fUZOXZ41MVjBh3m+jSPGyEgNaDOOCsaU7OXyLIhQ0PMn4nzMRmsW4kUz09UmAQTgYtpuD4zewrPziMAFbnw8FPzNBiodAP6tnElM1lJs3n4X3A== Received: from SJ0PR13CA0057.namprd13.prod.outlook.com (2603:10b6:a03:2c2::32) by PH7PR12MB5782.namprd12.prod.outlook.com (2603:10b6:510:1d1::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.28; Wed, 9 Aug 2023 07:41:31 +0000 Received: from MWH0EPF000989EB.namprd02.prod.outlook.com (2603:10b6:a03:2c2:cafe::1c) by SJ0PR13CA0057.outlook.office365.com (2603:10b6:a03:2c2::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.18 via Frontend Transport; Wed, 9 Aug 2023 07:41:31 +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 MWH0EPF000989EB.mail.protection.outlook.com (10.167.241.138) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.19 via Frontend Transport; Wed, 9 Aug 2023 07:41: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.986.5; Wed, 9 Aug 2023 00:41:17 -0700 Received: from nvidia.com (10.126.230.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.37; Wed, 9 Aug 2023 00:41:13 -0700 From: Haifei Luo To: , , , , Aman Singh , Yuying Zhang CC: , , , , , Jiawei Wang Subject: [PATCH 1/5] app/testpmd: support for VXLAN-GPE's next protocol Date: Wed, 9 Aug 2023 10:40:42 +0300 Message-ID: <20230809074046.121807-2-haifeil@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20230809074046.121807-1-haifeil@nvidia.com> References: <20230809074046.121807-1-haifeil@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWH0EPF000989EB:EE_|PH7PR12MB5782:EE_ X-MS-Office365-Filtering-Correlation-Id: 126e2fc2-ff7d-49b7-abe4-08db98ac0c25 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: +iq96PDtfnZK4nbhHcDoYNqGNRZoz0FmEqbJpHi0AcPas//MWleln/aoj7Tz29g2T7pWXkgkZY4Dwf8kFF1m7h+COloTxLacy1DyfgAUwr3OxZ+LBJQmlvxZ6vn0Zo8ulXuhLxYLfiMLsoCsZN3FqtBTjC/lqJyklDdXy9BGu2KGrS9D8d5IXx2VS9QPz2a/VSVa8j+MLf2BJtSh5MZ0hvc7iPBZYaNzXsUq5ysbNMIK3v+AeYJHg+wBVFP4qagDMqtpds4o+VzAH7nm2yWaMNss2CVJill1Iijx2rPwRxfRCjffChWR51F7nSc5BC5biI1rmee9XVjqrrxO/3Iwckk7pEwSNiz7/AcGjsDwPjPk+umpfZUpuGfR1o1qIdqZFkIXxl1tPs9k7vbDxabbQCbF9TDw9eoCBeQTLglvsN2X90kAJOzKS69Vo4WUXz20GnpcnT519Va4DmBj4m7Yula1U9EiUkUGvBuVqhZkQ2LqpNSC8JIngrhe7lvFfiOP8I/L77B1rUMw7JVSa16Su5fBl7dbVNjIojNmS+dEj4qjmTLEsOgJdaDejKlQlCcUQDR2sRYP1/Rkla14FnKoNh0NtxxKIZH+yserhFLJ5HVIez95Toozv/zgp8PwzKb4W7HVcSQUdHHHIwJGIwVeg8MYt2ei+GDneSrn7tROJITbVkU2Fm2MlyPAd8tCAuBrZNCO9J2L0dMkrE8NJb+Cp8ZHDS7NKsiWmi/psrk+XGOM6YG99bfWg7VFYKmxBVfb 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:(13230028)(4636009)(346002)(396003)(39860400002)(136003)(376002)(451199021)(82310400008)(1800799006)(186006)(40470700004)(46966006)(36840700001)(1076003)(40480700001)(55016003)(26005)(107886003)(40460700003)(110136005)(54906003)(36756003)(5660300002)(86362001)(2906002)(4326008)(70206006)(70586007)(8676002)(8936002)(316002)(41300700001)(6666004)(7696005)(478600001)(356005)(82740400003)(7636003)(426003)(36860700001)(47076005)(336012)(6286002)(16526019)(2616005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2023 07:41:30.7868 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 126e2fc2-ff7d-49b7-abe4-08db98ac0c25 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: MWH0EPF000989EB.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB5782 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 Add support for configuring VXLAN-GPE's next protocol. The CLI is: vxlan-gpe protocol is . Example: flow create 0 transfer group 1 pattern eth / ipv6 / udp dst is 4790 / vxlan-gpe protocol is 0x04 / eth / ipv4 / tcp / end actions port_id id 1 / end Signed-off-by: Jiawei Wang Signed-off-by: Haifei Luo --- app/test-pmd/cmdline_flow.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index 94827bcc4a..d25f941259 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -385,6 +385,7 @@ enum index { ITEM_GENEVE_OPTLEN, ITEM_VXLAN_GPE, ITEM_VXLAN_GPE_VNI, + ITEM_VXLAN_GPE_PROTO, ITEM_ARP_ETH_IPV4, ITEM_ARP_ETH_IPV4_SHA, ITEM_ARP_ETH_IPV4_SPA, @@ -1758,6 +1759,7 @@ static const enum index item_geneve[] = { static const enum index item_vxlan_gpe[] = { ITEM_VXLAN_GPE_VNI, + ITEM_VXLAN_GPE_PROTO, ITEM_NEXT, ZERO, }; @@ -4804,6 +4806,14 @@ static const struct token token_list[] = { .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_vxlan_gpe, hdr.vni)), }, + [ITEM_VXLAN_GPE_PROTO] = { + .name = "protocol", + .help = "VXLAN-GPE next protocol", + .next = NEXT(item_vxlan_gpe, NEXT_ENTRY(COMMON_UNSIGNED), + item_param), + .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_vxlan_gpe, + protocol)), + }, [ITEM_ARP_ETH_IPV4] = { .name = "arp_eth_ipv4", .help = "match ARP header for Ethernet/IPv4", From patchwork Wed Aug 9 07:40:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haifei Luo X-Patchwork-Id: 130034 X-Patchwork-Delegate: rasland@nvidia.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 9692B43016; Wed, 9 Aug 2023 09:41:39 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 71B6943273; Wed, 9 Aug 2023 09:41:39 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2065.outbound.protection.outlook.com [40.107.92.65]) by mails.dpdk.org (Postfix) with ESMTP id 4D48F43261 for ; Wed, 9 Aug 2023 09:41:37 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jTa6PR8nMaQpLdN9noudj/E+PqoN/id6P5i/u6WUQaKrz+OEXvFkQL6rPQo4fLL9vef0gbeT6W85i82L21AuoqapoZCJCrQXjrd4kENN3XK6TBz6J+lyELfxs/Euag/VQfdKfjvdedWiAV4m6GIhSiA4NRd8qEB9AqOJVQcX0k2qDaKHnRmYVj0c22sY5kg6EDH2BaFWCq0QWHeyFT7Uin/XC8sqKKZYAijc3FhXewBlptaiPUYFSLRPkz++P6B0kl5PYW2UNRwQ3rBEW2sJX+JcqTE2joT6eJm+lD1FuTnZsOcGnrR3ltywj2zGH8AMvxKhvll/9ShHk9v/wFpBGQ== 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=jf7cdNkcGo2KqyvJZiSMIl7EWgjQEV3JfZnOamgKRB8=; b=DcA08N/JgEKaq+77Fugrj2F5T8i1nQHVZl/WKEgKwEIQyrmhSdCETF8cs+771aHDi7jFw8qo1ynHOV3d3ybmUBcH+p353FG/3xDRJManpIgM68yGV14pRQZHrJFKccD8RWg50OCLnyjdw/0fPjRwNUXUDuTarw0sDRislTAJE6cv/hyA0/3QOpjG7kxmbR4vbQR7Wk0Je4Dwq6Oy1XLIfpQTzwfPLtw5AiAjCqzQsIoqj3AqA4jCu/fFalBRpW3V7fWjTBWoPmukp3VMOCCW1nPbCJjS/OCJuuAE7A1SFPW3rST6KJG7NNLjuLYgCV35Mkobrxt+8ajv5JHobEBUcg== 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 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=jf7cdNkcGo2KqyvJZiSMIl7EWgjQEV3JfZnOamgKRB8=; b=FfqhfpeERy27ynR1xJwp9RQ99mPEnxFnCg0EHZhGmKbHE2PlrvZQONlMntbZY5O5ub7knzAfSxRhngIQ+EZnpNOEWII212fvyqWrOs0sCeHfRuev+CYkjMY2Jzh7zH+qCNMLbNBbh3WTl9cfUngvWYZEJ4YAi6T5kHx52RL2UU0ssxAOoDVpcUJ1i+cLJeN7QKJDsF7XPitqkBLHf4pefRAAfh8Pot+V6cEApyQlnd8h+I6U4otLbMk0JAfcSY5LoSrj6RuXndyMW9c49cGryZOhX0b0dM7kupjpk6RvIzXHF8p4JSKLWCQbtxIzBHoJ+FIjTtt9V/RnnHYTQEXeNA== Received: from SJ0PR13CA0059.namprd13.prod.outlook.com (2603:10b6:a03:2c2::34) by CH0PR12MB5236.namprd12.prod.outlook.com (2603:10b6:610:d3::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.28; Wed, 9 Aug 2023 07:41:35 +0000 Received: from MWH0EPF000989EB.namprd02.prod.outlook.com (2603:10b6:a03:2c2:cafe::d) by SJ0PR13CA0059.outlook.office365.com (2603:10b6:a03:2c2::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.16 via Frontend Transport; Wed, 9 Aug 2023 07:41:35 +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 MWH0EPF000989EB.mail.protection.outlook.com (10.167.241.138) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.19 via Frontend Transport; Wed, 9 Aug 2023 07:41:35 +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.986.5; Wed, 9 Aug 2023 00:41:20 -0700 Received: from nvidia.com (10.126.230.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.37; Wed, 9 Aug 2023 00:41:17 -0700 From: Haifei Luo To: , , , , Suanming Mou CC: , , , , Subject: [PATCH 2/5] common/mlx5: extend HCA attribute query for NSH Date: Wed, 9 Aug 2023 10:40:43 +0300 Message-ID: <20230809074046.121807-3-haifeil@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20230809074046.121807-1-haifeil@nvidia.com> References: <20230809074046.121807-1-haifeil@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWH0EPF000989EB:EE_|CH0PR12MB5236:EE_ X-MS-Office365-Filtering-Correlation-Id: c5133bb9-4773-4917-6618-08db98ac0ec8 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: iKcHZgwm8J0dvjwNDmD0X3tirofmyDVtnV6xZ26rwF/aW0qIwFfV8qcrmxI+a4rrdnovpUPFsYgi+RpK9mXsLwoKQlQyE9CnZnON7DYW3Q0CS2yGlv37XWt7IBHs1EvmQ3iH8W8mgy4+xRBLXA+l1jBvDcsUzRT/Of6yp3RaD3SiPRw1f/ZNl+23d0mihJUrmIk2H5jaqvFJ5vgC1u6y8UZ5CPwmOkFDeBCaHiqmqXID0IOmJhk0fOJT2dfv8XPqbb5v//QsNQxXCDIY4QIqkozAoJTd4LNfbzr+ODX8hqmmThyxjgtqsvB4kuJr09mvaO+/CEw8iS+IVe8O9zP4dJ/bk7rG0Lf2cRj0h/kabtMC2e3KOwbbSnLrwK8/ak04SrsbID+dXo4qYay+rGiucdd/HpI5ghx/Uemswps8N1kqXxbH0I37lBTZj2y0l2wh59o5F+M0IzFFixAXxNbAWcbMCkHYstczbmHqMaXS+VU/4QA0xT0g6FOYR/HvkLNXOW9pmvU83T/ILir1zuyPOuwQjzINo09wuUnHx0nEGAxR6JS5vcIs9s7ZVmBqPDC6nd9TBez4mJJkpBhqGqgPXem8gAeZ0VI22x0k5c4eSIhfnrLS4v3k9/QbiRVIwSLmQmFQPoBEVG5LGNN/B94kmu/4GP1Ae7aGFoQ3UrjTfU84xoT5GuKI7PIhi0lFFq6eevHJpMMukPVDKqMgdf0Sy4LS7nNS3E2wTwbfT+dIkhB79CW3eI/aUMeZnWcgfYCW 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:(13230028)(4636009)(346002)(396003)(39860400002)(136003)(376002)(451199021)(82310400008)(1800799006)(186006)(40470700004)(46966006)(36840700001)(1076003)(40480700001)(55016003)(26005)(107886003)(40460700003)(110136005)(54906003)(36756003)(5660300002)(86362001)(2906002)(4326008)(6636002)(70206006)(70586007)(8676002)(8936002)(316002)(41300700001)(6666004)(7696005)(478600001)(356005)(82740400003)(7636003)(426003)(36860700001)(83380400001)(47076005)(336012)(6286002)(16526019)(2616005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2023 07:41:35.2087 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c5133bb9-4773-4917-6618-08db98ac0ec8 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: MWH0EPF000989EB.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR12MB5236 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 Add NSH supporting field in two places: 1. New HCA capability indicating NSH is supported 2. New field in "mlx5_ifc_per_protocol_networking_offload_caps_bits" structure Signed-off-by: Haifei Luo --- drivers/common/mlx5/mlx5_devx_cmds.c | 3 +++ drivers/common/mlx5/mlx5_devx_cmds.h | 1 + drivers/common/mlx5/mlx5_prm.h | 4 +++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/common/mlx5/mlx5_devx_cmds.c b/drivers/common/mlx5/mlx5_devx_cmds.c index 66a77159a0..830199212e 100644 --- a/drivers/common/mlx5/mlx5_devx_cmds.c +++ b/drivers/common/mlx5/mlx5_devx_cmds.c @@ -1313,6 +1313,9 @@ mlx5_devx_cmd_query_hca_attr(void *ctx, attr->tunnel_stateless_gtp = MLX5_GET (per_protocol_networking_offload_caps, hcattr, tunnel_stateless_gtp); + attr->tunnel_stateless_vxlan_gpe_nsh = MLX5_GET + (per_protocol_networking_offload_caps, + hcattr, tunnel_stateless_vxlan_gpe_nsh); attr->rss_ind_tbl_cap = MLX5_GET (per_protocol_networking_offload_caps, hcattr, rss_ind_tbl_cap); diff --git a/drivers/common/mlx5/mlx5_devx_cmds.h b/drivers/common/mlx5/mlx5_devx_cmds.h index e071cd841f..11772431ae 100644 --- a/drivers/common/mlx5/mlx5_devx_cmds.h +++ b/drivers/common/mlx5/mlx5_devx_cmds.h @@ -196,6 +196,7 @@ struct mlx5_hca_attr { uint32_t tunnel_stateless_geneve_rx:1; uint32_t geneve_max_opt_len:1; /* 0x0: 14DW, 0x1: 63DW */ uint32_t tunnel_stateless_gtp:1; + uint32_t tunnel_stateless_vxlan_gpe_nsh:1; uint32_t max_lso_cap; uint32_t scatter_fcs:1; uint32_t lro_cap:1; diff --git a/drivers/common/mlx5/mlx5_prm.h b/drivers/common/mlx5/mlx5_prm.h index 51f426c614..f005877dd7 100644 --- a/drivers/common/mlx5/mlx5_prm.h +++ b/drivers/common/mlx5/mlx5_prm.h @@ -1964,7 +1964,9 @@ struct mlx5_ifc_per_protocol_networking_offload_caps_bits { u8 swp_lso[0x1]; u8 reserved_at_23[0x8]; u8 tunnel_stateless_gtp[0x1]; - u8 reserved_at_25[0x4]; + u8 reserved_at_25[0x2]; + u8 tunnel_stateless_vxlan_gpe_nsh[0x1]; + u8 reserved_at_28[0x1]; u8 max_vxlan_udp_ports[0x8]; u8 reserved_at_38[0x6]; u8 max_geneve_opt_len[0x1]; From patchwork Wed Aug 9 07:40:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haifei Luo X-Patchwork-Id: 130035 X-Patchwork-Delegate: rasland@nvidia.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 5CAFA43016; Wed, 9 Aug 2023 09:41:45 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 89CE443277; Wed, 9 Aug 2023 09:41:41 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2085.outbound.protection.outlook.com [40.107.237.85]) by mails.dpdk.org (Postfix) with ESMTP id AF20443261 for ; Wed, 9 Aug 2023 09:41:38 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Qm+ONH+L708+nhPuDPMC+S4SLPvN5PEE5OolJIsmTGPKFxR0xjvqvIOhj1ZYPo9opD43DwqTvS4jFm5+LpCUPUkDb+0nmvl2CqpJm6LjX/P2W2KER1negZZiq2qUH/2UHB9Jk/ppDgTwYnFADKFasyMN0HkBvZcPrOIU9YE7azMH6GvI2T23tDYHvIUIm6dD5Q1JD6VlNHVGjD5JE0QfAR4jXsBiCTowXzaPappO5TpgO2PVeoQJ+OuwCFINLWQnSYi2di4h9Jhx+J9inoRRXq2jYce+Rg3eFQXxX+Ggv5TaFeKEvN5I1z0g00Pvf60AhPb1znsheY/j6UC6KoPtHQ== 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=T2XsRuslKduU2iW41i4OWlHqIsMoAKyXygOaWF5w9XE=; b=cjRC45no1DeZSzwnyAnWBDpqCFUvtgZ3xKRuuXlxOw1wYPrilzkcEA51MiY0bejn9n0aNDfUn1eU6x0qxgDhp+blBcxnt2QN14+a4Dx4SV5och6HhAMSIUaUaxesRv/eHDcnyZ8U9n12x18C6u2ui+sFNLjnqKQEeWwEDuIF5mqRhz44Jqr4sGnq3UDLBV1lD1DRRRXS1W65T3mVbrGiT8cKwmhWHJO+TM2p8AuQqIyMSeOl43iEQY+EpBTV60OFF8RGLFDLApGFmDVzKkEEWGUOdpuxUTfEmd+R0/NqzQAzhR6k8Fh3XAv2nSuFRPpVxWiAjlxO24TAiIwS6NtBFQ== 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 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=T2XsRuslKduU2iW41i4OWlHqIsMoAKyXygOaWF5w9XE=; b=VGB9i1EzrgPUG8845ah+RWOUOW75qd3tZWx1anrtQXDacAIAeMX0PzrZoGCwirA3XzktRmwj8wn+niav+W3Q6qToc2eUzLiedR/ux++p3Q5yqjfbEJ/oL2FUZQ5iqwNJUUIRO5D5d0labU6FOAtzuf/oFp4Se5MiSbCpHR3MBhud1gZC4SlhdncdbiVkKyBMh6A3WhjhM/kEnOP1oT2eZcUmQWqDRxyys7I1n1PpYuDBr8sDy37qOKC3N2yKZqqZqCEzLaSHmtMR4/xmDKHnnv3Eka2+l80+HUU7kad6WBQgcdpzGXw1mp1lCEPmOiFunJuBeLRhm+RSRAflvzlZew== Received: from DM6PR02CA0159.namprd02.prod.outlook.com (2603:10b6:5:332::26) by PH8PR12MB7302.namprd12.prod.outlook.com (2603:10b6:510:221::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.21; Wed, 9 Aug 2023 07:41:37 +0000 Received: from SN1PEPF0002636C.namprd02.prod.outlook.com (2603:10b6:5:332:cafe::39) by DM6PR02CA0159.outlook.office365.com (2603:10b6:5:332::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.28 via Frontend Transport; Wed, 9 Aug 2023 07:41:37 +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 SN1PEPF0002636C.mail.protection.outlook.com (10.167.241.137) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.19 via Frontend Transport; Wed, 9 Aug 2023 07:41:36 +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.5; Wed, 9 Aug 2023 00:41:23 -0700 Received: from nvidia.com (10.126.230.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.37; Wed, 9 Aug 2023 00:41:20 -0700 From: Haifei Luo To: , , , , Suanming Mou CC: , , , , Subject: [PATCH 3/5] net/mlx5: enhance the validation for item VXLAN-GPE Date: Wed, 9 Aug 2023 10:40:44 +0300 Message-ID: <20230809074046.121807-4-haifeil@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20230809074046.121807-1-haifeil@nvidia.com> References: <20230809074046.121807-1-haifeil@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF0002636C:EE_|PH8PR12MB7302:EE_ X-MS-Office365-Filtering-Correlation-Id: 699dc02f-87eb-4a35-f0b7-08db98ac0fbb 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: EY7myVMmSejaRfJk0acl5YiTaczluW45ZdMbljHdI1FGbAZbvKFoDnX6kGp7A4BUojw6peawmWlpBiW4Gss42ViVV1EOHNSkq3gBxKz0NGPe2Q4/qqPBEhqrpnEL0SdUSrOF1OuR8HQTAdvPpwJe2dCuBLgkgNWqJs7GHyFEs390eeQCVVYQ2fXMutq3AWkQ2tCrSLJXiGvWzgkM50vB7Cjgyyhw3JnpHJ83XtxH3kilr4dDVXsqvbA8i2s6WB393DKoSRJssSLAq+2vMVmshatDDpMS9FKDTV92oBcwWmuq7zlvH4bH5jPNg8nzBAHD4V0K3X0OW0F6awfOXylLqQ8Jdy+1n1kAwtK+mA1xT3SpxfWVY69nL5Luqw+1cH1KSbdrDm7w6Eqcp3FeYy4XeUlY2zDjdhT3Ly3Wb3YBghdWJt+fw903SGJ1cJhArZYRMTdWPv3ZQK16nKOplNMvcd7PTTvzSyTcKsjmU8Mkm5soQV9/EJCBYmWZh+ALIDTXU4kt0VZ5WMvgUXeurXwg3TCDXqnYNZDDbhAmkMVruxyQ6xuHIsUtm9gP0Y+Jz+8aVzrydI5IsmCajug+zFhshFm5DlSYZDoz4uOxDoyNnNrzbujc24nwb9UTFzfSZbVOei7H91WmkuezNqSs/asRMpFZkZz8pYetXxSEwdfn5U+wF18ydSQZ6QYrWJvVIe7LWDuo1QsvlqwD1wF5+Lqlvd69U+Rwe406a632itzjgvk= 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:(13230028)(4636009)(136003)(39860400002)(376002)(396003)(346002)(451199021)(82310400008)(1800799006)(186006)(46966006)(36840700001)(40470700004)(41300700001)(316002)(7696005)(336012)(86362001)(70586007)(4326008)(6636002)(70206006)(5660300002)(8936002)(8676002)(36860700001)(82740400003)(7636003)(356005)(110136005)(54906003)(478600001)(6666004)(2906002)(107886003)(40460700003)(1076003)(26005)(83380400001)(40480700001)(36756003)(2616005)(426003)(55016003)(16526019)(47076005)(6286002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2023 07:41:36.7266 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 699dc02f-87eb-4a35-f0b7-08db98ac0fbb 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: SN1PEPF0002636C.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB7302 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 Enhance the validation so that configuring vxlan-gpe's next protocol as NSH is supported. 1. The spec's protocol can have value and nic_mask's protocol is 0xff. Signed-off-by: Haifei Luo --- drivers/net/mlx5/mlx5_flow.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index e91eb636d0..7de6640ecd 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -3198,6 +3198,11 @@ mlx5_flow_validate_item_vxlan_gpe(const struct rte_flow_item *item, uint8_t vni[4]; } id = { .vlan_id = 0, }; + struct rte_flow_item_vxlan_gpe nic_mask = { + .vni = "\xff\xff\xff", + .protocol = 0xff, + }; + if (!priv->sh->config.l3_vxlan_en) return rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ITEM, item, @@ -3221,18 +3226,12 @@ mlx5_flow_validate_item_vxlan_gpe(const struct rte_flow_item *item, mask = &rte_flow_item_vxlan_gpe_mask; ret = mlx5_flow_item_acceptable (item, (const uint8_t *)mask, - (const uint8_t *)&rte_flow_item_vxlan_gpe_mask, + (const uint8_t *)&nic_mask, sizeof(struct rte_flow_item_vxlan_gpe), MLX5_ITEM_RANGE_NOT_ACCEPTED, error); if (ret < 0) return ret; if (spec) { - if (spec->hdr.proto) - return rte_flow_error_set(error, ENOTSUP, - RTE_FLOW_ERROR_TYPE_ITEM, - item, - "VxLAN-GPE protocol" - " not supported"); memcpy(&id.vni[1], spec->hdr.vni, 3); memcpy(&id.vni[1], mask->hdr.vni, 3); } From patchwork Wed Aug 9 07:40:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haifei Luo X-Patchwork-Id: 130036 X-Patchwork-Delegate: rasland@nvidia.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 35B7E43016; Wed, 9 Aug 2023 09:41:52 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A503C43257; Wed, 9 Aug 2023 09:41:45 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2060.outbound.protection.outlook.com [40.107.92.60]) by mails.dpdk.org (Postfix) with ESMTP id AFDA74328A for ; Wed, 9 Aug 2023 09:41:44 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jwvai4nmo8N9xiwmzB7mLahMmdURd77PQo3VOADwqrJYYFDtQkoJ8/4sBNP+IGfhPFgnDenb6Rj6TZD415pBY/O8iZ5nrEe9Ws/wsS0+zIq69uwOMpGwS8wZ47qEntzcEQ6fa6yegEsiMCIhFzPxAnWlDWp/FG+7Cq2lszoWGv7K0TQcOFLfcLeIkXCrjkFK2Ew7a3wnnSTel1GFYnkZhnWO8RbwZ0nI3tOuBbad6CxPBvirNXrBOhHkChOgrx5vIw/wIZa6D6Qx7g5T1ulpKgHdmaQTyaUoB8LgZ8Wr8GH1UVM1veWLVrUymXoCKAwui9tXCjNILXxOpzfP5swxYA== 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=lgB6HxHi+wEQ0sh5hSSmSzcQpEEl4lqgGzleBKzrqLs=; b=U+ctiq+SRmUPFA5zWRNQ6lchCSSH/ktgPe4xkS1ek+2qBWM9PAzqiSThENQqbxRYVgJ52xIBAYBP/4qZcVUleRq3oKuXRFo71Ko5buG9KTjbgS/3O2YC+6DgfAYDMMnTOSCTAxssaj1y32qbPlA78785N4/5JGGpEsm3QWbE/6JszVrHpQiyuYNYvc+RPYI8qSmRDkE8iN1B52WRPRaMH+x+Bn8Fb6bFIg9wC4JvtYYNAbsa1Mf8IXjucEh9Iiaamo8kyaeso8fNHc1DZRIbxKyJKJdlY0yyU9L10bflmdaRfwZvH644sCGxvRUvggCnxfPSMtjitn0rp4Q7myRm4A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=intel.com 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 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=lgB6HxHi+wEQ0sh5hSSmSzcQpEEl4lqgGzleBKzrqLs=; b=PHcBK4CpxjBKXu2tcb2mv+efU5CASOT9o0w1yy/4QBKEIc8YLKOeIKy2cgUIor0OVUOs0MoXgsIqW9d5x97WTgNPfze72inxfWYmCTkgux2zTl2mbAWoO6o1KNoBRIHgk3dW4kZonTGRNKxyQFNqNd5oYKeOyPVLkGBrN/ynJK2fuziWm9ncoVANdBWNr4HJ7Xbe+oe/wZyYi9s1udCPHiWwzksf1pChyuJw6J8StBmzO5bGDEG5ow8CWgzsBQhTlcBPVOFvNTq/Piuq0zrwMvMtmiMS4kzMQYWKfUJvAERWO+FoIkKKTlWY2uB7YuzG1WKRbgciLqPeeezueQgWQQ== Received: from SJ0PR03CA0129.namprd03.prod.outlook.com (2603:10b6:a03:33c::14) by PH7PR12MB6954.namprd12.prod.outlook.com (2603:10b6:510:1b7::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.27; Wed, 9 Aug 2023 07:41:43 +0000 Received: from MWH0EPF000989EA.namprd02.prod.outlook.com (2603:10b6:a03:33c:cafe::60) by SJ0PR03CA0129.outlook.office365.com (2603:10b6:a03:33c::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.27 via Frontend Transport; Wed, 9 Aug 2023 07:41:42 +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 MWH0EPF000989EA.mail.protection.outlook.com (10.167.241.137) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.19 via Frontend Transport; Wed, 9 Aug 2023 07:41:42 +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.986.5; Wed, 9 Aug 2023 00:41:27 -0700 Received: from nvidia.com (10.126.230.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.37; Wed, 9 Aug 2023 00:41:24 -0700 From: Haifei Luo To: , , , , Aman Singh , Yuying Zhang CC: , , , , Subject: [PATCH 4/5] app/testpmd: support for NSH flow item Date: Wed, 9 Aug 2023 10:40:45 +0300 Message-ID: <20230809074046.121807-5-haifeil@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20230809074046.121807-1-haifeil@nvidia.com> References: <20230809074046.121807-1-haifeil@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWH0EPF000989EA:EE_|PH7PR12MB6954:EE_ X-MS-Office365-Filtering-Correlation-Id: a0bd758c-e435-4a88-2062-08db98ac1333 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: PhHKjGaQZ3a0Pc/kWTvBBgwpPZJp7TmXzcqmw+ke3nQIBKtuwU9IEKMa/8EB2EpG7BWlXGbKMuS0yyZEPq+8aRjz6hSOeynfAzJt2Ma2QweS5YihceelwwcSJBwsjSmQADjxeIvwf6HTpm9rb5bup0n2qVnDplILLRe8qK+5DUT00YfaKV6nGzd7HsUXWIpYDva9IQEyaVbIm+HuiG1rNO06TZTUo0AB31rd02us/XbD06AsywtpXtR8faZGYiMerLwYCVjZef3UV7C+XdZQ5dCCmu40ayVYTTfoZFogNhszHAwclLv5huKFMhNbyyvYiH0yGjJ8jBsZEB+sZeakSKI2m1ApLNkGn6kznBte7nUfGzEcJsx9ql/e3Ru3FqH47qKChwcy3hbJG1dZdq3BQ4yCC5qyIeCPWPzZL9hHdo64EXzh+2Dcr16N/XbW+xot/XJ9WnxsFRMA4V7vBkVlYslcZfUAGY+XIs62wE0BxAye76dEIY01py5un38rkJwFZIrTPhOoM41qGHaTmrpJ2aD+svaPIOV/FOe/oW2Xo3c7XIWk2/wU5YYkU3ymwin4cHs6cFTnTT6mNB+tbW61fF8wISz64cAMVyyFZ5RTa9BVWfw1pOcSTJptKhUf10POtMMgj7ckphbsjQ2Zl1qY53Sh6v0aX6c3XYf1wfjQsWFvNfWz4145Rb+G7ifCQz0KA4iPwXsz6LYGYqiFmLxruq4Ze8ClEbUZhYHuvjxaqDWx/AbSIIVTQreV9o+7DzRc 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:(13230028)(4636009)(346002)(396003)(376002)(39860400002)(136003)(451199021)(82310400008)(1800799006)(186006)(36840700001)(40470700004)(46966006)(8676002)(8936002)(5660300002)(4326008)(316002)(41300700001)(426003)(47076005)(83380400001)(40480700001)(55016003)(86362001)(40460700003)(36860700001)(2906002)(6666004)(7696005)(2616005)(336012)(16526019)(107886003)(26005)(1076003)(36756003)(6286002)(70586007)(70206006)(356005)(7636003)(82740400003)(478600001)(54906003)(110136005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2023 07:41:42.6034 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a0bd758c-e435-4a88-2062-08db98ac1333 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: MWH0EPF000989EA.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB6954 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 Add support for item NSH. The CLI is: nsh Example: flow create 0 transfer group 1 pattern eth / ipv6 / udp dst is 4790 / vxlan-gpe / nsh / eth / ipv4 / tcp / end actions port_id id 1 / end Signed-off-by: Haifei Luo --- app/test-pmd/cmdline_flow.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index d25f941259..bf93d649e1 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -525,6 +525,7 @@ enum index { ITEM_IB_BTH_PSN, ITEM_IPV6_PUSH_REMOVE_EXT, ITEM_IPV6_PUSH_REMOVE_EXT_TYPE, + ITEM_NSH, /* Validate/create actions. */ ACTIONS, @@ -1562,6 +1563,7 @@ static const enum index next_item[] = { ITEM_AGGR_AFFINITY, ITEM_TX_QUEUE, ITEM_IB_BTH, + ITEM_NSH, END_SET, ZERO, }; @@ -2081,6 +2083,11 @@ static const enum index item_ib_bth[] = { ZERO, }; +static const enum index item_nsh[] = { + ITEM_NEXT, + ZERO, +}; + static const enum index next_action[] = { ACTION_END, ACTION_VOID, @@ -5837,6 +5844,15 @@ static const struct token token_list[] = { .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_ib_bth, hdr.psn)), }, + [ITEM_NSH] = { + .name = "nsh", + .help = "match NSH header", + .priv = PRIV_ITEM(NSH, + sizeof(struct rte_flow_item_nsh)), + .next = NEXT(item_nsh), + .call = parse_vc, + }, + /* Validate/create actions. */ [ACTIONS] = { .name = "actions", From patchwork Wed Aug 9 07:40:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haifei Luo X-Patchwork-Id: 130037 X-Patchwork-Delegate: rasland@nvidia.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 2E83C43016; Wed, 9 Aug 2023 09:42:01 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3E191432A1; Wed, 9 Aug 2023 09:41:52 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2089.outbound.protection.outlook.com [40.107.220.89]) by mails.dpdk.org (Postfix) with ESMTP id 7C11643292 for ; Wed, 9 Aug 2023 09:41:50 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Q5bOvbcm2L8qCCxcMRC0jJxJe35oYwDujlAbshpV7GeLTfSLPSWr9MkYGgMKJj9RZJm5bIZ1oq7xs+lL5uc8XoA/lzOlPWZC4FWKymALDfphUO/VjLzKjv1fZ8uO6UoEwBs7RYETnsSwBNiSJK6jcs4RQhTrnLWIBNGQULiPSFeYwHS1S3qpomshdg1LS2b8ar5l1GeU7w1PrCzqQ886QIvIxhGaE6qYt/dcKO+x+C3mTpHUNuWOlWeyAwAs4ZxLnm4xb7HwqjJhHlxhvgX41PY26A0O+Ji+/jREGyU3Y7y+MhPck1G6lVels4/NqYkiNYBEhaCCVAi056M1u/YNOg== 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=ARiXSBCjEqaSC3gkSFv9LhZ4NIyLMXzLB+R9ZRd9Cws=; b=UVhQYrHgfpkheFl7/we75vARwtuPkd3m60CyC7DB9C7MqszlZ2H9c6QTSnpabjvAO37RHGKDVa+efbfwncVOoMsVDiHKol1iGU4cWuG8VK4uYPLSHyDCJ3LRNPDVoXadVGsBMJGNjKHjEc+TI9/5RGNOmHBLVk8x8elP+FVD3Uf9qqvxWKUow4cvq06EpJdlqs4AigoozcyPkFx0oZ/ZuHZIksDdltxWsIglrbsSaQ3bnusmI18HiMc6e0D6WYfR3h9sYyIkH1Wun4zZ0XWeAFt30DbgUoPqxzHS4Livv/fLJ0MKH70RoOtWd8kzN1labWWzvklKf4PjhRWe9FQxbw== 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 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=ARiXSBCjEqaSC3gkSFv9LhZ4NIyLMXzLB+R9ZRd9Cws=; b=qAchJKMN6Z3/QV7gTSZDYCqMG5mGRMApENhm9Q4Ys9mD2OssULwHL4Bj5ZQbgo2YBDEVaonM6O+k8BucFcPd4xEHvuvTLNktI06ul2CJLEZa0qU8NLpl1u3hyqet9HXXTSHBrKZ7PoWvH3CFWwO+tBSg94XjpzPErrJCfS2fKLlRYgbLTPZ1t7z4JDQpDC3VGFwKNcDpuJ51Y8etTzZkTNfAp8VofaCh+E0CLpPxdU0QXT/xDE2a35kYRRmcJnwwU+zKkkQMwH7RBwfjQYx2YI0Do/s4O7FcCEq8AX8wrxvC+FXKpiO+ejuOFuVqauGGEjQVFk2G5FQu4PPR6qK95Q== Received: from MW2PR16CA0038.namprd16.prod.outlook.com (2603:10b6:907:1::15) by IA0PR12MB8716.namprd12.prod.outlook.com (2603:10b6:208:485::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.28; Wed, 9 Aug 2023 07:41:48 +0000 Received: from MWH0EPF000989E9.namprd02.prod.outlook.com (2603:10b6:907:1:cafe::d6) by MW2PR16CA0038.outlook.office365.com (2603:10b6:907:1::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.27 via Frontend Transport; Wed, 9 Aug 2023 07:41:48 +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 MWH0EPF000989E9.mail.protection.outlook.com (10.167.241.136) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.19 via Frontend Transport; Wed, 9 Aug 2023 07:41:48 +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.986.5; Wed, 9 Aug 2023 00:41:30 -0700 Received: from nvidia.com (10.126.230.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.37; Wed, 9 Aug 2023 00:41:27 -0700 From: Haifei Luo To: , , , , Suanming Mou CC: , , , , Subject: [PATCH 5/5] net/mlx5: add support for item NSH Date: Wed, 9 Aug 2023 10:40:46 +0300 Message-ID: <20230809074046.121807-6-haifeil@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20230809074046.121807-1-haifeil@nvidia.com> References: <20230809074046.121807-1-haifeil@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWH0EPF000989E9:EE_|IA0PR12MB8716:EE_ X-MS-Office365-Filtering-Correlation-Id: ae3eb578-1ba4-4c25-af32-08db98ac168b 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: vRVT+Y1SiHYiGEkBk6QK4cIRU4RNZkj/5owJAWlbXhsidBOh05X3WPuaMd7BXshwayxaP3CcQ9EEendIWHs5DQssruUIQOhn6VHtHD+iDeV9R+pJPdIs82xqsYAOqsZ43scxPiQ0hoZ7rMDhwp8lnQSJ9MseNoiPBF73BvVMSetWtt1e8W7xK5cSgINKc092ivNqa1cCWiSrk3JCMS+SHlcrAIlLywcWI0FEWZ/n/ZTF+yH5aiKggBcEXlKmGpztSoZjJdy+RVISN9lWY4tiEWFOn3Rl3NjAsXMcI3A0bBTDEiPSu8LgFoPt4+HUMCfBrN6am5gSJWShNlOJgMIrzxossm250V1DLYKVirg4ZMeE1sx9vO/JSCy+XncYb65C8TQtK0ok2BXghtyhYgVlq7q3bqNVnrqHCW3XlxqEBp3OyL5Hc1lVqDXsB1Ydqx5JY3UweeN0cHqe4KJ+LefUZ8ZTZJCOxKl0k7WueMk75wcWXs8G7L5wYgNVZm0Yt3vd/Z/M24jJOzX5SgR6BtgZoYCXt/+o1Nry3xCAXt2bpfwIuhn8qJ6CNTJUl3VLztvkNxg4ekUjcTKgHtwm4oLte7nUw6t848WkhE/nhh5NBpG+nYJpuXDouwhEqJ9zYxVs01UnUoL3CEwOIe0lI5cKJZ4VCBIFNYBqsdxr5PkJUY7RXwmhrFHxUsKgiYnAwAOys/sW8+/SHGL4zOQo3m4pySiaef6rqkVfnT4daVkE8Nx1coSj6IXSaZIsGoW7IIo0 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:(13230028)(4636009)(136003)(346002)(39860400002)(396003)(376002)(186006)(1800799006)(451199021)(82310400008)(36840700001)(46966006)(40470700004)(82740400003)(7636003)(36756003)(86362001)(40460700003)(55016003)(40480700001)(6636002)(316002)(70586007)(107886003)(1076003)(6286002)(336012)(26005)(356005)(16526019)(5660300002)(6666004)(7696005)(110136005)(8676002)(8936002)(41300700001)(54906003)(4326008)(2616005)(426003)(47076005)(83380400001)(2906002)(70206006)(36860700001)(478600001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2023 07:41:48.2325 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ae3eb578-1ba4-4c25-af32-08db98ac168b 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: MWH0EPF000989E9.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB8716 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 1. Add validation for item NSH. It will fail if HCA cap for NSH is false. 2. Add item_flags for NSH. 3. For vxlan-gpe if next header is NSH, set next_protocol as NSH. Signed-off-by: Haifei Luo --- drivers/net/mlx5/mlx5_flow.c | 39 +++++++++++++++++++++++++++++++++ drivers/net/mlx5/mlx5_flow.h | 6 +++++ drivers/net/mlx5/mlx5_flow_dv.c | 13 ++++++++++- 3 files changed, 57 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 7de6640ecd..0e241acd62 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -3905,6 +3905,45 @@ mlx5_flow_validate_item_ecpri(const struct rte_flow_item *item, MLX5_ITEM_RANGE_NOT_ACCEPTED, error); } +/** + * Validate the NSH item. + * + * @param[in] dev + * Pointer to Ethernet device on which flow rule is being created on. + * @param[out] error + * Pointer to error structure. + * + * @return + * 0 on success, a negative errno value otherwise and rte_errno is set. + */ +int +mlx5_flow_validate_item_nsh(struct rte_eth_dev *dev, + const struct rte_flow_item *item, + struct rte_flow_error *error) +{ + struct mlx5_priv *priv = dev->data->dev_private; + + if (item->mask) { + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_ITEM, item, + "NSH fields matching is not supported"); + } + + if (!priv->sh->config.dv_flow_en) { + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, "NSH support requires DV flow interface"); + } + + if (!priv->sh->cdev->config.hca_attr.tunnel_stateless_vxlan_gpe_nsh) { + return rte_flow_error_set(error, ENOTSUP, + RTE_FLOW_ERROR_TYPE_ITEM, item, + "Current FW does not support matching on NSH"); + } + + return 0; +} + static int flow_null_validate(struct rte_eth_dev *dev __rte_unused, const struct rte_flow_attr *attr __rte_unused, diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h index 3a97975d69..ccb416e497 100644 --- a/drivers/net/mlx5/mlx5_flow.h +++ b/drivers/net/mlx5/mlx5_flow.h @@ -233,6 +233,9 @@ enum mlx5_feature_name { /* IB BTH ITEM. */ #define MLX5_FLOW_ITEM_IB_BTH (1ull << 51) +/* NSH ITEM */ +#define MLX5_FLOW_ITEM_NSH (1ull << 53) + /* Outer Masks. */ #define MLX5_FLOW_LAYER_OUTER_L3 \ (MLX5_FLOW_LAYER_OUTER_L3_IPV4 | MLX5_FLOW_LAYER_OUTER_L3_IPV6) @@ -2453,6 +2456,9 @@ int mlx5_flow_validate_item_ecpri(const struct rte_flow_item *item, uint16_t ether_type, const struct rte_flow_item_ecpri *acc_mask, struct rte_flow_error *error); +int mlx5_flow_validate_item_nsh(struct rte_eth_dev *dev, + const struct rte_flow_item *item, + struct rte_flow_error *error); int mlx5_flow_create_mtr_tbls(struct rte_eth_dev *dev, struct mlx5_flow_meter_info *fm, uint32_t mtr_idx, diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index a8dd9920e6..4a46793758 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -7815,6 +7815,12 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, last_item = MLX5_FLOW_ITEM_IB_BTH; break; + case RTE_FLOW_ITEM_TYPE_NSH: + ret = mlx5_flow_validate_item_nsh(dev, items, error); + if (ret < 0) + return ret; + last_item = MLX5_FLOW_ITEM_NSH; + break; default: return rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ITEM, @@ -9720,7 +9726,9 @@ flow_dv_translate_item_vxlan_gpe(void *key, const struct rte_flow_item *item, v_protocol = vxlan_v->hdr.protocol; if (!m_protocol) { /* Force next protocol to ensure next headers parsing. */ - if (pattern_flags & MLX5_FLOW_LAYER_INNER_L2) + if (pattern_flags & MLX5_FLOW_ITEM_NSH) + v_protocol = RTE_VXLAN_GPE_TYPE_NSH; + else 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; @@ -13910,6 +13918,9 @@ flow_dv_translate_items(struct rte_eth_dev *dev, flow_dv_translate_item_ib_bth(key, items, tunnel, key_type); last_item = MLX5_FLOW_ITEM_IB_BTH; break; + case RTE_FLOW_ITEM_TYPE_NSH: + last_item = MLX5_FLOW_ITEM_NSH; + break; default: break; }