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 583FDA0C4B for ; Sat, 14 Aug 2021 09:20:04 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5310C4013F; Sat, 14 Aug 2021 09:20:04 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2054.outbound.protection.outlook.com [40.107.93.54]) by mails.dpdk.org (Postfix) with ESMTP id BC07E4013F for ; Sat, 14 Aug 2021 09:20:02 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TR0gl8rMmRs40m53q7ha+dLyjRf6U0KAGwho98CS6YAvtweOu5I2l1r14s+E801/fwRyEp6xrMFe9uxj7WjSPTIoHj2uhudCgRGtkETMPz7aCmor/3kMeBlR5fZgUoSWIZ2521x3DOpAeCnuhFOGxItzi/0YwTY4TWDO2Fcr+z4ztMnDbizjc2OKY8HkzM8ZElShoJki3zmeSAWBf3Ezg+ttG5wRgpLzHzl2IY2PL7T21OjfewHMpA1+xnRykWC+K17T6VB6YnFgArUfkHI48aDju2XLqVGkbWE+2GY94bELZnWCwUAWtvIUJu1hhGio6QE9Fne/diICizJfEDHSjA== 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=6i8oivFLhvDtv5qSp4Zv9j/O0t3d4ONvrI+xlM5q2gY=; b=IkKbsklbqw1+38c7B0S6+kTnZc84u2jhhsNWRSfNV2MbAh5zTI4mHZaGPHV15xnUn7tvItYR5E/pzGNsGHjtmbg1lxl59gRjfcZvmY0+xOAvFlgai+JkXnp7Mp4ZpESFQNzwB7Wr30jatKFrtT+VjqcwPxSHnIcoc4Ms9OPCG0qCPapwY+D5WpEO1xpW1x6DLrg78jV7qC61CbPgESQZdcgrTkcK+AW+hU1tHBNpJEoW9Ot/6qOX33uM7onnXyDZ+08ILo9GRz7qYzKmEW98IWuuzyziZQuAnG7hbG3OIAV6ehFZpEMZVX5Iyr2J5JPSnaVnQIbGY5bGl5Gw5X8wcw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=canonical.com 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=6i8oivFLhvDtv5qSp4Zv9j/O0t3d4ONvrI+xlM5q2gY=; b=RrdE2UupXtbS/9y8bGEnRSMnvuJxZCM+ROxUtbVtp7GqX/iSyOZSHQRXQzKiqHzs5rS99R3IGJ/735HxX3pJdodkWvDv1zJK0muZEaxmCNp/glg685MSeQJYop96Dd+qBfpidyY1T+Wiw3JDQJeTDrUU8/9XJ195SNSRrReIQcLOtC4QeQb8SD2VfHoNSnw+k7lCtMI/2GogW9inAGRpNPggxKXGhpIvXdf4xsvHr+7cVY2tP3U26tmk3y9FAzYIjwy7PFZncq4oTqKfc/0ID6KEJvDsNcwobUXBUi1Mv85iEid1ZeBqFLAEPk3lwHzkVtMzcBP8j8BBq7e8RJWc2Q== Received: from DM6PR12CA0036.namprd12.prod.outlook.com (2603:10b6:5:1c0::49) by BN9PR12MB5193.namprd12.prod.outlook.com (2603:10b6:408:11a::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.14; Sat, 14 Aug 2021 07:20:00 +0000 Received: from DM6NAM11FT015.eop-nam11.prod.protection.outlook.com (2603:10b6:5:1c0:cafe::51) by DM6PR12CA0036.outlook.office365.com (2603:10b6:5:1c0::49) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.14 via Frontend Transport; Sat, 14 Aug 2021 07:20:00 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; canonical.com; dkim=none (message not signed) header.d=none;canonical.com; 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 DM6NAM11FT015.mail.protection.outlook.com (10.13.172.133) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4415.16 via Frontend Transport; Sat, 14 Aug 2021 07:20:00 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Sat, 14 Aug 2021 07:19:58 +0000 From: Xiaoyu Min To: CC: , Matan Azrad Date: Sat, 14 Aug 2021 15:19:34 +0800 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.5] 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: f3f08801-9427-4464-7c90-08d95ef3ed93 X-MS-TrafficTypeDiagnostic: BN9PR12MB5193: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:454; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XYa3lfz7uHpdXt3OONjbr25B3PVYkhfZMv3LESoSQj/fzf1MPsPt+ifp8jst+3yI2/o50H03IHlXC6PTZ5QGNXUuvrM8tpgMh9W09gX6wMwEuHPPHMSWwOYF2APaxcaXV24zYY1pjz6KCCj5hvvfbZmyDKLH/KWHPTqqck+2O2ySufCH3tKUvFvt2ThE/fDv4uDImKaSDAyFvdQWupfZzBmerYEQD7H6ySSUGxmHQlmLbYr7odZVm7TiDFHFbo6KYXVU+Qc4fIb3TvDn931L629r6RQZ6apEdMJS66qRNPM77GKkEHm/xcpbm4oFdWEp4k5yBfgS39AOxASSZDwwbPIUAsNtuQHKsXSDN6wzke5CVCBTt/Z7Pn4wD5kDpKwHX227XUNEbdpy7/aojhgLu3/+T2namEBtif81gtnoZzGL7YkHggV/JPzyqn9ICgcFSQWXFW/PuTidWuj0nFXz6X0LH3BegzqPE0F1RSiQIauV6Xb6FOwERn9qroiFlPdphiUuKbOd+UAdy2GZIgIAfO1S/HYFEhYxYB97iE6rhgDz/YqrzczlxzZ1cJxw1kshBV3r80EDOCitpNxO8ry7gosRlb7P0e3nZOoVo+NQLuYBV/CA2d+aT0hRMlNDgRjv75t9SYloEMi91PZiplp5H1NctLZ4Y8SDObrNU3XGMemLKwloudWJRvFpCj1MEo7MHiexLvpetEOAl+dfJbRE8w== 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)(39860400002)(396003)(346002)(376002)(136003)(46966006)(36840700001)(82740400003)(356005)(16526019)(36906005)(336012)(86362001)(6666004)(47076005)(8936002)(7696005)(5660300002)(478600001)(83380400001)(6916009)(8676002)(26005)(36756003)(186003)(2906002)(36860700001)(107886003)(55016002)(70586007)(7636003)(6286002)(2616005)(70206006)(82310400003)(54906003)(316002)(426003)(4326008); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Aug 2021 07:20:00.3886 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f3f08801-9427-4464-7c90-08d95ef3ed93 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: DM6NAM11FT015.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR12MB5193 Subject: [dpdk-stable] [PATCH 19.11 2/4] net/mlx5: fix MPLS RSS expansion 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 84f4764c22a32b319cb6fa7c8935b0d7977298cc ] 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") Signed-off-by: Xiaoyu Min Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index f29438ad6..0f0c779ca 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -109,8 +109,7 @@ static const struct rte_flow_expand_node mlx5_support_expansion[] = { }, [MLX5_EXPANSION_OUTER_ETH] = { .next = RTE_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, }, @@ -137,7 +136,8 @@ static const struct rte_flow_expand_node mlx5_support_expansion[] = { }, [MLX5_EXPANSION_OUTER_IPV4_UDP] = { .next = RTE_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, }, @@ -158,7 +158,8 @@ static const struct rte_flow_expand_node mlx5_support_expansion[] = { }, [MLX5_EXPANSION_OUTER_IPV6_UDP] = { .next = RTE_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, }, @@ -181,18 +182,21 @@ static const struct rte_flow_expand_node mlx5_support_expansion[] = { [MLX5_EXPANSION_GRE] = { .next = RTE_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 = RTE_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, }, [MLX5_EXPANSION_MPLS] = { .next = RTE_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] = { -- 2.32.0