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 AB930428F8 for ; Sun, 9 Apr 2023 17:31:38 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A54EA42BFE; Sun, 9 Apr 2023 17:31:38 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2065.outbound.protection.outlook.com [40.107.223.65]) by mails.dpdk.org (Postfix) with ESMTP id 2F16C41156 for ; Sun, 9 Apr 2023 17:31:37 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nonVKpuVc19+k1rUEc+6buTElsV9yr0wqELvQmd3A71BU0XRbPz4V6PspZe6ptvrpOcoXt8XkSSTO5exmnfLTkXiaUhnZzZd4rm5OEukxDOfL61O/wpjy6pa7uURUBiupT3/MSdJ8pgk5JfBslZcIJoArerP0WzUK4cLRnoMJMW3gZfP/0oeKWtzlAndrNHTyfHj2AesDVs4wDco+84X6ZvbkAqrWfrjX2bsrUrXfkrcMQlJ1WKuZo/B3mPcmniqoa19EkV/OcaTyh55PatRLuhf8AHlU233lkekqsf/pyHMTVE/88M+ZU4mtroibdxq5PfZD6WEP2lJ+J7XClIBsA== 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=SHs/iaSXpEISHyNgUyyVhZzU/0Nc5wg2F934flM+KK0=; b=VcgXjKdDFOVpAWbMLnPjnonz0rtqCWCAeFEp57j5Zxo+o1OiyLem06W3i+F9+rBquQKw7cOJIlSHj42caH5vwzY3hEuwOTwlMnCF4SB+uMA2ONvT6VSh47WjwinMkjHilc6Flu0PI5NlmcWK8qPslTZQxIThLX2kMGcP/HkCc8yVa0QZGr8eynxeSkEwV+Wz9VXSjdZCcs8CUUsxzqU/a+5il+Die64PUSEph4GS9KhJ5EyYwmvAfFDAihZv1mMpQ+hy1NODSkooKc+ftX1c+pcK2Bqi2ZqGfaaWCszL2x758TtK0OyOlZQ3HETCLeFwgWRuz3WiTisdUT8IyAbtcA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=arknetworks.am 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=SHs/iaSXpEISHyNgUyyVhZzU/0Nc5wg2F934flM+KK0=; b=DROuM7jKIaI9YZF/qgGL+Gs9F3jco0AfMa4KnMgrIPZdrtpPmgC+ZUwg5H5MYiaL3pBLaZLL3c0MoGNEglHOcPDxk1dOqVhcYCQ/sAQbVjJE4NxJjoDA2hhKElAefsuqfaTnxIKqcKiQQpdn+SdkWvUUCYtPX90RqNion/84Vnc5zsgnG11HFxLptd5zIN2VPF24MIySHSTnUuAU7yUjJwoz4xBc/Wi/6/IIxYam3xizpZPKx+pUvMcHKbS1l14CAfW5x0JevhHxznbNtMJN07HC41gX1GRVowUdhwbvNaLLIkgrdA+1GtypZ4kSNGVXYtc714RxcfGor7+j2fwy7g== Received: from BN9PR03CA0427.namprd03.prod.outlook.com (2603:10b6:408:113::12) by PH7PR12MB8595.namprd12.prod.outlook.com (2603:10b6:510:1b5::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.38; Sun, 9 Apr 2023 15:31:32 +0000 Received: from BN8NAM11FT028.eop-nam11.prod.protection.outlook.com (2603:10b6:408:113:cafe::1a) by BN9PR03CA0427.outlook.office365.com (2603:10b6:408:113::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.38 via Frontend Transport; Sun, 9 Apr 2023 15:31:32 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by BN8NAM11FT028.mail.protection.outlook.com (10.13.176.225) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.20 via Frontend Transport; Sun, 9 Apr 2023 15:31:31 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Sun, 9 Apr 2023 08:31:18 -0700 Received: from nvidia.com (10.126.230.37) 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.37; Sun, 9 Apr 2023 08:31:16 -0700 From: Xueming Li To: Ivan Malov CC: Andy Moreton , Andrew Rybchenko , dpdk stable Subject: patch 'net/sfc: fix resetting mark in tunnel offload switch rules' has been queued to stable release 22.11.2 Date: Sun, 9 Apr 2023 23:24:14 +0800 Message-ID: <20230409152529.5308-67-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230409152529.5308-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230409152529.5308-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT028:EE_|PH7PR12MB8595:EE_ X-MS-Office365-Filtering-Correlation-Id: e673dc72-ff66-4e15-231b-08db390f7ee6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Qta2aAOr2/n6RFP4WMrGF4HLzUW8PNdli6oH2ZOicU1GdDY/mpITrw/sIwivZhQFl0En2fgHu88yiV9BLvZDza82C1jjFhezmg6t0DHs/6txrYT+eca7b2hu4kFOzMx3Ik0lgOrp4nBwAYEiuV1NTVRrUNPKg4l7+gXMWFgVdwE3Qyj8etoG2vhNPZzyOhPxml32MpHZ7fPZ9RKVh2c86rVOo6DdXvRZdZK2iAhVkXlc0lVpzv2WB65Hh0EBkV5emi6hA1v5G0NgJon/yeYm0Lggci1gZ0iOmXrgxEBGe63efoao5/IMYX1TvHWoLKX4XVtAr8SRi6fX8/mvwCKmrytCdAFzglP7SQ0xZjRbxfZWgy4mmLefdFew245+ebeT4NCdzAUOV/8uXY6PkTxld1r9EyygGkg1K7rYHp0T4z/+akLIfEll159UMC/UQMs+C3tk2S4pnruNQjPG8pXE58Dv8Eh8rGUxiJW9Ma8t1joyzStWYbfkLyicnxTsYSjijJLkitl78HJd1EAbqUkvY1+lr9pus8FHlHRRNeM3iNdDnHz5uer08/Q542ohN3UFYzR7mS2ER5gAu20vEPsMkIRLuXcquUIVxE/gjh4nlfDvGzQAHcI3beTR7gCReDSpBSuR6aIcgmiMx7ZbWDjjH4S2jYZFv8SBjnqoyjEOwh0uYPB6xz9Jz4MCpKcCrZxc67nx/dXK030C4pK5+OTPSJWn/H5l80AJIOe2DH7RbvAKKC8c+BRLEF/ANhYtl3cwsA6pw/wm60MLci3kgAsbe0OKEbZYc6lNcaMv2z4ONO0boSXuNdAxGcN0+1S9qSsyZdFko5DD501RJArLzgsZig== X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(346002)(39860400002)(396003)(136003)(376002)(451199021)(40470700004)(36840700001)(46966006)(86362001)(36756003)(316002)(41300700001)(8676002)(70206006)(4326008)(966005)(6916009)(7696005)(70586007)(54906003)(478600001)(40480700001)(55016003)(82310400005)(5660300002)(8936002)(2906002)(36860700001)(82740400003)(356005)(7636003)(16526019)(6286002)(186003)(53546011)(1076003)(26005)(336012)(2616005)(426003)(47076005)(83380400001)(40460700003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Apr 2023 15:31:31.7330 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e673dc72-ff66-4e15-231b-08db390f7ee6 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT028.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB8595 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 Hi, FYI, your patch has been queued to stable release 22.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 04/11/23. 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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging/commit/993c0d08eb60e70a8e52ca5cb9b6a65a6829c819 Thanks. Xueming Li --- >From 993c0d08eb60e70a8e52ca5cb9b6a65a6829c819 Mon Sep 17 00:00:00 2001 From: Ivan Malov Date: Thu, 9 Mar 2023 08:28:42 +0400 Subject: [PATCH] net/sfc: fix resetting mark in tunnel offload switch rules Cc: Xueming Li [ upstream commit dfa00c456adb6f4214b581a5e82e601e963248d2 ] The currently used API is unfit for the purpose as it checks the order in which the action is being added. Use a dedicated API to request the reset. Fixes: 012bf708c20f ("net/sfc: support group flows in tunnel offload") Signed-off-by: Ivan Malov Reviewed-by: Andy Moreton Acked-by: Andrew Rybchenko --- drivers/net/sfc/sfc_mae.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/net/sfc/sfc_mae.c b/drivers/net/sfc/sfc_mae.c index 82d5a95ec4..29b8bb9e25 100644 --- a/drivers/net/sfc/sfc_mae.c +++ b/drivers/net/sfc/sfc_mae.c @@ -3896,12 +3896,10 @@ sfc_mae_rule_parse_actions(struct sfc_adapter *sa, break; case SFC_FT_RULE_SWITCH: /* - * Packets that go to the rule's AR have FT mark set (from the - * TUNNEL rule OR's RECIRC_ID). Remove this mark in matching - * packets. The user may have provided their own action - * MARK above, so don't check the return value here. + * Packets that go to the rule's AR have FT mark set (from + * the TUNNEL rule OR's RECIRC_ID). Reset the mark to zero. */ - (void)efx_mae_action_set_populate_mark(ctx.spec, 0); + efx_mae_action_set_populate_mark_reset(ctx.spec); ctx.ft_switch_hit_counter = &spec_mae->ft_ctx->switch_hit_counter; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-04-09 21:45:40.470520000 +0800 +++ 0066-net-sfc-fix-resetting-mark-in-tunnel-offload-switch-.patch 2023-04-09 21:45:38.669042200 +0800 @@ -1 +1 @@ -From dfa00c456adb6f4214b581a5e82e601e963248d2 Mon Sep 17 00:00:00 2001 +From 993c0d08eb60e70a8e52ca5cb9b6a65a6829c819 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit dfa00c456adb6f4214b581a5e82e601e963248d2 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index 3daeed81b9..e5e9257998 100644 +index 82d5a95ec4..29b8bb9e25 100644