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)