From patchwork Fri Jul 2 08:34:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jack Min X-Patchwork-Id: 95180 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 DE637A0A0F; Fri, 2 Jul 2021 10:35:15 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9618C41353; Fri, 2 Jul 2021 10:35:14 +0200 (CEST) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam08on2082.outbound.protection.outlook.com [40.107.102.82]) by mails.dpdk.org (Postfix) with ESMTP id A76FC41352; Fri, 2 Jul 2021 10:35:12 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ey1Fz2zyfBaarQexYxvETP+ZY2e3N1A6H1vv8qKf4M7hqt4zWT7ID3jB8m7YeRo1ydXmxZPH1/vkoGomUbQF9cXwWc1D0wHYcn24kO2n46pfXDRSpZpY9KfPg+P4REP/9nJ8GTCQgNsPIVy5miJV7pgx2RgQncXPSPyyjrIttrSew2NvLLiFFajrQoK5vnyfBFrfEdqRL3bWFpE7Db3TI1P4FRjkQR0fborqIy5WHAbsNIShdPcmHSoDTCfpM3jqpld5G3EgxXyVg/MtNsFuRtDse7PQTzR+B9I9ghGw7B5zazP7V0sWSrX0gHDY4FZ+Zv/BBeikNLI0w6XZhZjVBw== 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-SenderADCheck; bh=U+3cCaNAWY67Tw+Q2GkgNeVDdS4ZljxPDTEXxhoRx3Q=; b=DqRcojm8n1bFrYwpatKpj19CchDbWrGjjfoQ5kMm0g5IybtN/uvLKcm1ybm0pezqnfLowdKdISUJEygKu4aL4j/03K4CbaqMgQBOyqv/CdzmubKjmg2Pyub/M+jnX0QAgVuFc0GGS/53YArqkAx7he6k4sQ4taLP3OJaUNxvyp37AK2tfWPIo90/71lhTaq7v1pOad2kR3Iw8UV34BD7Pc4fj9xRmmkaoTl3bjIgF67Xs+Avsztoii+Apq2acDu4krHzEQ/2f61bRT0ap76JvSL/3KnPDY0msVtTQYM7FGGKaUVMwH4sshgBJDMBpbwPu5ujGPtAoerMp0i2Frpqtg== 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=none sp=none 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=U+3cCaNAWY67Tw+Q2GkgNeVDdS4ZljxPDTEXxhoRx3Q=; b=nQSj+RVvZE0BVgf20ioZfnEqGVfbYkIRvhpF/aQPXRN2IAAyCb2BfEI11JckYqSZW11+aDdjYyr61LwRZfQGXu9ADzkaVVoJFqNQb8b15xLATv/aDnm/O3vlYNHe1okv1vNCTHXSOC228EZheHGBYhe/45cqq3R3P6of3pPl6R4zA0algJjgNSBon8DT9kqeUDEKGItfzj6P3oErZjcDrKfCC0AcI41USZreymPdEmOboTnpL35aZTF9K4JlM3VR0GtQU8daiGIhtdqD45o8pVtpc1S+pyVtL8T6Ez+2TBioVfcr7dzHVKEp4qKKuCu2Tfpuzg67n/br2mjyyHhgkA== Received: from DM6PR04CA0007.namprd04.prod.outlook.com (2603:10b6:5:334::12) by BN9PR12MB5052.namprd12.prod.outlook.com (2603:10b6:408:135::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.23; Fri, 2 Jul 2021 08:35:11 +0000 Received: from DM6NAM11FT030.eop-nam11.prod.protection.outlook.com (2603:10b6:5:334:cafe::16) by DM6PR04CA0007.outlook.office365.com (2603:10b6:5:334::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.23 via Frontend Transport; Fri, 2 Jul 2021 08:35:11 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; 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 DM6NAM11FT030.mail.protection.outlook.com (10.13.172.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4287.22 via Frontend Transport; Fri, 2 Jul 2021 08:35:10 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 2 Jul 2021 08:35:08 +0000 From: Xiaoyu Min To: Matan Azrad , Shahaf Shuler , Viacheslav Ovsiienko , Dekel Peled CC: , Date: Fri, 2 Jul 2021 16:34:46 +0800 Message-ID: <3b4a9e1bef1e4465f59ed785e6f25a19a40acdd6.1625213344.git.jackmin@nvidia.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] 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: 3124e52e-29e6-4df6-6b02-08d93d344e1b X-MS-TrafficTypeDiagnostic: BN9PR12MB5052: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3513; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GJ14FiOANFcjJyp16fClWcWGL8DwdbBqQz4RrEgsK68et9K6wqc9WU8yymq0qEZuZvCfvgX67eC734/326uBe/9hs/7Frhn1faU02c21pUL/LGSwtJ6TVMSy0sSXZ/N5Y+5ni/LirroXznSN0Yt4ywmVCromHqmVS3JT0DgzEyi4LGR/k9SXZem0t+5MhZ/yP10XKMEOdlfDkb5Z0/VX2WXNRyDCVaBwjpx+09EeqXF4tsFWs7JSelNsmuGOfONrrMMnE+6+Oaxo+4GYyD0of6ksAcctFMkPUZsXkFhGacl3dtlt0zPxTFXfJ3TRfKeU6eyo1cW6dKRHuVg6KCCIP7jyY75h26rsf+BMgZlFaRpXJgJivm7oGX6OshI0Ny6v6LsAAhfNnQaThXBVem7wXboDH7+i0l8UGVxvn7XjWVi1scZp8AY8LgqkVj3QL4hZqhkQmvYxp0XWcqCg8tMpXImGnsuUUYDdTCdZS/4O/dmzjccbiKPCnyAJvx/aK65wKqzLJ80l7WloGNp/l270ZGDNq+6Ru8Zv34sPpWLXfDFrRdSHP0P0HdcRXxVWb8YAcW4NVxvRm0+zWsms8rWJP5bY5qn+mdboChNEoPiQCHwnWajuPUH4LFDW70+RJ4NQiWE13cw3CjvjcKjo3Fx652fYyIM/ZoxWEO8a7yULEyCnt6aK/+UfgEnurd+R0xLapbf7oxcg7mGzPUsZrVBIHw== 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)(376002)(346002)(136003)(39860400002)(396003)(46966006)(36840700001)(47076005)(36860700001)(478600001)(450100002)(5660300002)(82310400003)(26005)(6666004)(83380400001)(86362001)(8676002)(2616005)(336012)(316002)(4326008)(426003)(2906002)(110136005)(8936002)(82740400003)(356005)(7636003)(7696005)(70206006)(186003)(70586007)(54906003)(55016002)(6286002)(36756003)(16526019)(36906005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jul 2021 08:35:10.6539 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3124e52e-29e6-4df6-6b02-08d93d344e1b 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: DM6NAM11FT030.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR12MB5052 Subject: [dpdk-dev] [PATCH 1/3] net/mlx5: fix MPLS over IP 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 Sender: "dev" HW doesn't support match MPLS over IP traffic. Remove related code. Fixes: d1abe664ddde ("net/mlx5: add MPLS to Direct Verbs flow engine") Cc: stable@dpdk.org Signed-off-by: Xiaoyu Min --- drivers/net/mlx5/mlx5_flow.c | 5 ++--- drivers/net/mlx5/mlx5_flow_dv.c | 3 --- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 3b7c94d92f..21032a29a3 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -2920,9 +2920,8 @@ mlx5_flow_validate_item_mpls(struct rte_eth_dev *dev __rte_unused, "MPLS not supported or" " disabled in firmware" " configuration."); - /* MPLS over IP, UDP, GRE is allowed */ - if (!(prev_layer & (MLX5_FLOW_LAYER_OUTER_L3 | - MLX5_FLOW_LAYER_OUTER_L4_UDP | + /* MPLS over UDP, GRE is allowed */ + if (!(prev_layer & (MLX5_FLOW_LAYER_OUTER_L4_UDP | MLX5_FLOW_LAYER_GRE | MLX5_FLOW_LAYER_GRE_KEY))) return rte_flow_error_set(error, EINVAL, diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index a04a3c2bb8..86ba9ffde3 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -9032,9 +9032,6 @@ flow_dv_translate_item_mpls(void *matcher, void *key, RTE_ETHER_TYPE_MPLS); break; default: - MLX5_SET(fte_match_set_lyr_2_4, headers_m, ip_protocol, 0xff); - MLX5_SET(fte_match_set_lyr_2_4, headers_v, ip_protocol, - IPPROTO_MPLS); break; } if (!in_mpls_v) From patchwork Fri Jul 2 08:34:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jack Min X-Patchwork-Id: 95181 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 09540A0A0C; Fri, 2 Jul 2021 10:35:33 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E940A4135D; Fri, 2 Jul 2021 10:35:32 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2071.outbound.protection.outlook.com [40.107.223.71]) by mails.dpdk.org (Postfix) with ESMTP id 9BD1B41354; Fri, 2 Jul 2021 10:35:31 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BkmJD8erVEj51+hhXkcACHykmCrSJ5YfiF4VFeVtce0WWnXFBjVmLCiPIVnLlAL2NahF+LLw3XsvextpeDoTNry+C5MV8ljB4jnTWVrTI53EfrqjgchhHwiTpbpRMsQASrcdV4HDwT7HcU0pbJS6T2oLweP9yZmxjWsmCMkZ/EqUPZCDAoULHX6cjh+IRTJKr0UW7Go2Bi86KR6lvigYTtcMqBNBfd/BEIdaIWvgS3DNi2v+O+RlGEXk2cau3qyMCVAWUbPaoL9pABNbtzN8nDzOmkx1Z/pntojCvKWeei6Im2iRaT6eNbu7yKoRKiNUn7R5fVsf4+XIrh49zJBT0w== 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-SenderADCheck; bh=7V8q2flM/l+lVf90T0m3493v3gZgA6NzrJBfcsyxXJA=; b=izmiUFASDNODAT1iB2yNFzexEA1lUAfh2bIbWY9Gx6V93XQZ3SJOaGglEJASbnQQ/9k7bb8PFowzvwSab5yCDbkfV74CBLqwqwSk82CHizQvWZvFeftEumK3sND/9EYl/0UlSZAd+UIHJQSE/gWy7ED7pXRK1g3MS9+OJgbHIJAeIxGPZfwMm9lsKQOo0ugm5JSKLXxDCOgaG9ZvoDEzREhoaMwDgjz2Gh0s9frlhFuXfLqUqSJMFQEjNTRKlzuGC3dm3CXSm4oFOQXJZ5yNJXIv3lxNBJQS1o1xGAUclWJLdt7+0jQtwGxOYNugfb816FlAIEKIszMscxOjNBKRjA== 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=none sp=none 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=7V8q2flM/l+lVf90T0m3493v3gZgA6NzrJBfcsyxXJA=; b=RPorl70WtGfisTtbGM/buSxjjI9ayCMgeGVHylPqtk4sjvPMrGXIQ5wnyGyOVDQ/oPp6fCbyzSQX/Km6K6VOMCb+4nzvpgLv8IIoLewmnf8cPmU3BGQhumI91jRrdZWGksb6ngyZ5hcp/zA8N3O4d6wUV8RLTuLEWXcFU1uKmsu+bgKRsGZIjuHa2P1AwJiv5Ole1K2unS7TOt9cXrVhka/GJtmauhI1ICR7ois6MQvyPWWxP9ULimvCoTn3MVqn1/W75BOd9snB43DOSlKzW75VL1W7DaGXkaGJ3SV2a7Z9CMMRKhK/n/KSjsqskfLl32AOlRQEF6SPIoZGG/69bA== Received: from MW3PR05CA0002.namprd05.prod.outlook.com (2603:10b6:303:2b::7) by MN2PR12MB4782.namprd12.prod.outlook.com (2603:10b6:208:a3::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.23; Fri, 2 Jul 2021 08:35:25 +0000 Received: from CO1NAM11FT019.eop-nam11.prod.protection.outlook.com (2603:10b6:303:2b:cafe::3e) by MW3PR05CA0002.outlook.office365.com (2603:10b6:303:2b::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4308.8 via Frontend Transport; Fri, 2 Jul 2021 08:35:24 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; 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 CO1NAM11FT019.mail.protection.outlook.com (10.13.175.57) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4287.22 via Frontend Transport; Fri, 2 Jul 2021 08:35:24 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 2 Jul 2021 08:35:11 +0000 From: Xiaoyu Min To: Matan Azrad , Shahaf Shuler , Viacheslav Ovsiienko , Nelio Laranjeiro , Yongseok Koh CC: , Date: Fri, 2 Jul 2021 16:34:47 +0800 Message-ID: <241761cd8c3ec04b8b777aedc623c2b838d5ffd0.1625213344.git.jackmin@nvidia.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] 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: a0746477-3da1-4f59-a8a1-08d93d345676 X-MS-TrafficTypeDiagnostic: MN2PR12MB4782: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4941; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wSZ8iRHHq50hTwAs+XqsQaLLrVya+EZi8I/krK6I3jcw12issIXIhH38raW0K1c7f4EhTxLkXdoV8qW047t0flZy3eS8iMQMqixMuO1KWZgsDjy2dMySsAozpvJ+/CYnZ9r3zLU+Ffa1QpAqSshPJ8z1DdlKZ8O0AqABVvopESe2GhSMnSYVmQlnF611LgLrOw2Wienx66ilJjs/cjJG20kjWn23uDAznYR4l09NIgPxWISOj7Pw/syukkFGXKYvv+S1r2wmlA+Iz51WaFunRTHzbA2aNUT4A5qMbpAoDoHlGVkjpntsQOPnn48LczNhopGJbVbZSFpiTOOYphA1DA86attsXD2wa/Cf1O01mMb5zmTOewzhiNZtHPLjnPMQg2kTbWi/JCEPEaq64nnoyzhvsO+FP73W/bunLpc/6whZCby89m9wQS/ihrzYwMb5RTMrifRS3p2Ap94v69ESJCouIuj2KuFld/W/0nhyo+PjMlUDuVqmqXzt65ObgQ0WFw9uY7BhyiMG9dJRzM35LVWz9gqVdKsq3tij+prrbag5q2QJJAwN9//UK/xuKmP5YTjxwUL07qkLgYmxUOX++NOUQgV5wy3d8ZDNGIluN2BXkXGtvgEquHFTAByidbINl2k4eCLPte7DPbpNqfiQqqX8B6Wp/rXREIA0LGP81TXdgOKo3kCdlvWP9hRkzvR7WDd4/5FefPcc0GZriXElVQ== 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)(376002)(346002)(39860400002)(136003)(396003)(46966006)(36840700001)(478600001)(5660300002)(336012)(4326008)(83380400001)(26005)(8676002)(82740400003)(2616005)(86362001)(8936002)(7636003)(16526019)(316002)(186003)(36756003)(47076005)(70586007)(70206006)(6286002)(110136005)(6666004)(54906003)(36860700001)(2906002)(55016002)(82310400003)(7696005)(426003)(36906005)(356005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jul 2021 08:35:24.6737 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a0746477-3da1-4f59-a8a1-08d93d345676 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: CO1NAM11FT019.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4782 Subject: [dpdk-dev] [PATCH 2/3] net/mlx5: fix MPLS RSS expansion 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 Sender: "dev" MPLSoUDP and MPLSoGRE are supported by PMD from rte flow point of view. RSS expansion doesn't support above but, instead, supports normal MPLS over L2, which actually will be rejected by PMD. This patch removes RSS expansion support of the MPLS over L2 and adds support of MPLSoUDP and MPLSoGRE. In addition to above, support for eth over MPLS expansion is added too. Fixes: a4a5cd21d20a ("net/mlx5: add flow MPLS item") Cc: stable@dpdk.org Signed-off-by: Xiaoyu Min --- drivers/net/mlx5/mlx5_flow.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 21032a29a3..a13b89e3a7 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -131,6 +131,7 @@ mlx5_flow_is_rss_expandable_item(const struct rte_flow_item *item) case RTE_FLOW_ITEM_TYPE_NVGRE: case RTE_FLOW_ITEM_TYPE_GRE: case RTE_FLOW_ITEM_TYPE_GENEVE: + case RTE_FLOW_ITEM_TYPE_MPLS: return true; default: break; @@ -474,8 +475,7 @@ static const struct mlx5_flow_expand_node mlx5_support_expansion[] = { }, [MLX5_EXPANSION_OUTER_ETH] = { .next = MLX5_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_OUTER_IPV4, - MLX5_EXPANSION_OUTER_IPV6, - MLX5_EXPANSION_MPLS), + MLX5_EXPANSION_OUTER_IPV6), .type = RTE_FLOW_ITEM_TYPE_ETH, .rss_types = 0, }, @@ -503,7 +503,8 @@ static const struct mlx5_flow_expand_node mlx5_support_expansion[] = { }, [MLX5_EXPANSION_OUTER_IPV4_UDP] = { .next = MLX5_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_VXLAN, - MLX5_EXPANSION_VXLAN_GPE), + MLX5_EXPANSION_VXLAN_GPE, + MLX5_EXPANSION_MPLS), .type = RTE_FLOW_ITEM_TYPE_UDP, .rss_types = ETH_RSS_NONFRAG_IPV4_UDP, }, @@ -525,7 +526,8 @@ static const struct mlx5_flow_expand_node mlx5_support_expansion[] = { }, [MLX5_EXPANSION_OUTER_IPV6_UDP] = { .next = MLX5_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_VXLAN, - MLX5_EXPANSION_VXLAN_GPE), + MLX5_EXPANSION_VXLAN_GPE, + MLX5_EXPANSION_MPLS), .type = RTE_FLOW_ITEM_TYPE_UDP, .rss_types = ETH_RSS_NONFRAG_IPV6_UDP, }, @@ -548,12 +550,14 @@ static const struct mlx5_flow_expand_node mlx5_support_expansion[] = { [MLX5_EXPANSION_GRE] = { .next = MLX5_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_IPV4, MLX5_EXPANSION_IPV6, - MLX5_EXPANSION_GRE_KEY), + MLX5_EXPANSION_GRE_KEY, + MLX5_EXPANSION_MPLS), .type = RTE_FLOW_ITEM_TYPE_GRE, }, [MLX5_EXPANSION_GRE_KEY] = { .next = MLX5_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_IPV4, - MLX5_EXPANSION_IPV6), + MLX5_EXPANSION_IPV6, + MLX5_EXPANSION_MPLS), .type = RTE_FLOW_ITEM_TYPE_GRE_KEY, .optional = 1, }, @@ -563,7 +567,8 @@ static const struct mlx5_flow_expand_node mlx5_support_expansion[] = { }, [MLX5_EXPANSION_MPLS] = { .next = MLX5_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_IPV4, - MLX5_EXPANSION_IPV6), + MLX5_EXPANSION_IPV6, + MLX5_EXPANSION_ETH), .type = RTE_FLOW_ITEM_TYPE_MPLS, }, [MLX5_EXPANSION_ETH] = { From patchwork Fri Jul 2 08:34:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jack Min X-Patchwork-Id: 95182 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 7F6CFA0A0C; Fri, 2 Jul 2021 10:35:42 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6D0024134F; Fri, 2 Jul 2021 10:35:42 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2049.outbound.protection.outlook.com [40.107.223.49]) by mails.dpdk.org (Postfix) with ESMTP id AC1444003E for ; Fri, 2 Jul 2021 10:35:40 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PTu0UB6d9j+s0mZEdtcVp7vfYT47oNX9pcdC4Kph/fn9x+LXa6W94aWKNI07XP6NaTNZZ9qcSw5xgcyRm2ob3+5J3/QO3WcogZYonhCUJUCXYrjTemvh3YKK4hDT2Ih42V60PX4OBuIvnsIBWfCyt+A4lNl+yCOuOskIZLIQq+AOSqjdQZRmUIXCwgH3geth5k79+/ld1A2TfomSoQ9L7M3O/xolYltWcG8Aw86LAuwlO8tbQBAZBl17Y/doPob8rejOy72E5PXFKnhCVGRmKZ8igNbhvCpeR7KGZpkC9sT6pGeoRODfXfJJmb+jUg7UVxEFo1l9o0TdncFZW3Qa7g== 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-SenderADCheck; bh=aOzLmk75uCVR7QoA6feRUZtaXcVgTkpjIVHELgjgZ+U=; b=Eo9zHSKxLwZrbb58NnF9HfN8C5cRO3km4884WSVaa666rc8O5ECv1y2pHuOlbEAL+k5WUMdMgJugTDlPNax7cyDUvthN3wHc6vWI3StACAfMKic38axGVubtAmBMFKtDscDzBDndT3WGPwwyvMTT78rou1hQAUNIsjA1AK1Pnw+5o1bJZpECNp8wHIjD8hbrBSaHUkt0unQhn2FKKwaDE8QzaUHIQu9NMTGlwkrioM48EhWui6OkRdgZ6Ngi1ZmlA6pTRaletGswyzfwapk6rOfUFpeep+jftossveHRA1rtinqKw5WgXGnjOOAtlb3dAnLZdnPoJgTJfYH2xhGQfw== 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=none sp=none 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=aOzLmk75uCVR7QoA6feRUZtaXcVgTkpjIVHELgjgZ+U=; b=tj6oF9qRxMXeAZ6gTOX9JfuYn2LXc9DZjtMELHDgM94UsvpJaSULC01YTTs3OGrlgKhNx1+8VzVUEZImX1RRb+9Idq7s32qI1RRbpxJ3FC5hPJNBatQjCU2j+SFSTHFWX1vWnHt6mhmXiFaOJps+HIg0TTlIcMqRwCNniuf57tLifRAlkEZRF9THBDvA68LeT10+noQXm/rbezjP94dreAsKRmQzbXxHbjcj6fLSYr3xBd1E2W3IlW+0cK7LTGAKuND8YL3Puqh/uSa7OyFaSGec7L070+C1nH1+EyvPm3+DAO2p4b3jOe84ASvzOBcaQYRBOpI0ZX+96nYWgw00QA== Received: from MWHPR20CA0018.namprd20.prod.outlook.com (2603:10b6:300:13d::28) by SA0PR12MB4349.namprd12.prod.outlook.com (2603:10b6:806:98::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.19; Fri, 2 Jul 2021 08:35:39 +0000 Received: from CO1NAM11FT044.eop-nam11.prod.protection.outlook.com (2603:10b6:300:13d:cafe::23) by MWHPR20CA0018.outlook.office365.com (2603:10b6:300:13d::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.22 via Frontend Transport; Fri, 2 Jul 2021 08:35:39 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; 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 CO1NAM11FT044.mail.protection.outlook.com (10.13.175.188) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4287.22 via Frontend Transport; Fri, 2 Jul 2021 08:35:39 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 2 Jul 2021 08:35:36 +0000 From: Xiaoyu Min To: Matan Azrad , Shahaf Shuler , Viacheslav Ovsiienko CC: Date: Fri, 2 Jul 2021 16:34:48 +0800 Message-ID: <047f5aa4a26b27f25ad9f5733106c503ccd32f87.1625213344.git.jackmin@nvidia.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] 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: b1229561-1988-489b-8089-08d93d345f01 X-MS-TrafficTypeDiagnostic: SA0PR12MB4349: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7219; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mKvRLrpkXIp5YSKhpwdIBifh/MWthYdIF4jMUmCzNAegE+pChFx6lbqP+Rz64byXbq5tW+CuV3oDBshuQtg4UK4Sji8NzNILTvuDFaluivYPe+RV8JrJlXVCsrTQav7AK7OCN+Fx4XMSw/QbhuWrEy6k0pI/hAtGi+dFPgwmhQeuQQgRPYPWZyEwNo3LL6rJeplSMsGS+KM0mIl14R3bzc8Xh+7I2L3tif3Z7t9Vz42QOXXmLcHIjQK9oDaMZdsxTOLkjMWgrUb/l4fZu6RdEbWyYjzU3EglFmrWl2wV0nCYvmzoYAIKs/gSqtgO+r8LoM2UoyAHfWxSzhAw7w4HXHqrWyl/fTBXcGf30uIMq9ClmMUnukR0IenImimeDFrfmnR6FppZHUiAKHre1E1vr2yA+XzgdtAuYFEBn4rOQD2cDIfI2m7gKJYmifpBXHpAe9xqIUtOQdkRo70OF6sQ/+YC3+vXvX085mRf1rxn2Rr7t0J8P15152aJ7slhxM+SLU0I5DBYmxCWHHfWptP2Q0mhhDztvb9r9++in0Ew3TapNZKpBHO9gDVm8VB/RFR4kf11PQeAp3gO9nDqwSq5lEaMux+P8hQLSsv/BzK+0tcyzDvB/+srlJ0JRoc0N0540UNoUfqw/ubeEcrOwK1RQTzBB274dLGQPC4mcO0WIcZLknj1i4g2WsAXF6yujcnHKi4FqNPTcWnwHyTemPOdmLwbtuC4SQHHd4Ghj9ghBe0= 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)(396003)(376002)(39860400002)(346002)(136003)(36840700001)(46966006)(110136005)(16526019)(70586007)(478600001)(356005)(186003)(82740400003)(7636003)(70206006)(6286002)(55016002)(86362001)(82310400003)(6666004)(36860700001)(7696005)(47076005)(6636002)(36756003)(26005)(336012)(5660300002)(8936002)(426003)(4326008)(8676002)(2906002)(83380400001)(2616005)(36906005)(316002)(143363002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jul 2021 08:35:39.0084 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b1229561-1988-489b-8089-08d93d345f01 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: CO1NAM11FT044.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR12MB4349 Subject: [dpdk-dev] [PATCH 3/3] net/mlx5: limit inner RSS expansion for MPLS 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 Sender: "dev" If user wants to do MPLS inner RSS and only provides pattern till MPLS without inner items [1], RSS expansion will expand flows into 13 sub-flows[2] which is too many and it impacts flow insert rate, stack usage becomes large as well. This expansion into 13 sub-flows seems not worthy of and it can be significantly reduced (i.e, 7 sub-flows [3]) by user providing at least one inner L2/L3 item [4]. [1]: pattern eth / ipv4 / udp / mpls / end actions rss type tcp udp ip end level 2 / end [2]: eth / ipv4 / udp / mpls eth / ipv4 / udp / mpls / ipv4 eth / ipv4 / udp / mpls / ipv4 / udp eth / ipv4 / udp / mpls / ipv4 / tcp eth / ipv4 / udp / mpls / ipv6 eth / ipv4 / udp / mpls / ipv6 / udp eth / ipv4 / udp / mpls / ipv6 / tcp eth / ipv4 / udp / mpls / eth / ipv4 eth / ipv4 / udp / mpls / eth / ipv4 / udp eth / ipv4 / udp / mpls / eth / ipv4 / tcp eth / ipv4 / udp / mpls / eth / ipv6 eth / ipv4 / udp / mpls / eth / ipv6 / udp eth / ipv4 / udp / mpls / eth / ipv6 / tcp [3]: eth / ipv4 / udp / mpls / eth eth / ipv4 / udp / mpls / eth / ipv4 / udp eth / ipv4 / udp / mpls / eth / ipv4 / tcp eth / ipv4 / udp / mpls / eth / ipv6 eth / ipv4 / udp / mpls / eth / ipv6 / udp eth / ipv4 / udp / mpls / eth / ipv6 / tcp [4]: pattern eth / ipv4 / udp / mpls / eth / end actions rss type tcp udp ip level 2 / end Signed-off-by: Xiaoyu Min --- drivers/net/mlx5/mlx5_flow.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index a13b89e3a7..673e7d55fc 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -1671,6 +1671,13 @@ mlx5_flow_validate_action_rss(const struct rte_flow_action *action, RTE_FLOW_ERROR_TYPE_ACTION_CONF, NULL, "RSS on eCPRI is not supported now"); } + if ((item_flags & MLX5_FLOW_LAYER_MPLS) && + !(item_flags & + (MLX5_FLOW_LAYER_INNER_L2 | MLX5_FLOW_LAYER_INNER_L3)) && + rss->level > 1) + return rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_ITEM, NULL, + "MPLS inner RSS needs to specify inner L2/L3 items after MPLS in pattern"); return 0; }