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 0F21DA0C3F for ; Sat, 12 Jun 2021 01:15:02 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 096DD4003F; Sat, 12 Jun 2021 01:15:02 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2057.outbound.protection.outlook.com [40.107.243.57]) by mails.dpdk.org (Postfix) with ESMTP id 5DB7240691 for ; Sat, 12 Jun 2021 01:15:00 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ih4gGBndR78BYr7I5Amfpi0CcFSZcFCbVYrQF2cPrZ4lFtUQxLvmJeJKs05A5sKHQmjvDAiUK3O8bfFkbtmis9nf9ATxxtGIG+aetqiL+OrCPmOqXKM8LYMn+09jqxD8HekFBJDVIt2YVKqFR2X8rYB63aQziHguF4e7ZI3SeamdBb0jNPZUrIPddjaeIudYPZuT+gta7TelpLM7N5JUXjKUP3Am0JMKSuw992w7Zb/dups6dNXJQFpspkX/HdsoHAOG+hfDb8SC61X0zDgUxsjqpSrdrKzpXkNPlGa6XzJPKN64RyXirei3XAVbreUNRkiUtqWEdcVMcuC9G517mQ== 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=hs3vfAEBQK12qlqgFgwWQgu5W77q9B1Pha8zZDNTVME=; b=WPYR+wtbZbSKWI34qESiLupmVFyu7SN5PtVq8dw6vRrtUCtBg5anOLshm9+G1sas5Fh5NW/l5vnuua9Q2xGR9elRp46xyxyfb4cHXePpBJiX8TXBwFkYCDfVD+mH5094YrmqmXSZ9+Q1twXxF1ul6Q0tU64lCFNRhjEMem/4d2/YNruw3Pqe7nArijEcbziM0u+uCd2/D6t3uQKbOl+txI86X2Fu4CuRtYwnjfn1Ao6Kt7xyQIpEWLLq+jh7m3zaOGD3/HDSHkbIpZd/qfw1uktMvg3M36pVe1xOSg1/kXMgTAvvKYLV/F9IzeY22djBrD0juNeBjBiU9xfRhW6pBg== 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=hs3vfAEBQK12qlqgFgwWQgu5W77q9B1Pha8zZDNTVME=; b=o7QT36a1sPeN4c2DMO1phgP7PuOUjl36rPRXerYvRDC/PwGOv1g/pWImcUc1bIR9M1K1MQmQXF/RC+2k/qAYyw+0TjvHKKpzGcNbjCIi6WLJWPQzUerRbLerxh8J0WmHlYjIq/cHbrIudyCjsLtsFQqMZQ9UFTJ2qnwmeWgrIGF9dUn2jjTME04fUS4q2rMeZY+5ccCh/t9BvCqWw/fSZezmmem82N8GYIVVtgip/UsXTNkAWWjM3bURA1EQjrhYzksc/MtUYB8tGLFBEVXk2MCi0Blz/nobfOYNZb7eMGpMYHT99qalde6ygl/Ra+0D5J8xmxrAjAehvCTBd6KT+Q== Received: from BN9PR03CA0290.namprd03.prod.outlook.com (2603:10b6:408:f5::25) by DM6PR12MB2748.namprd12.prod.outlook.com (2603:10b6:5:43::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21; Fri, 11 Jun 2021 23:14:59 +0000 Received: from BN8NAM11FT005.eop-nam11.prod.protection.outlook.com (2603:10b6:408:f5:cafe::97) by BN9PR03CA0290.outlook.office365.com (2603:10b6:408:f5::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Fri, 11 Jun 2021 23:14:59 +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 BN8NAM11FT005.mail.protection.outlook.com (10.13.176.69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4219.21 via Frontend Transport; Fri, 11 Jun 2021 23:14:58 +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; Fri, 11 Jun 2021 23:14:56 +0000 From: Xueming Li To: Jiawei Wang CC: Luca Boccassi , Xiaoyu Min , Viacheslav Ovsiienko , dpdk stable Date: Sat, 12 Jun 2021 07:03:21 +0800 Message-ID: <20210611230433.8208-107-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210611230433.8208-1-xuemingl@nvidia.com> References: <20210510160258.30982-229-xuemingl@nvidia.com> <20210611230433.8208-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bc538f99-8d3f-4914-83f8-08d92d2ebbb5 X-MS-TrafficTypeDiagnostic: DM6PR12MB2748: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yFd0nMmZi0b2S85A6Kg/GTSZsuU8VE8ObIUr/6pzNIvue6o7NiDeLoKXu49HMLaUf6tyJqk6NQuERZAprnj38N7vtXLm7U4c0PAjZP7v08n6NnYmkTrNeqRdL0BUytc4EArJE3gE80V8ktlYY/XR1ljQ4jNsvnr4BR3wdwTMg+jDqpa0Ddz3DahZorzWasxyu/5nO0qG3MEXif/zKD+JwEZySkIdvCX5GM2C0OnXACSYrXoi+XIH4bjc54/iH2Q95HdzkoUyikqVl5ervtMriiE2yAKmjvxAXY9XeDvd7zsDBeQKX1UgJZAf7tnJbasS0GdgPrvmtbp4wFBOCH7XXUoF0jFUhwHWRVfTWkX5Thhz3u+RSEMOIk7o/zx0krgUC0qnix5tthjvqxRP911NeGK5vtcnzgpj/7v3FhKrdLwYLP43AICZjpIoHM0tjUvHByX6NsRW/fLpSteePorqw6IaYIULskQ3bjDftuWEBNesIm0rIjWyPWyxGbMKxn3TWlgxsKYFx2dgux91agcXEKgApqbrmSXk97AKJWmL6jFomdo6WBaXrMJDswg+JKUQGxhE9NvnVZTjBbaVKxqZeNmT5MeqmHc3XJR0BM7dRLJpybTLeaurLvW1Oa8Z9aSz8WgvXi/GxDs8hMToe+7ZFXVFF4wVusTXM7/jMMQwe5t2LBhtjEauwDblKnyI/ip01rZpXedRG93rSX8UXARsApQK6nPyWCJ91iSPhCDv+ZIiH3DghPdpQfBub8pJFeNIaJDkVleszlq1ZZq3CtLxaJO0yL8+2VlYgp9W8GvvWjD3wMrz+Tb8TwX66toRJu57 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)(376002)(136003)(396003)(346002)(36840700001)(46966006)(36860700001)(478600001)(16526019)(6862004)(966005)(6636002)(6286002)(82310400003)(186003)(54906003)(4326008)(2616005)(2906002)(37006003)(86362001)(6666004)(70586007)(426003)(83380400001)(7696005)(8936002)(47076005)(7636003)(82740400003)(55016002)(8676002)(70206006)(53546011)(36906005)(316002)(5660300002)(356005)(336012)(36756003)(1076003)(26005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2021 23:14:58.8757 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bc538f99-8d3f-4914-83f8-08d92d2ebbb5 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: BN8NAM11FT005.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB2748 Subject: [dpdk-stable] patch 'net/mlx5: fix RSS flow item expansion for GRE key' has been queued to stable release 20.11.2 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" Hi, FYI, your patch has been queued to stable release 20.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/14/21. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/106f00833d1f9d36c1dca55c032c14bd5ca7c64b Thanks. Xueming Li --- >From 106f00833d1f9d36c1dca55c032c14bd5ca7c64b Mon Sep 17 00:00:00 2001 From: Jiawei Wang Date: Fri, 7 May 2021 12:42:12 +0300 Subject: [PATCH] net/mlx5: fix RSS flow item expansion for GRE key Cc: Luca Boccassi [ upstream commit 09546d7b01927b5e31fdb51eea1f4ccc3abac5d2 ] The support of RSS expansion for the flows with IPv6 GRE item was added to mlx5 PMD. And the GRE KEY item support in expansion was missed and the flows with GRE and GRE KEY items were expanded in the wrong way causing the flow creation failure. This patch adds the RSS expansion support for GRE KEY and mlx5 PMD performs RSS expansion correctly. Fixes: 048f0d45e342 ("net/mlx5: support RSS expansion for IPv6 GRE") Signed-off-by: Jiawei Wang Acked-by: Xiaoyu Min Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 5c2712329b..d976ca9a8d 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -99,6 +99,8 @@ struct mlx5_flow_expand_node { * RSS types bit-field associated with this node * (see ETH_RSS_* definitions). */ + uint8_t optional; + /**< optional expand field. Default 0 to expand, 1 not go deeper. */ }; /** Object returned by mlx5_flow_expand_rss(). */ @@ -212,7 +214,7 @@ mlx5_flow_expand_rss_item_complete(const struct rte_flow_item *item) return ret; } -#define MLX5_RSS_EXP_ELT_N 8 +#define MLX5_RSS_EXP_ELT_N 16 /** * Expand RSS flows into several possible flows according to the RSS hash @@ -366,7 +368,7 @@ mlx5_flow_expand_rss(struct mlx5_flow_expand_rss *buf, size_t size, } } /* Go deeper. */ - if (node->next) { + if (!node->optional && node->next) { next_node = node->next; if (stack_pos++ == MLX5_RSS_EXP_ELT_N) { rte_errno = E2BIG; @@ -405,6 +407,7 @@ enum mlx5_expansion { MLX5_EXPANSION_VXLAN, MLX5_EXPANSION_VXLAN_GPE, MLX5_EXPANSION_GRE, + MLX5_EXPANSION_GRE_KEY, MLX5_EXPANSION_MPLS, MLX5_EXPANSION_ETH, MLX5_EXPANSION_ETH_VLAN, @@ -513,9 +516,16 @@ 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_IPV6, + MLX5_EXPANSION_GRE_KEY), .type = RTE_FLOW_ITEM_TYPE_GRE, }, + [MLX5_EXPANSION_GRE_KEY] = { + .next = MLX5_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_IPV4, + MLX5_EXPANSION_IPV6), + .type = RTE_FLOW_ITEM_TYPE_GRE_KEY, + .optional = 1, + }, [MLX5_EXPANSION_MPLS] = { .next = MLX5_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_IPV4, MLX5_EXPANSION_IPV6), -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-12 06:53:59.356416000 +0800 +++ 0107-net-mlx5-fix-RSS-flow-item-expansion-for-GRE-key.patch 2021-06-12 06:53:56.470000000 +0800 @@ -1 +1 @@ -From 09546d7b01927b5e31fdb51eea1f4ccc3abac5d2 Mon Sep 17 00:00:00 2001 +From 106f00833d1f9d36c1dca55c032c14bd5ca7c64b Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 09546d7b01927b5e31fdb51eea1f4ccc3abac5d2 ] @@ -15 +17,0 @@ -Cc: stable@dpdk.org @@ -25 +27 @@ -index 2811537226..32634c9af7 100644 +index 5c2712329b..d976ca9a8d 100644