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 9AF49A0C4B for ; Sat, 14 Aug 2021 09:20:09 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 91E4F4013F; Sat, 14 Aug 2021 09:20:09 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2079.outbound.protection.outlook.com [40.107.92.79]) by mails.dpdk.org (Postfix) with ESMTP id 30CBE4013F for ; Sat, 14 Aug 2021 09:20:08 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Q4EcjU/MFStY1XPkvv6MyjkIvyPqBADImmFrXBaTozmf4Prv4FEPe8PspupZtghw2Kc5dZIUc2BvNvPF60/9pPKEHRhODnimVZNKCTFxuc8lBDWoKNCYJmRbI1adX7Ebgrba3gKERA4/zRlyeK9Y/GVmSzSX1iNQf1uCCwbVqXkofEBy5/Ec9LGJss/T/0eyH6jo53Yq/byK/O2qY+bMq4J2lT7PANpVHwO950hZNVtCDpkuNXkLazMArxV0fQEn4cPtHp91DywebUuVUz5AY4D/fXHCmS8cOB69qfzWCMcE+IJlPWDOUP4yzkJYPBe8DzNVDNiP/Z/vVzIpyKkmZw== 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=e51elq9IDS4QOxZ1/MeRti+Lf+uzoWaKbiFv96fETjk=; b=PSa8952QWhGOD/L+1TbayZVue3EwXQ3Il2w3gK7HCc7xA8vjSKgrb6vbS0m4npp4ugBhR7RQ2R8GJzcrL11u/ey+53Wbrd3BpqmMtMue4DckndgF9zYTeSHQxzW3WI55YhX1PcIqnOlTrVKTyA3/tLciYLpZxwbtKiOcWf4/61PVnDUlJeT25p/lBzStwopknOhu7hXf3Z8NjWV6IuNUNKgcRBOLdC8Jlddd19mrAtcroU7+6piTx/oa5vhOUhgx1GTO41ArWRzXOq71sTC90IzH124fh+X6IxxAT54Jf/Gb+NOVL1oha3P28rzwbZqAbP6f5DPaUbvWlfpv4HWwiQ== 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=e51elq9IDS4QOxZ1/MeRti+Lf+uzoWaKbiFv96fETjk=; b=ge7B+KH7IiQ9Tg8M3WB/12yp6hY0wyaVz8yzvNDyoAuT5NUPrFlYV6m3ZtNXQ4p4lDcO+qqV5nbnyYJN2PrS48/+P6vo0V0HwUGh5S+1DZ56JGslQjagDkc99Coen978/gpnekzhlV5rciGIz+etYiQvDCdr48CCHFP7z34+PcyYNHsDhMAw3Tnhm6CnQA6rJw8CBiyOZjlVCbJF0L5SyVlvy91N7+SML3ZnjC9bZj2vb9vsOcRMbA/L3X5gE9oAN8McOvpzAptjLgORdRrrN9cc0eu3cdxuehKZtzWDpgNosHQyL+tE6DVHf6zV227OzRtr/tI4mNFjHvtg8M3iTw== Received: from DM3PR12CA0114.namprd12.prod.outlook.com (2603:10b6:0:55::34) by DM5PR12MB2373.namprd12.prod.outlook.com (2603:10b6:4:b1::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.13; Sat, 14 Aug 2021 07:20:07 +0000 Received: from DM6NAM11FT021.eop-nam11.prod.protection.outlook.com (2603:10b6:0:55:cafe::5a) by DM3PR12CA0114.outlook.office365.com (2603:10b6:0:55::34) 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:07 +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 DM6NAM11FT021.mail.protection.outlook.com (10.13.173.76) 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:06 +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:20:04 +0000 From: Xiaoyu Min To: CC: , Suanming Mou , Matan Azrad Date: Sat, 14 Aug 2021 15:19:36 +0800 Message-ID: <0cf6ed28c7ac4986d48ba000d6721c1d066ca30d.1628923046.git.jackmin@nvidia.com> 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: 92f5d8ca-14c8-4e89-94a0-08d95ef3f13d X-MS-TrafficTypeDiagnostic: DM5PR12MB2373: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:800; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nZNX5e8hdQbI9MbsbreN79rhLIcI8Z33T5YHmawqisoRW0mbBzwY3aRuY6w/460l8hIqm0TKfGxw9TjM+Ox7iZNA8tw4A2TalkWNSGqe/UE1ai1sCRUiqWt687K908YyAWvPxz0w4df/xOvDTzE+OMlS1vrUXLV/8MpdE0db5JVMtO0TKyYcGpOk0Dp11W1L2HZiVXZGjvIPSaYHqhf7BumNPQW0Q/0CggeYRntklyeTJr2m4TihsS+TkjDDBBMM7NLIfk+/41uBroY/sBx5PXEtRTIU4ik6sfnqP2XcvMfWyFdL8ZOe+MQ/IDLdf0ACl1yBoa9PwK5fv/LeBO9WfCwxa6giY9YRIa5J6nrxtUxc3teWuTdRlZhE7aJ7JSewVq5exJL7ba4rN3nFmv8yuSADYlGmja+t3v+iXzh5bnCYLgnTeGS0KOqIURdUR+Bizgrb8i8UyIBSIq09NaJQsXGTZkkoyMAoVQNjQpcPoJ+kAryLhDsm7p+P6SmW12GXZEIsZWiBRVKGFLMghoLeBwJXYidreJepUxDajPj6yP/SbpeXheCTFXGcqrZzucGo4Kfp8aYnwRZhPGLU3xV4w3MSgVyXX99rCh0L0sdEoa+CyLn/8IbtFrObAH8eMj2d4tukkt6rMjuYEY3lYPVEMZrnbSxymg/a+rf/2so6h3eZYz07dulgurlmk2cylB7Z6aP+Q8SBaVpN3Wd0QZ6c1A== 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)(396003)(346002)(136003)(39860400002)(376002)(36840700001)(46966006)(6666004)(478600001)(36756003)(107886003)(426003)(4326008)(86362001)(336012)(82740400003)(2616005)(26005)(5660300002)(16526019)(70206006)(7696005)(8936002)(8676002)(55016002)(7636003)(356005)(83380400001)(186003)(316002)(6916009)(54906003)(47076005)(2906002)(6286002)(70586007)(36860700001)(82310400003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Aug 2021 07:20:06.5745 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 92f5d8ca-14c8-4e89-94a0-08d95ef3f13d 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: DM6NAM11FT021.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB2373 Subject: [dpdk-stable] [PATCH 19.11 4/4] net/mlx5: limit implicit MPLS RSS expansion over GRE 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" From: Suanming Mou [ upstream commit 6821a57a9b83075abe02031299f1430013dd4602 ] As [1] optimized the MPLS RSS expansion before, this commit limits the implicitly MPLS RSS expansion for MPLSoGRE as well. For the RSS flow matcher to GRE level only, it will not expand the MPLS match item for the sub flows due to performance consideration. The original RSS flow match item: ETH VLAN IPV6 GRE GRE_KEY END The previous RSS expansion: ETH VLAN IPV6 GRE GRE_KEY END ETH VLAN IPV6 GRE GRE_KEY IPV4 END ETH VLAN IPV6 GRE GRE_KEY MPLS IPV4 END ETH VLAN IPV6 GRE GRE_KEY MPLS ETH IPV4 END New RSS expansion: ETH VLAN IPV6 GRE GRE_KEY END ETH VLAN IPV6 GRE GRE_KEY IPV4 END [1] commit a26cc30fa046 ("net/mlx5: limit inner RSS expansion for MPLS") Signed-off-by: Suanming Mou Acked-by: Xiaoyu Min Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 494555b16..0805bdb8c 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -198,6 +198,7 @@ static const struct rte_flow_expand_node mlx5_support_expansion[] = { MLX5_EXPANSION_IPV6, MLX5_EXPANSION_ETH), .type = RTE_FLOW_ITEM_TYPE_MPLS, + .optional = 1, }, [MLX5_EXPANSION_ETH] = { .next = RTE_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_IPV4, -- 2.32.0