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 6A909A0C3F for ; Sat, 12 Jun 2021 01:18:27 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 635B24003F; Sat, 12 Jun 2021 01:18:27 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2048.outbound.protection.outlook.com [40.107.236.48]) by mails.dpdk.org (Postfix) with ESMTP id 3993940691 for ; Sat, 12 Jun 2021 01:18:26 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GsPIisEJ0fzVdj11/dbWfiZk1eJRLnKgtswHwUj9OAkT5GwPEFJ2QbE2PwP9jBkGVz0Q2On1fg7kJx2t6IFRgbS6Qv/VKL+wj6Ph2Miw8oRekMJ/TPUOfZJkrUNyAiObI48u4n+9GXdUxOezlEXBZ+iDX6TrR7X1vtRrBqF04LjSC8Jk/AeGjpDe4v/EYVnIWfZUNzKzvoR6rBM3/p/49YRkQPjwZ3BNNhRdAIUDwzrxox/Lv3gR/lhjiW9fenBzLN/wPjhcrXN+9+moXVD69wPfSJO5n5kNUpF5JDxbZ6LX3TSDBUjpAg77Pw/R8NLdhm1znsIAr+ZO9U/C3Ufr1w== 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=R+yoxWAdPhm/trwu1NalCUZ4uXaoodF/74pDV+EDciw=; b=k0M7l+5EGmggnhFoFIXLXGvWzsuSII/3OFnMr9JgKHXSUZTcnV0ZlM/yL05bFQPbbz5h5Ls5007Xm/1lxVs3PgQUTbx6zMKcTgjxPkaXISitwiAqwTs9tmV5WTIl1EH9g35OaSsLy25Oqf1tOsfIzJQrGXPGYgrhnH+3YZ88HMIa93tAoB7ZS+T8Hl7rPe7zExvoKH6r1U7ZPAMy/byKFhiAZZfOIF6O6NgVdYtVTZ1S3t5VCCrZApX3THm136Yk322HVYoHBe+9sJWWe9Dw/hbISqH9mvQJI8lg18MPQlqomaAshb0xPw8cLxzMW7qphGKhJfqSB71TyjJcr5D4Kw== 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=R+yoxWAdPhm/trwu1NalCUZ4uXaoodF/74pDV+EDciw=; b=LwTkLwQvZoKYchuQs7n+UzpoYXejXvnY0jU2UoEZzteWi0DckDFFqhRcMvcvJXHXiKT5tdFeqBvJXsCG8giJKf2dKSTJL2wX/NEHEXaZmzJogimVfp42QD5Fkvwi96WeKsLYySB7IfgLeQf1JYdYAI31R1XXVU7K+K2HMZMcU72AyISXXXMGcpOQ6d01ivAqHYqna2NSPbJcNIU55vMaMgPO7eE3swawDLBv7KujoqGpMj8+gxn2iKeTv2aXhhspfq5kPwFRACa0JWL4+hDPtGlXj7fHn37cr72rcm699oifsHt4z8yStnN+NY0KivdH3T6+BanX9Jt31voIWt01UQ== Received: from BN9PR03CA0631.namprd03.prod.outlook.com (2603:10b6:408:13b::6) by DM6PR12MB3739.namprd12.prod.outlook.com (2603:10b6:5:1c4::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.23; Fri, 11 Jun 2021 23:18:24 +0000 Received: from BN8NAM11FT065.eop-nam11.prod.protection.outlook.com (2603:10b6:408:13b:cafe::f8) by BN9PR03CA0631.outlook.office365.com (2603:10b6:408:13b::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.20 via Frontend Transport; Fri, 11 Jun 2021 23:18: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 BN8NAM11FT065.mail.protection.outlook.com (10.13.177.63) 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:18: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, 11 Jun 2021 23:18:22 +0000 From: Xueming Li To: Jiawei Wang CC: Luca Boccassi , Xiaoyu Min , "Matan Azrad" , dpdk stable Date: Sat, 12 Jun 2021 07:03:57 +0800 Message-ID: <20210611230433.8208-143-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.6] 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: 70d4fd2e-f096-4163-b277-08d92d2f363f X-MS-TrafficTypeDiagnostic: DM6PR12MB3739: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: T4oKc86SikjJhJWcHf28vtsoiCQrQfrurF8NqO6MtlyJ0qhJwY9gaurCHIwcZsrLs3FnQbx79lST054X+uiDrWva7OoI8oG1EQP7ai92vnXPI7POkmJVGWdNtqQQSkzDb+JacG8wxaRHTTXZHPcxpK58pyfUsyGHmUXQqLjZYiCWADYYKtkceA0qdjqw3j9LBxMYjix5avYGawuVPKi3deJIqZsyzgu1y18UJw6ppWMg64yJP8dYHq2KoV9mQXln97DNzaLNuYtGbioo9ZsgMN+MLxhJFUXSgU9/NaUT/a61Oj9u45ITyEJthZvK2eqRcghOOt08eaVaPyBJj5vRJ1wpOvLoL5GeXTmwzGs7vQZXn/Z7ztMQz8J0sgGLwCh6C+T9MaJNcwlqkUa85sOpvCx+Ktha1ABf9uEmXkc8uW7xdaPeGG74D4l4XIi3sY8OIRNpipxrkOGjMJiAQcUv/cwxsC7KHaPuweyAJmG74jTJY2ZfPhXDZfTQx13Bu3Jd4VuW5w5HABpBE3unJPGJJh9usFlSwX4IHGwjZiE9hdcvGfHhDFrVtEGGxmZoC27BIurppQlyNzXW0R+WEzeWN61tlyZ76glxryEqGSFykQNPv4ys4J4ZsvhsxXJTI/1Oyc9m5CepZj6+B1h0T+vh2DNUsp4fCuT9PdiuUGLNQMra4WtvjOy1qr8LGYzC5Hz3etVAAnGoWHi3E4whrhdTiEiSzZJ6w/oJfsrvyZMofW0PXVYvqK6NlBa6fHd/xIamymz+zZH0jDLx/iMANsXZW3zdslXZdgDShMEq3lkVWpjq5RImJa9CwWQs+lG9PxVZ 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)(136003)(39860400002)(346002)(396003)(36840700001)(46966006)(316002)(54906003)(8936002)(53546011)(6666004)(8676002)(37006003)(83380400001)(966005)(36906005)(2616005)(55016002)(426003)(336012)(36860700001)(70586007)(36756003)(7696005)(70206006)(86362001)(478600001)(6636002)(6286002)(5660300002)(26005)(6862004)(2906002)(4326008)(82740400003)(47076005)(356005)(1076003)(82310400003)(186003)(7636003)(16526019); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2021 23:18:24.4753 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 70d4fd2e-f096-4163-b277-08d92d2f363f 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: BN8NAM11FT065.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3739 Subject: [dpdk-stable] patch 'net/mlx5: fix RSS flow item expansion for NVGRE' 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/975a9831e1723d38127af5835e7bbf5b10d27154 Thanks. Xueming Li --- >From 975a9831e1723d38127af5835e7bbf5b10d27154 Mon Sep 17 00:00:00 2001 From: Jiawei Wang Date: Wed, 12 May 2021 13:24:08 +0300 Subject: [PATCH] net/mlx5: fix RSS flow item expansion for NVGRE Cc: Luca Boccassi [ upstream commit c3e6adf037bfd89cdbe3deb383b9186c154be9e6 ] Currently RSS expansion only supports GRE and GRE KEY. This patch adds RSS expansion for NVGRE item so PMD can expand flow item correctly. Fixes: ea81c1b816f7 ("net/mlx5: fix NVGRE matching") Signed-off-by: Jiawei Wang Acked-by: Xiaoyu Min Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index cab0aee567..ee0716ffd1 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -408,6 +408,7 @@ enum mlx5_expansion { MLX5_EXPANSION_VXLAN, MLX5_EXPANSION_VXLAN_GPE, MLX5_EXPANSION_GRE, + MLX5_EXPANSION_NVGRE, MLX5_EXPANSION_GRE_KEY, MLX5_EXPANSION_MPLS, MLX5_EXPANSION_ETH, @@ -466,6 +467,7 @@ static const struct mlx5_flow_expand_node mlx5_support_expansion[] = { (MLX5_EXPANSION_OUTER_IPV4_UDP, MLX5_EXPANSION_OUTER_IPV4_TCP, MLX5_EXPANSION_GRE, + MLX5_EXPANSION_NVGRE, MLX5_EXPANSION_IPV4, MLX5_EXPANSION_IPV6), .type = RTE_FLOW_ITEM_TYPE_IPV4, @@ -488,7 +490,8 @@ static const struct mlx5_flow_expand_node mlx5_support_expansion[] = { MLX5_EXPANSION_OUTER_IPV6_TCP, MLX5_EXPANSION_IPV4, MLX5_EXPANSION_IPV6, - MLX5_EXPANSION_GRE), + MLX5_EXPANSION_GRE, + MLX5_EXPANSION_NVGRE), .type = RTE_FLOW_ITEM_TYPE_IPV6, .rss_types = ETH_RSS_IPV6 | ETH_RSS_FRAG_IPV6 | ETH_RSS_NONFRAG_IPV6_OTHER, @@ -527,6 +530,10 @@ static const struct mlx5_flow_expand_node mlx5_support_expansion[] = { .type = RTE_FLOW_ITEM_TYPE_GRE_KEY, .optional = 1, }, + [MLX5_EXPANSION_NVGRE] = { + .next = MLX5_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_ETH), + .type = RTE_FLOW_ITEM_TYPE_NVGRE, + }, [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:54:00.222660000 +0800 +++ 0143-net-mlx5-fix-RSS-flow-item-expansion-for-NVGRE.patch 2021-06-12 06:53:56.600000000 +0800 @@ -1 +1 @@ -From c3e6adf037bfd89cdbe3deb383b9186c154be9e6 Mon Sep 17 00:00:00 2001 +From 975a9831e1723d38127af5835e7bbf5b10d27154 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit c3e6adf037bfd89cdbe3deb383b9186c154be9e6 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index c322d5d479..8d4b4a8187 100644 +index cab0aee567..ee0716ffd1 100644