From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 78F06A034F for ; Wed, 11 Aug 2021 12:20:01 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 68BF740C35; Wed, 11 Aug 2021 12:20:01 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2087.outbound.protection.outlook.com [40.107.223.87]) by mails.dpdk.org (Postfix) with ESMTP id 17B8940040 for ; Wed, 11 Aug 2021 12:20:00 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TCCQtLkqs6qFuxJ0NAkAGgFyLxEEJHHiwTVHEPt/L7kIlmpgLx6o6EhvowvfD/frBnrR7xR6lnMQovTX9bygNfDNBMpBGmKgndlSZXbcBVxT389GHARI2Uc377UcGRzy700nQm0QNhVEkWZMsrmkoMfsdSXSVcMt+RxNsU56lJhk92Mnvobpl6BFQ5po300vLaNDzABGmYgByrJVJhn16ATkjYQcCSSGTmgLKibSrugPaBp2ZxTqS3W4JqSBhlRwhZI48kLvZacSIu6QJhMFFpR07z9vvm0NmJK44Y4GZLuiqHeJI49wMFhw2qwzou0EIvHLn3l/IT20Xj23vdl9EQ== 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=RN3hvPdOxTWktVgQbu0ohFBHy7yxVenxplCH1oMehcg=; b=TTCk5i5wID2p7S2w5r/YzkDu8dpOWutONaHtcCQZHaeXjUGWTqSbhCzhUjg41+ZWqw2qKC8wCVA30ou+2BZjCunxLzXyQgOPHCroHGI5La0dRD3kO3gEHg5+wnPJYREtqzzYOqonEKeGI1z38Ao9X9izo5dyyn6ClNroFQ2A1oKEN2SV5ZUm2v0OPXyAb5eleazY3FUrEy2QzYuegEmLYzLLlRnkQLb739LAfJZzUOylyD7XPjgPGybgaYxhrfoD18wFyHbLtttUbxcfEzCU7CpFqiK7puLl4VFRvMbkK/d/gQjtoKMCJurarWOUUfTyQEoHMef3fLo4q+UBcSS6Gw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=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=RN3hvPdOxTWktVgQbu0ohFBHy7yxVenxplCH1oMehcg=; b=lEQB2dxegkkKwtV5cgYACtk/UHKOxVnT70QtiMN+3sPSufKyMu2shKT+AToPv1tTpfvpx2KDbsBfuSUwF8yJVEcZYor4L4NOsLIzu9eDpkYm/CqK2YRikG0T1h92Tv+QtCHcjyv/QYdxUxkRcUF+pdH/ZkjXyxelOlNCNYBcLz2AKWZJIiq7rhwkZStsfYSBpMh5jn4KPHV/S1uaxEcR0isa8/zIyk7q3i335h7+ssw1yi7nprJA5qVHna44HcGJenAW0X+X1hp+sLYFr97OIQUixvxLs1j+jRAcsyQBbgPCsX/lilgTM6kQT5Ws9uxQRdFLxOHry1qRm7ADymJjeQ== Received: from DS7PR03CA0240.namprd03.prod.outlook.com (2603:10b6:5:3ba::35) by MN2PR12MB3741.namprd12.prod.outlook.com (2603:10b6:208:162::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.21; Wed, 11 Aug 2021 10:19:58 +0000 Received: from DM6NAM11FT004.eop-nam11.prod.protection.outlook.com (2603:10b6:5:3ba:cafe::35) by DS7PR03CA0240.outlook.office365.com (2603:10b6:5:3ba::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.13 via Frontend Transport; Wed, 11 Aug 2021 10:19:58 +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 DM6NAM11FT004.mail.protection.outlook.com (10.13.172.217) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4415.14 via Frontend Transport; Wed, 11 Aug 2021 10:19:58 +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; Wed, 11 Aug 2021 10:19:55 +0000 From: Lior Margalit To: CC: Lior Margalit , Matan Azrad , "Ori Kam" Date: Wed, 11 Aug 2021 13:19:41 +0300 Message-ID: <20210811101941.2001164-1-lmargalit@nvidia.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain 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: 7d716145-1a88-411f-7273-08d95cb19264 X-MS-TrafficTypeDiagnostic: MN2PR12MB3741: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2733; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +54vByKDm7S56/tUOoGcd2i3o5m6aJlx3iO+CbuODSpM6gMaZ+MVB7zGE4/4WHIcGNdnW+HmK67z+eK/tjkLs4hfHdhb75fsCjQUN7AResG2l1CCmtnRpNzcVGSeeArQT7i7O1/fnNwVHYLhIxk5MbDB5wMzwvUNNwi9zms0N3PUBY+V9+EYP5WV/fxiugLBe6FZCvLe7T2oGrkzWKTQA2FTntBHXFjLb1QBMflQCs62ppG4rfTL3GTTv7w/dnd1FGhk8aNWFxZpAsRKYVxAgaz+2IWfuJXwqNLRK5TyQYE9dZZ3MLgCF7tIsfmP/94QHMT3jazrrPN2Fl9a4nypA/ozXQlTq2vMVnBHoGIil2DKtrB2DTSpt8D7PX0Z2AV1ohuaXJq7uUuMTNj27XMe0ILzC4SCe08hdQ/S3fHtjoEys7Td1aAxOEk9XwHckjAfLlo/YnDNuOMVOuzxdZ/Lwcr6W5VcIINY6pRD7WJd5NgYkaY+qiI6IKg8Wt04DGzI2z+ip+KUcWVbU0ZwO/xcC5TDyMWNwd7gawQggQiq99G6NEjQHKd6kiSShMRrhxvayqn/2I88u1oJ7kYz76naH6y+4z/db6FsxYZSPu4Pgy03lV9MOX0Yi9k14dMcycR4XNtqr+lTQ5btdSEAXO8SjbJzF5ItD3F5KS+phvmjxxwBv6unioG45R2U0uP3Ea6WNG+vPAtX3aqSqyWaufIgAg== 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)(46966006)(36840700001)(336012)(47076005)(6666004)(426003)(8936002)(6286002)(82310400003)(1076003)(2616005)(36756003)(5660300002)(26005)(55016002)(6916009)(356005)(83380400001)(70586007)(36860700001)(70206006)(36906005)(54906003)(107886003)(16526019)(4326008)(316002)(86362001)(8676002)(7696005)(7636003)(2906002)(186003)(508600001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Aug 2021 10:19:58.3629 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7d716145-1a88-411f-7273-08d95cb19264 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: DM6NAM11FT004.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB3741 Subject: [dpdk-stable] [PATCH 19.11] net/mlx5: fix IPIP multi-tunnel validation X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" [ upstream commit fa06906a48 ] A flow rule must not include multiple tunnel layers. An attempt to create such a rule, for example: testpmd> flow create .../ vxlan / eth / ipv4 proto is 4 / end results in an unclear error. In the current implementation there is a check for multiple IPIP tunnels, but not for combination of IPIP and a different kind of tunnel, such as VXLAN. The fix is to enhance the above check to use MLX5_FLOW_LAYER_TUNNEL that consists of all the tunnel masks. The error message will be "multiple tunnel not supported". Fixes: 5e33bebdd8d3 ("net/mlx5: support IP-in-IP tunnel") Signed-off-by: Lior Margalit Acked-by: Ori Kam Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 65064ffb0..005171d09 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -1589,7 +1589,7 @@ mlx5_flow_validate_item_ipv4(const struct rte_flow_item *item, RTE_FLOW_ERROR_TYPE_ITEM, item, "IPv4 cannot follow L2/VLAN layer " "which ether type is not IPv4"); - if (item_flags & MLX5_FLOW_LAYER_IPIP) { + if (item_flags & MLX5_FLOW_LAYER_TUNNEL) { if (mask && spec) next_proto = mask->hdr.next_proto_id & spec->hdr.next_proto_id; @@ -1691,7 +1691,7 @@ mlx5_flow_validate_item_ipv6(const struct rte_flow_item *item, RTE_FLOW_ERROR_TYPE_ITEM, item, "IPv6 cannot follow L2/VLAN layer " "which ether type is not IPv6"); - if (item_flags & MLX5_FLOW_LAYER_IPV6_ENCAP) { + if (item_flags & MLX5_FLOW_LAYER_TUNNEL) { if (mask && spec) next_proto = mask->hdr.proto & spec->hdr.proto; if (next_proto == IPPROTO_IPIP || next_proto == IPPROTO_IPV6) -- 2.25.1