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 4D2614301E for ; Thu, 10 Aug 2023 01:50:58 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 46C9440DD8; Thu, 10 Aug 2023 01:50:58 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2085.outbound.protection.outlook.com [40.107.220.85]) by mails.dpdk.org (Postfix) with ESMTP id 1CB53406B6 for ; Thu, 10 Aug 2023 01:50:57 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XuAVXDTgb2hE3i8rUiwb5udOT53CqzZeVEew9onfe/UMtejIUuuFOwS+eR0cu8boNvCXGHcZ3rreMEfMBjfqavUela7KGKMobNrsZTS6v5DLnmobFlhuL2L6GV1rrqxQuC+o5GtcLQxeHfxUaBs6w0hHvdsQ8Zy79U3JVr3uc/wCAasJsEqOlgZvWkbO4O7/K/7hLMYSfHrIAgIxLAIvzeNUp0fKeqPDe9UKX1h3cf8Unrm4USrWjz9dEE2UOfOoy0KVGJ+j59mEdZtnhqu+MuUs8kaXkf8EQmxSVTFhxy3SSZloFlYqiXuPhjtxDVWMX0qKiA/VfaJAOI63ARqLsQ== 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=da+daJQj8HVCTDfPsnrfKWILnUZHGmtwQY0QQtrh/Yk=; b=JSNIvo+Qt1Fb+3LxQpNI5lgevavH4N+A/eTLiPWpb67DoSYZQc6aB0tmWNZuUojh7TjMBnkobtVFPFFrOLnXO8wj9csbd5HAJjTHQFGJgVA4uzd3und5sA86PFEBRXU6y+Vge+OH0eeMgc2jGBNndDLH2xRcZFPXy8o2dmIbkloenL7nOQ1LCCMpsMsNmuvoiaIvbsmo4ia5DwCTXReO8tZE9+0uN4604ZUrkPw2RHrdGbKO0h3tXm6hL3sZNHPU5V3sKKaS0Y2XWuk8xvGkoQkhG7/u7jMftmwGAr5qyWmkAQH64TANMc4sdSZHsHik7069Rbjl0DStBEfxWiUNQg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=corigine.com 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=da+daJQj8HVCTDfPsnrfKWILnUZHGmtwQY0QQtrh/Yk=; b=nvo7qFFnNg1VTyn52sOeXBvelEWfUQ6Psy+lbmuNXQtAeNzvjzzwe33yKibW7bqlJIANYtNz6F/OxquRPy5Y6gJzRIC7j/cljltys6zBlAL1D/SeaSb53u8pfIuW+eR126MDptIilj4zsW3vRx1+mP2EPUKUEibuw24pI6rqVAjkkqbExFWpFS/4L1LfzXbfZqbmRkdyfc3EeDKjOhqnDeILCxNVaYPHX1+E4QFvOVYJWHfCrmTZwFFysdI5zZ9g92+2Nb70okRQXYocYTbHddmXnE9lVXBCLItoKpaJ5GuXG6iWrT6NZh1g9wiFwyvLvdj/5i86801KfZijKHPkLg== Received: from SA1P222CA0104.NAMP222.PROD.OUTLOOK.COM (2603:10b6:806:3c5::14) by MW6PR12MB8834.namprd12.prod.outlook.com (2603:10b6:303:23c::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.28; Wed, 9 Aug 2023 23:50:55 +0000 Received: from SA2PEPF000015CB.namprd03.prod.outlook.com (2603:10b6:806:3c5:cafe::dc) by SA1P222CA0104.outlook.office365.com (2603:10b6:806:3c5::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.28 via Frontend Transport; Wed, 9 Aug 2023 23:50:54 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by SA2PEPF000015CB.mail.protection.outlook.com (10.167.241.201) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.19 via Frontend Transport; Wed, 9 Aug 2023 23:50:54 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Wed, 9 Aug 2023 16:50:46 -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; Wed, 9 Aug 2023 16:50:44 -0700 From: Xueming Li To: Chaoyong He CC: =?UTF-8?q?Niklas=20S=C3=B6derlund?= , "dpdk stable" Subject: patch 'net/nfp: fix endian conversion for tunnel decap action' has been queued to stable release 22.11.3 Date: Thu, 10 Aug 2023 07:47:35 +0800 Message-ID: <20230809234930.32424-14-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230809234930.32424-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> <20230809234930.32424-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.126.230.37] 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-TrafficTypeDiagnostic: SA2PEPF000015CB:EE_|MW6PR12MB8834:EE_ X-MS-Office365-Filtering-Correlation-Id: 885e9a3a-df94-4933-43bc-08db9933788c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jf7MM6nNlWrKCMcmqA2n54xccauvwZmWqpCbkvrbWmwvhYYeWFatihnGZdRnkOacR3050GFhp8Sf+t2cfUZPYdWahou6Xfwjmau87exg0p4h7b0BdFTIe8tpNzp8CE99/fuqxrC+xvjJTHV5QRT7WKvAHW+NHkq7n04AkkdQF12pQU16wz/30tQRNSKWrAhcPhDu30A+6nZ81Xkky7qm5rJMWkjszSJJkxsFB+GqN2n4gVeZdy92oUA0vLUWm3SwBLBhiuf1F4TOEM6rJTrEnMyCZNRNCNkxREo2NS4YZT7RmCDJkN6qC9NLJDUEsaQc3dGiAr4sdftnMs1qhDVV2E9yXa+tqdgPh7/rTvXSHQgM2KI7MZBe6tyLrztmjxbC5cP2QVyGx80GXfCkg0T+ciLO/ZnGn2hy7+8v6uhgPdspVD2/f66+LbmWo+qbLJvQOW576o3i0wykQeQzM6h/+ZoqIxKh4wKqqSSCX6LoqC93KYbEdlXgQLy09f3GzGQjmXKDISuhn9hp84OcKlcpG6dgK0+DSo8MNsf0djWsS9xQf3YEyXgkXGuG1sxLri7iLyc1WboaJj5UeQ42E3VW3Z+Z5+7P6usttZdiG+8Zr9UugHl7UJbxpw4FqIR1jqJYdgJkyVDlWrfzM/hasR6Z0n7UUr8dp6qXxCsrVAC17EKZitQ0+i+kLGQXVCw82yrmbuCCxU5h4SX2rDXKz05AqXwoYvdAXW3WGD9KkgcYvbG5QUzhkbkmhPAL6IX0SPolLudjI+LW+TcwJFlmbS70VQ== X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(396003)(346002)(376002)(39860400002)(136003)(451199021)(1800799006)(82310400008)(186006)(36840700001)(46966006)(40470700004)(7636003)(356005)(6286002)(53546011)(1076003)(86362001)(5660300002)(2906002)(40460700003)(70586007)(6916009)(16526019)(4326008)(7696005)(40480700001)(70206006)(478600001)(8676002)(54906003)(8936002)(316002)(41300700001)(55016003)(6666004)(426003)(2616005)(83380400001)(47076005)(966005)(66574015)(82740400003)(26005)(336012)(36756003)(36860700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2023 23:50:54.6490 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 885e9a3a-df94-4933-43bc-08db9933788c 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.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SA2PEPF000015CB.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW6PR12MB8834 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/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/commit/?h=22.11-staging&id=c25e954265a4724c85e3d6ca72b54b9ef2e0b60b Thanks. Xueming Li --- >From c25e954265a4724c85e3d6ca72b54b9ef2e0b60b Mon Sep 17 00:00:00 2001 From: Chaoyong He Date: Mon, 12 Jun 2023 11:18:32 +0800 Subject: [PATCH] net/nfp: fix endian conversion for tunnel decap action MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xueming Li [ upstream commit 30963f1fdfb530da7d0ecdfe2506d2a98adea545 ] Add the missing data endian convert operations, the former logic of processing the 'vlan_tpid' field will cause the tunnel decap action don't work as expect in some case. Fixes: 9082336048e8 ("net/nfp: support new solution for tunnel decap action") Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/nfp_flow.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c index 7072375e6e..6fd82639f7 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -2489,10 +2489,10 @@ nfp_flower_add_tun_neigh_v4_decap(struct nfp_app_fw_flower *app_fw_flower, if (nfp_flower_support_decap_v2(app_fw_flower)) { if (meta_tci->tci != 0) { payload.ext.vlan_tci = meta_tci->tci; - payload.ext.vlan_tpid = 0x88a8; + payload.ext.vlan_tpid = RTE_BE16(0x88a8); } else { - payload.ext.vlan_tci = 0xffff; - payload.ext.vlan_tpid = 0xffff; + payload.ext.vlan_tci = RTE_BE16(0xffff); + payload.ext.vlan_tpid = RTE_BE16(0xffff); } payload.ext.host_ctx = nfp_flow_meta->host_ctx_id; } @@ -2616,10 +2616,10 @@ nfp_flower_add_tun_neigh_v6_decap(struct nfp_app_fw_flower *app_fw_flower, if (nfp_flower_support_decap_v2(app_fw_flower)) { if (meta_tci->tci != 0) { payload.ext.vlan_tci = meta_tci->tci; - payload.ext.vlan_tpid = 0x88a8; + payload.ext.vlan_tpid = RTE_BE16(0x88a8); } else { - payload.ext.vlan_tci = 0xffff; - payload.ext.vlan_tpid = 0xffff; + payload.ext.vlan_tci = RTE_BE16(0xffff); + payload.ext.vlan_tpid = RTE_BE16(0xffff); } payload.ext.host_ctx = nfp_flow_meta->host_ctx_id; } -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-08-09 21:51:18.628780100 +0800 +++ 0013-net-nfp-fix-endian-conversion-for-tunnel-decap-actio.patch 2023-08-09 21:51:18.124352000 +0800 @@ -1 +1 @@ -From 30963f1fdfb530da7d0ecdfe2506d2a98adea545 Mon Sep 17 00:00:00 2001 +From c25e954265a4724c85e3d6ca72b54b9ef2e0b60b Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit 30963f1fdfb530da7d0ecdfe2506d2a98adea545 ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -23 +25 @@ -index 89755589ac..5acb7f6ff3 100644 +index 7072375e6e..6fd82639f7 100644 @@ -26 +28 @@ -@@ -2496,10 +2496,10 @@ nfp_flower_add_tun_neigh_v4_decap(struct nfp_app_fw_flower *app_fw_flower, +@@ -2489,10 +2489,10 @@ nfp_flower_add_tun_neigh_v4_decap(struct nfp_app_fw_flower *app_fw_flower, @@ -40 +42 @@ -@@ -2623,10 +2623,10 @@ nfp_flower_add_tun_neigh_v6_decap(struct nfp_app_fw_flower *app_fw_flower, +@@ -2616,10 +2616,10 @@ nfp_flower_add_tun_neigh_v6_decap(struct nfp_app_fw_flower *app_fw_flower,