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 243BCA00BE for ; Mon, 16 May 2022 13:39:52 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1B51F40A79; Mon, 16 May 2022 13:39:52 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2049.outbound.protection.outlook.com [40.107.244.49]) by mails.dpdk.org (Postfix) with ESMTP id AD7F640A79 for ; Mon, 16 May 2022 13:39:50 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hbzxWNKIZ5a4h8jyjFPV1x6owJBymsscrumAE4vIDGe0jkxswM+6pdWKJBw6PzG5/gG6g7Z6jftWktM2RAzXFBKFGtHbHs0bS40dRoOneEyJxTEFDYzidpyPcvb5nlQw85eKXEpaPDbCK7U8KTbDEW99/xEbyHQLd6ib+cIRJz204t0NL8rIOlFqqWSth19JT0XaYODMh/pQaQfm3SIZj8AV8Q+M90EHcxwE1E+wcvgdxLFVMraX9hj3Vg6SxSwtk0Tqbqs4Dpza7mX/GxdfA6nGJqx/7lhguvTpcEY+lpXZ1AIvoucNnQd3quucR5oGdLOKKIA7epKI/SfuAsdYvg== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=IfeSLpre11rfVkdzK+wLcDFxLy6EWgDGeWIcVppX/ZM=; b=oHifS5p/ULUWbBE/5+6bSmFBh7Pf4QOWMAkCO45kkLtM57e7H65vEHotmDHd7Jod/1izVXgLWLqy6M8OCGL7MqM7I325bDabK/+Cb6Db8Hch/pMIy7l6eWGGcF8WR2QwiFbqT6ZURZaRT9bn7lMqRaQElY99LLOwH02t52A+HOEEt6ru5zetmcc/M0ELlF7qSeRVYgaHdTSkIMR4xI2Blr576mGyJ4IbxRou7m+Hv80QYG8Mq6TtvLer4pTJVn+Oa9L9+/iVbkRfYVfDu57I54ys5to8GzFlMW3fbBGhJfZ38DaqbRwDPtFixZTI8ZkNFcR6KTzXs50OyDnNUCQOfw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.235) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject 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=IfeSLpre11rfVkdzK+wLcDFxLy6EWgDGeWIcVppX/ZM=; b=Ja7qVSPRZaY6V2VTH8w7Cpd7ypakStoiPM15AX1fiTfwNcs5cGzR/aVa2i45+RYqyXfBxGdtNGRMu5lYoIcHXvETyAdTjRCjIRRQ/BHk4j2wvP7Z0kcNzAkmGHR7jVIkvKA9NtxDI+Ej6SdtAT3H5MMgz2NzdYfsmy5M9ab7cBdnA3B+evPwhJKOCgsMXMOYGhpSuG6l0bHSEfN82sGwBhrf5LuJrWJ0f7btAlYF4fpkCkKo8XKp5fRV9R6saSCky6UybVMccFCJ/KqTtmadpM17qid63PcYd5Ac2a/sjEjO2XfO+DzbT66PpW+Cn2ZsSpf/2CohfsWcTpKgfspgNA== Received: from MW4PR03CA0103.namprd03.prod.outlook.com (2603:10b6:303:b7::18) by LV2PR12MB5728.namprd12.prod.outlook.com (2603:10b6:408:17c::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.13; Mon, 16 May 2022 11:39:49 +0000 Received: from CO1NAM11FT048.eop-nam11.prod.protection.outlook.com (2603:10b6:303:b7:cafe::9b) by MW4PR03CA0103.outlook.office365.com (2603:10b6:303:b7::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.13 via Frontend Transport; Mon, 16 May 2022 11:39:48 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.235) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 12.22.5.235 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.235; helo=mail.nvidia.com; Received: from mail.nvidia.com (12.22.5.235) by CO1NAM11FT048.mail.protection.outlook.com (10.13.175.148) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5250.13 via Frontend Transport; Mon, 16 May 2022 11:39:46 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by DRHQMAIL107.nvidia.com (10.27.9.16) with Microsoft SMTP Server (TLS) id 15.0.1497.32; Mon, 16 May 2022 11:38:57 +0000 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.22; Mon, 16 May 2022 04:38:56 -0700 From: Gregory Etelson To: CC: , Subject: [PATCH] [19.11] Revert "net/mlx5: fix RSS expansion scheme for GRE header" Date: Mon, 16 May 2022 14:38:41 +0300 Message-ID: <20220516113841.18341-1-getelson@nvidia.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2eba5ad9-8899-4b6b-2613-08da3730c746 X-MS-TrafficTypeDiagnostic: LV2PR12MB5728:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QBUCQmMFG5EduhfwNFxANf9sbvGySIBl7uCKA4PXd0hmIRhc5PVRvB6mGG7p8cd1xcB9VcKOS1ZUcoZMcVjsDp/7zqSNjjRmOR24ZQFTZl8sPSGc0ArzpEB/ViByZ2SuPau+q/qs1ZHJ4yrdniyUHhmXKOwKz4//pF00GCbQAo6aYw+83mkqRyhTJGRAM0zaPDVJOAigRJNxHTIiXLLUYPV/xxdyMtwrFYyQyNSxIu9o2y+CNV3CUmQBKhM4FUwAJOlCt72dtg4PpjgxWLcTPbVeSY+RhPQN0ClkzcPW7ewPfNj8igu58WZqr5GB7L5Zypw6/xzkNd8/8hfGa0v25CBFCDRZG1qZJe63AchTbMzIhSe+Hp8s8NnapDY5cJwF4Fg4soNbRpdKoOMxXZeWfU6Ft7GN2h/4QixV3zhRa+RePQ14sSgFgb5yeojPESCPxQx183D9xx15pLMilubbhvt3tASz6LUTWJ4tUs0c3n8Tv1tC31C4j6Jcrn9rTPBW3/j+WkoC7O3cC4MYx2CoUuaFfsAIPSQ138TuUUAOZrIKP9mxz+FFlG64+uqKj4bSFPldgWDyGnE+sImJowGeSysDDe70ciHHdk2B5GfqBd/+MfaGxA+mLv5ZBFxrLMJqqMHO274wo+oFE2V4HcCelWYKUWkJ8ztAFHu8fqahx+HlfNRthvJ9UyiHJwpUrn283avpDwW6Oo2xX+fDW/OOOA== X-Forefront-Antispam-Report: CIP:12.22.5.235; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:InfoNoRecords; CAT:NONE; SFS:(13230001)(4636009)(40470700004)(46966006)(36840700001)(86362001)(2616005)(186003)(5660300002)(16526019)(356005)(1076003)(107886003)(7696005)(4744005)(36860700001)(508600001)(82310400005)(81166007)(6666004)(55016003)(316002)(36756003)(47076005)(83380400001)(426003)(336012)(40460700003)(4326008)(2906002)(54906003)(8676002)(6916009)(70206006)(6286002)(26005)(8936002)(70586007)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 May 2022 11:39:46.6473 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2eba5ad9-8899-4b6b-2613-08da3730c746 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[12.22.5.235]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT048.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV2PR12MB5728 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 This reverts commit 3f65b6101051deb4ad4a19a92c01044f8e52a145. The original patch was intended for updated RSS expansion implemented in the upstream brunch. cc: stable@dpdk.org Signed-off-by: Gregory Etelson --- drivers/net/mlx5/mlx5_flow.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 0d73eebcfc..29c27226be 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -180,8 +180,7 @@ static const struct rte_flow_expand_node mlx5_support_expansion[] = { .type = RTE_FLOW_ITEM_TYPE_VXLAN_GPE, }, [MLX5_EXPANSION_GRE] = { - .next = RTE_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_ETH, - MLX5_EXPANSION_IPV4, + .next = RTE_FLOW_EXPAND_RSS_NEXT(MLX5_EXPANSION_IPV4, MLX5_EXPANSION_IPV6, MLX5_EXPANSION_GRE_KEY, MLX5_EXPANSION_MPLS), -- 2.35.1