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 428A64301E for ; Thu, 10 Aug 2023 01:51:30 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3C26B40DD8; Thu, 10 Aug 2023 01:51:30 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2046.outbound.protection.outlook.com [40.107.94.46]) by mails.dpdk.org (Postfix) with ESMTP id 0A985406B6 for ; Thu, 10 Aug 2023 01:51:29 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QVKNxdsr/KHJJhL1gsSBpZpASCXIJtwmlYKfWGKOUaHrmV0jKRuu3Too4PeCMD11A0LmmWp1tSMYOYa0KGjUO2Mx6oYIaRu3vtzaIxWMonfyCL38FpKc/U+mhR+mz2y4A6VMaxvDYA/a9lv39QsKAp6YOqSKlWRo5ebFzFDpXk3pD9bCcT1CkLx4LQLf5om+wv/4U36PiVvrHyXm5eyHCSoPwYNVtiQJMhRoTdq/NAongcbgJjEmVkJ0cyeTw1IK30y9Qe6a8MU/NkFP5jLF3q+BlsQrZTVahrEWHTNmMewsIrm9OzuergVO/BkvzmAS7W8UTkehFwOrNApAobDgmQ== 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=6iHJ7U8dQj0w55sKvmolBBlKJKK48FP3UJj//UnYsCY=; b=Pe6OrEuevCBiO0WyqnJWnkryGvkkJPiMozyM6Q3XVetKbRtj828wUZ9I+7Wkh5iQsjLrNZLdm6nE59CU3Y0GdfudwwT2kK5W3oiaK7fW9d/wuM/dqc4kPV1tOsjLTpJFsjAwZb/wBdK162+Qcbvzj3deAyNRYSL9euL1+/ec4EHQt/zUer1bKV8qLCGSjK6Lu0EjyPLcFylauP9s9P09Yeq9fGr2yJRlc57Jd11eY/0bCqTKNUiaPF5PEQuHIsKeVangkc14xwTPCCSdoAp2VZglwVqdCEPH1LPpDwKzadCpQTn3TsxotjRGiPZVrkPcIpxhscqLuYDW0pEuiJn8dg== 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=6iHJ7U8dQj0w55sKvmolBBlKJKK48FP3UJj//UnYsCY=; b=Yhi6r/Ae1kQPqoXvZ0oROCL/vW8mxsYHXX73EFBWtA9agf6yjcoX/gx2uH3MDkF/dNqPIoEs2glFxp7ZFyDdMmfBRmAsa43e1bqcbdDxQtDdnQh1lGj7ugJA6h5uId94GfvUGbNJqWrDl/FqwFuR9injejyEndvwbNiVPNyJKIKuSd26MK19IaOEAIaq2ZiLSz0iVH9XUaEamL/8JoDpOvq1bVeDof1X9aJDaeSxhOlQY39SQQLy98+eefLhxZc2q73vFqGQX2x0g2K9s67sMwLhIm5NtxQgwjoqSRZzSE39scIXk2PEJgdkM+2OXiFA1e/DrVPgtTQB55msFsguIQ== Received: from SA1P222CA0104.NAMP222.PROD.OUTLOOK.COM (2603:10b6:806:3c5::14) by CY5PR12MB6624.namprd12.prod.outlook.com (2603:10b6:930:40::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.30; Wed, 9 Aug 2023 23:51:27 +0000 Received: from SA2PEPF000015CB.namprd03.prod.outlook.com (2603:10b6:806:3c5:cafe::9) 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:51:26 +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:51:26 +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:51:12 -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:51:11 -0700 From: Xueming Li To: Chaoyong He CC: =?UTF-8?q?Niklas=20S=C3=B6derlund?= , "dpdk stable" Subject: patch 'net/nfp: fix VNI of VXLAN encap action' has been queued to stable release 22.11.3 Date: Thu, 10 Aug 2023 07:47:39 +0800 Message-ID: <20230809234930.32424-18-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_|CY5PR12MB6624:EE_ X-MS-Office365-Filtering-Correlation-Id: d21310a4-4196-44de-541b-08db99338bb9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: czaiKO6gpqMWC6u9gX3aWzl0WQbOgtKs7WA89pAITq7yagzHBEV7Py9AR7jnvcJGigdvLbXZUpUDaHVpq4C1OF3BDjnwQHpAWsVU7fKKvJw6Jce1Aa0SA5FulHgGKp+6FpwxU6NGE0w/IQRAFkXMkNTcw2B0tQm8rTzvnwrts5ns2sTw4tVaim6F6rMh7oAFsob11GWdH2mNS8dnYvnr+C8jfFVgCrz88bcq6qmgWBX0dvUu/Prjk/5PPUsKTLWQLgj5b6o8BcJ9IaDnROiM7I4A2ITMbPhREFN1AzMz9dNzn/GPAgs9472EXObpvHkaJTnl3EYoskGkxmVm6bvCZk1MH3UrkTsfmtmkQNeqzh4TK1J232DI8GQ7Z4sazkQxzfJYZg0lKl3uNoTbYp55F0HEHpLsOVUJE6lBpwz6ZhUS0qjdWB2tAVLrXXbnfrmXYnqlmvmKjF9036RSUiuMXdeVLZA//Gh37dbNHhZmPuLwoWlxW1ww4DjCXJoSIbBUSnxXIQqcaxDR5rl3zPzXRVfazMG/vFEXlAq1UKM/hk0T6cViiT09aoXpEjFHNlRMNVjCAA7jF0LGvY8RKKb3UfsgYfnv0IuWsaIQYuu69euji8OjLGb4H0pNNbHTjP06UEQw6waBxeZPIg7rCrkP66GLiLVqoXTWQ7MTR/IGSVIhRsqmdaCdG5d1VfsUTFRCLbV83mLyXFunlnhNxAVvxbV7jfRl1yC3ePVQApfkq0E9cnHpeFcloIYACChAPcfvwQIMOkdcMWfkomqvVK2IlA== 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)(346002)(376002)(396003)(39860400002)(136003)(451199021)(1800799006)(186006)(82310400008)(40470700004)(36840700001)(46966006)(2906002)(40460700003)(36756003)(86362001)(40480700001)(7636003)(356005)(55016003)(66574015)(53546011)(426003)(47076005)(36860700001)(83380400001)(336012)(2616005)(82740400003)(16526019)(6286002)(1076003)(26005)(54906003)(19627235002)(70586007)(70206006)(7696005)(6666004)(478600001)(5660300002)(8676002)(8936002)(4326008)(41300700001)(316002)(966005)(6916009); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2023 23:51:26.8367 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d21310a4-4196-44de-541b-08db99338bb9 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: CY5PR12MB6624 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=dc6adc599cd6e18ee2b8e33b66b57c08ec4e1087 Thanks. Xueming Li --- >From dc6adc599cd6e18ee2b8e33b66b57c08ec4e1087 Mon Sep 17 00:00:00 2001 From: Chaoyong He Date: Tue, 13 Jun 2023 11:15:39 +0800 Subject: [PATCH] net/nfp: fix VNI of VXLAN encap action MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xueming Li [ upstream commit 0b89591f539bb82f644799e2ed1eb3a49c49d5d0 ] The 'vx_vni' field of VXLAN header is contain 24 bits of VNI and 8 bits of reserved. After convert into CPU endian, the reserved 8 bits should be shifted, or the VNI value will be not correct. Fixes: 861949032d0f ("net/nfp: fix VNI of VXLAN encap action") Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/nfp_flow.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c index 6fd82639f7..6f242d13a6 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -2740,7 +2740,7 @@ nfp_flow_action_vxlan_encap_v4(struct nfp_app_fw_flower *app_fw_flower, set_tun = (struct nfp_fl_act_set_tun *)(act_data + act_pre_size); memset(set_tun, 0, act_set_size); - tun_id = rte_be_to_cpu_32(vxlan->hdr.vx_vni); + tun_id = rte_be_to_cpu_32(vxlan->hdr.vx_vni) >> 8; nfp_flow_set_tun_process(set_tun, NFP_FL_TUN_VXLAN, tun_id, ipv4->hdr.time_to_live, ipv4->hdr.type_of_service); set_tun->tun_flags = vxlan->hdr.vx_flags; @@ -2778,7 +2778,7 @@ nfp_flow_action_vxlan_encap_v6(struct nfp_app_fw_flower *app_fw_flower, set_tun = (struct nfp_fl_act_set_tun *)(act_data + act_pre_size); memset(set_tun, 0, act_set_size); - tun_id = rte_be_to_cpu_32(vxlan->hdr.vx_vni); + tun_id = rte_be_to_cpu_32(vxlan->hdr.vx_vni) >> 8; tos = rte_be_to_cpu_32(ipv6->hdr.vtc_flow) >> RTE_IPV6_HDR_TC_SHIFT; nfp_flow_set_tun_process(set_tun, NFP_FL_TUN_VXLAN, tun_id, ipv6->hdr.hop_limits, tos); -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-08-09 21:51:18.731421900 +0800 +++ 0017-net-nfp-fix-VNI-of-VXLAN-encap-action.patch 2023-08-09 21:51:18.134352000 +0800 @@ -1 +1 @@ -From 0b89591f539bb82f644799e2ed1eb3a49c49d5d0 Mon Sep 17 00:00:00 2001 +From dc6adc599cd6e18ee2b8e33b66b57c08ec4e1087 Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit 0b89591f539bb82f644799e2ed1eb3a49c49d5d0 ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -23 +25 @@ -index 5acb7f6ff3..ac4b15c763 100644 +index 6fd82639f7..6f242d13a6 100644 @@ -26 +28 @@ -@@ -2747,7 +2747,7 @@ nfp_flow_action_vxlan_encap_v4(struct nfp_app_fw_flower *app_fw_flower, +@@ -2740,7 +2740,7 @@ nfp_flow_action_vxlan_encap_v4(struct nfp_app_fw_flower *app_fw_flower, @@ -35 +37 @@ -@@ -2785,7 +2785,7 @@ nfp_flow_action_vxlan_encap_v6(struct nfp_app_fw_flower *app_fw_flower, +@@ -2778,7 +2778,7 @@ nfp_flow_action_vxlan_encap_v6(struct nfp_app_fw_flower *app_fw_flower,