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 1C58541D8D for ; Mon, 27 Feb 2023 08:17:16 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 11B69410EE; Mon, 27 Feb 2023 08:17:16 +0100 (CET) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2056.outbound.protection.outlook.com [40.107.101.56]) by mails.dpdk.org (Postfix) with ESMTP id 93C2140ED6 for ; Mon, 27 Feb 2023 08:17:12 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BZRtPbvBcOZEOR+KmG6ZmM3S0QkR8SzaA7vAkuCLjAny2BusDbwmy2K7kQ0KYqia0qt6LQygwIROuagpdYE//dvd2GUinAiBMYQEgG9COs49jtNOovgLnz9ECLZBQzfzuK4X7bX6jXG1gfVF/itd/dYyjC4pwAnwYtUQb0PPc836RtU0WVjsqcAKTCRmimYaEcWIoZJCqdSZiZISbRsFAkGPk/ZtJaNm3KL0RbjRztsnJQ1RO83Vn6bEkJ+Ri03NBXiYfXpv5dZ8MqTMm8MsPc6WthD9bkQPNg5ho0y7eLz0A8VEwoQAWXvoNB+lGTTXgwiqZyfniew6Y0/+9nkumw== 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=D9mBm/8IuFfVnpiHotGLTWBH5opR1GRqO+z7VJ0y+zk=; b=KFz0ydJXn3OvwEZyndeq/+p+SAc2p31ce1YPIUBM8xPBkixj4/BbzNsjgA2c0VYI/E3ymXyjA/FHRQnMs2+G93Vduyeh9u9CrR+I6eaVrNk+N0gHfVlrb0+JGJIPT90P2oavHpyV6MussVyzFRvIDGdRrXZa+D9wsP0bz31NPQORAKuBWfztVhqf3wfDXY45kxgO5KOBrfDZqngpZn3HKBTQ2KwvJM8IVgXj9SKdl14YtliNcd7+B4pNPt0Ll1hg11IqJKV3CzCOXlwTbOdGZEtw8zDDR2c10Nm00cSn6JgdDxxZx6BhtrUWnoddSSQbpgrrANks7SQVLAQBs6o+YA== 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=D9mBm/8IuFfVnpiHotGLTWBH5opR1GRqO+z7VJ0y+zk=; b=oqEY0QJqYJ2xHHsXCBsSiLow4Ao63xautX6/AoStdULjnt2GLAS0nJlAymDJXvBAIGhDEQUejX7Rr2kbLB7a1wSCpjnE8mYS/d+NKp2jgoz8guNrJFvqEfkKY60j0wW4TGKvhrVsKG3osUIqRSn/SVABcH9mkZvGxnr8Y62prjtzn4UgkG8Q7C+dxPlfESHIkdKof9FOS6CFTwnfI3dE3a2lHmpObVyReR0rPKv2+fEOD67IRSqdu8Xzlfflz7m4QX/VS4nGbgAXld91YvFvpRgfOE46JqyPJ1L0J6C/DQnAD9Cjni3H+bZO4ZI3bcRPH8bmfC9pzwxAJWqT7h5A1A== Received: from BLAPR05CA0004.namprd05.prod.outlook.com (2603:10b6:208:36e::8) by DM4PR12MB6160.namprd12.prod.outlook.com (2603:10b6:8:a7::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.27; Mon, 27 Feb 2023 07:17:10 +0000 Received: from BL02EPF00010209.namprd05.prod.outlook.com (2603:10b6:208:36e:cafe::45) by BLAPR05CA0004.outlook.office365.com (2603:10b6:208:36e::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.16 via Frontend Transport; Mon, 27 Feb 2023 07:17:10 +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 BL02EPF00010209.mail.protection.outlook.com (10.167.241.198) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.12 via Frontend Transport; Mon, 27 Feb 2023 07:17:08 +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.36; Sun, 26 Feb 2023 23:16:59 -0800 Received: from nvidia.com (10.126.231.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, 26 Feb 2023 23:16:57 -0800 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.2 Date: Mon, 27 Feb 2023 15:00:54 +0800 Message-ID: <20230227070107.15664-146-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230227070107.15664-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230227070107.15664-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.126.231.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: BL02EPF00010209:EE_|DM4PR12MB6160:EE_ X-MS-Office365-Filtering-Correlation-Id: 8c7400b1-8668-466b-31cb-08db1892a34c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cAIWBa9LnfiRanolTAAniFOGD4KqXdjp/ZfMMA2ptQxP7OhklSxVCH4/B1ov5bfVqnWd4SlSnKZBd9lBn2FmNBXI5ojoGcZia+1ZH6gJ01a/a5D3pm6YRffrtKZermG0/NUDEh1A+5Hw6WMgtfMEtO7ttLdOjQcEtSpvxpSFBoroOujURQkFrtrt9/ZMV6kmeqs0hz7+fgA4sq6qmuOinqNYvXHi/5bYKV30Cp9K2jIAOoLO4h4dqGUnMLQmqSg1tZxN7AGEhurCzwq/2qJXam5cz2RjKvss5xrymsj6D8m08VzZCw8RVRDXl1n2uq8TMSTPfEFW9v9BE8bDAWjHQMAqtyoaNDYnxwQ4AiGaiO4S1SGaQkp4HQgJlq6hBRxC4yOlscLA+2MnfUQNwD/oHtnkBg8na0/dv5k3C7cXt+fLy2epkA8llVmce5qqroR7O88V7aikMfisOUdZ3CS7lHHC/sz6YzYYSfwKHM/uwcK/GMVdBBvOBd5nNLsGAUY2tcnmUnaFw56YkYqpGDNDd3vwh9yxBsatSXu5+c2y1C6zzR5wiNiZ5FFVYmKgHszF6c/sBToH2Pnu2olVYcFsMwV5g5gtfuYkAHzZVhlirDEJqmowGWCqgNEWb43pITOH/jO0P134Y20XiC1PfUDezzdzpTJ6PQ7KC37vl1OjBxZqffd0gqi6tu1Pn10/6zotMxbx8s08di2ISpBflDrNBAdsJvZH+/Dn0se/U8G4/qXKk0TKJNlv55OpjiGKhIoKrBHMPQ/0oS2qKDDlP38tmoCQRJjZ2HR9CDJk8Z/xc74= 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:(13230025)(4636009)(376002)(396003)(39860400002)(346002)(136003)(451199018)(36840700001)(40470700004)(46966006)(53546011)(36860700001)(6286002)(186003)(26005)(16526019)(70206006)(70586007)(4326008)(6916009)(8676002)(478600001)(356005)(40460700003)(7696005)(54906003)(86362001)(966005)(55016003)(19627235002)(316002)(40480700001)(8936002)(1076003)(5660300002)(36756003)(41300700001)(82740400003)(6666004)(7636003)(336012)(82310400005)(2906002)(47076005)(66574015)(426003)(83380400001)(2616005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2023 07:17:08.4997 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8c7400b1-8668-466b-31cb-08db1892a34c 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: BL02EPF00010209.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB6160 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 03/01/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=7ae80e1379d0f924a6fe7ef3ba7ee3737a62c278 Thanks. Xueming Li --- >From 7ae80e1379d0f924a6fe7ef3ba7ee3737a62c278 Mon Sep 17 00:00:00 2001 From: Chaoyong He Date: Wed, 8 Feb 2023 17:23:50 +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 861949032d0f22a6a08bfa101d1beebd9eeb10f9 ] The helper function which send the tunnel configuration to firmware requires the vni with CPU endian. The original VXLAN encap logic wrongly invoke it with the big-endian value. Fixes: 724662b4ce5b ("net/nfp: support IPv4 VXLAN encap flow action") Fixes: c3b7254093c2 ("net/nfp: support IPv6 VXLAN encap flow action") Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/nfp_flow.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c index 8784e01628..30e1edacb2 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -2675,6 +2675,7 @@ nfp_flow_action_vxlan_encap_v4(struct nfp_app_fw_flower *app_fw_flower, struct nfp_fl_rule_metadata *nfp_flow_meta, struct nfp_fl_tun *tun) { + uint64_t tun_id; struct nfp_fl_act_pre_tun *pre_tun; struct nfp_fl_act_set_tun *set_tun; const struct rte_flow_item_eth *eth; @@ -2693,7 +2694,8 @@ 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); - nfp_flow_set_tun_process(set_tun, NFP_FL_TUN_VXLAN, vxlan->hdr.vx_vni, + tun_id = rte_be_to_cpu_32(vxlan->hdr.vx_vni); + 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; @@ -2710,6 +2712,7 @@ nfp_flow_action_vxlan_encap_v6(struct nfp_app_fw_flower *app_fw_flower, struct nfp_fl_rule_metadata *nfp_flow_meta, struct nfp_fl_tun *tun) { + uint64_t tun_id; struct nfp_fl_act_pre_tun *pre_tun; struct nfp_fl_act_set_tun *set_tun; const struct rte_flow_item_eth *eth; @@ -2728,7 +2731,8 @@ 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); - nfp_flow_set_tun_process(set_tun, NFP_FL_TUN_VXLAN, vxlan->hdr.vx_vni, + tun_id = rte_be_to_cpu_32(vxlan->hdr.vx_vni); + nfp_flow_set_tun_process(set_tun, NFP_FL_TUN_VXLAN, tun_id, ipv6->hdr.hop_limits, (ipv6->hdr.vtc_flow >> RTE_IPV6_HDR_TC_SHIFT) & 0xff); set_tun->tun_flags = vxlan->hdr.vx_flags; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-27 14:08:45.555152000 +0800 +++ 0147-net-nfp-fix-VNI-of-VXLAN-encap-action.patch 2023-02-27 14:08:40.949237000 +0800 @@ -1 +1 @@ -From 861949032d0f22a6a08bfa101d1beebd9eeb10f9 Mon Sep 17 00:00:00 2001 +From 7ae80e1379d0f924a6fe7ef3ba7ee3737a62c278 Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit 861949032d0f22a6a08bfa101d1beebd9eeb10f9 ] @@ -16 +18,0 @@ -Cc: stable@dpdk.org @@ -25 +27 @@ -index bd3a8d2a3b..4d4d21d997 100644 +index 8784e01628..30e1edacb2 100644 @@ -28 +30 @@ -@@ -2686,6 +2686,7 @@ nfp_flow_action_vxlan_encap_v4(struct nfp_app_fw_flower *app_fw_flower, +@@ -2675,6 +2675,7 @@ nfp_flow_action_vxlan_encap_v4(struct nfp_app_fw_flower *app_fw_flower, @@ -36 +38 @@ -@@ -2704,7 +2705,8 @@ nfp_flow_action_vxlan_encap_v4(struct nfp_app_fw_flower *app_fw_flower, +@@ -2693,7 +2694,8 @@ nfp_flow_action_vxlan_encap_v4(struct nfp_app_fw_flower *app_fw_flower, @@ -46 +48 @@ -@@ -2721,6 +2723,7 @@ nfp_flow_action_vxlan_encap_v6(struct nfp_app_fw_flower *app_fw_flower, +@@ -2710,6 +2712,7 @@ nfp_flow_action_vxlan_encap_v6(struct nfp_app_fw_flower *app_fw_flower, @@ -54 +56 @@ -@@ -2739,7 +2742,8 @@ nfp_flow_action_vxlan_encap_v6(struct nfp_app_fw_flower *app_fw_flower, +@@ -2728,7 +2731,8 @@ nfp_flow_action_vxlan_encap_v6(struct nfp_app_fw_flower *app_fw_flower,