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 ADB5342C9D; Tue, 13 Jun 2023 05:16:06 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 51CCF40ED6; Tue, 13 Jun 2023 05:16:06 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2106.outbound.protection.outlook.com [40.107.223.106]) by mails.dpdk.org (Postfix) with ESMTP id 762EE40C35; Tue, 13 Jun 2023 05:16:05 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=R1gARfuKREP1oQyic82Qs6QUxhCn6hKpO727KhGvEJ55DGxpyJsLcQtDKqorZA4S57EhTc035GmumUkcyEnUjsSBDBSiXgezYEbROcyopkj9i1cT7je1WFm8luJroIUUj1xVVRHwHLWVtf//8vpA+zv2JN8sAYGqPb4yrth8eHn97gXzMDeIq36MyYN7njOVejUC+YeyvKX/ZjNJDQUgQsRBXPSvHPg61RTIMhAqGYWdSDkVuFw+Cq2P/PfQFkHsbfALudYeZWs5J1mlm2I3IrwRLZgHflWx7xz70Dgh7ks1dF8N29Xv+AJJu7uu9pOOFNHs0oX4Z816l8QH8heE8Q== 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=VPcLRQmEvMN30u//uxvwY7QGxGvX+yGGeJrTgfVGqGs=; b=YS5E9/a4kWjSbTIv3SifGQSaVjQyOEeD5VRIvBTI4MTI4jJk3/lqcGx8kzN5VOi6H3W1GjZJLiaYeHpqV7ZN6zg+qsUXW7/ZyACeJL0jUuaasfHMnW7F/m6E0lJeiljcXbqXrvnOD+Icom9NpjYTe5UHE12/FC0iVuIXcr9kX9Pj/nUZqOSxK8W9BCx2RPvvtPz+kXVuQdZu8oA6EMcIab4PlUjQCIgklrGBrMClHm/jAXDhHETGBc8OCFDwx8ptXYsVFSMcHizZO1DXfrjBZeOkpdxcyvDwSR7fifpZvwrlcxJfuW4VPP2H9agk8HLTLzlEZwd0m8opK42bmhPJWg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=VPcLRQmEvMN30u//uxvwY7QGxGvX+yGGeJrTgfVGqGs=; b=YFx+x2f37kRcHyh/W1P1zFf4zU8ASwQNz1Y/itxKCw0HbBhv/s29d10EGyefI6kVI3EY8qqMhdnJrGHwTZWAIiFGYE95tKPHMThsZQCKrY+5xsjvvR8j6jEH8n6gHRSypewV7RIWyae9xGFGjfij6Wfg7ZIf0EZWw0dbbfFtb5k= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by PH0PR13MB5745.namprd13.prod.outlook.com (2603:10b6:510:120::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6455.31; Tue, 13 Jun 2023 03:16:02 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::d2cb:a650:e1ce:2174]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::d2cb:a650:e1ce:2174%3]) with mapi id 15.20.6455.045; Tue, 13 Jun 2023 03:16:01 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He , stable@dpdk.org Subject: [PATCH] net/nfp: fix VNI of VXLAN encap action Date: Tue, 13 Jun 2023 11:15:39 +0800 Message-Id: <20230613031539.30952-1-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: SG3P274CA0007.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:be::19) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|PH0PR13MB5745:EE_ X-MS-Office365-Filtering-Correlation-Id: 28696872-1181-481d-e4b6-08db6bbc83f9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1outnyQoFJb/EkPhWx+PMnpWWvZ0FbG/92oek+zssT+jm4GZ+eEGs9ClWRlUZTpuUmv/yzp5E/2Vb5fezRrDk7oCubxB2+alRKgAB2m7axLFExQe71JyF2hhxiEl69hu1hJhtDbGZ984rsGV8iVNIDx8YzxZmGmIXVtwVNWc34fveo4WWUSjt1RRWN0c3BFbBX71pjw04TxaH+LVoJpE7jLN6HN6XRkPjQ1ju1Gtm4RF8+zUycGo3wYJ+vI6ODM/jd/mJQOywxO9vEi/gpEFbBsD/2I5/bVr1c61ja2cTZVm59FYmPMIIxFurOKQ96wCaAeTMtTtZk5frD/U8FofaN2XRiD15mBsdr2vKufFfwdQ+SZ8HuKyX2FCONeWU4mLQoluYZhUDjddiF3rOy9TqARocghBXr0MMhrOShhAsPWM4AAVVenuvCW+QrFrMVUhixICNtzhU72xk5fwnZok33IurdEAma+xYII4EMXybovQCdkJo5Oq+4WXnixHP+66UdIFx0PoPN2PLQDZyxr5gyA8+Z8HYMohIcdqjj6DMRAOzj1736a+RZIPW8ctK075uDagrLlnLJj7u95YG9dlfeWxZzuPlzm8uxvroOMNIqtnXRoJ72XB+2+iTIWU2UuQ X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(376002)(39840400004)(346002)(136003)(396003)(366004)(451199021)(478600001)(2616005)(6486002)(6506007)(6512007)(26005)(186003)(36756003)(6666004)(52116002)(1076003)(86362001)(2906002)(83380400001)(450100002)(6916009)(4326008)(8936002)(8676002)(66946007)(66476007)(66556008)(38100700002)(38350700002)(41300700001)(5660300002)(316002)(44832011); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?eUMyZmxNWlZXUVNJckVpc3RLRHFiMnlNYTVTZ042Y0tPRE5ubWhsRlpIVE5E?= =?utf-8?B?a0FnNUQrQ1JSR1JPVCtZZEdkaFJ6dWRZaHZHTlBiRzhMNU5rSVR2NjltT1lR?= =?utf-8?B?NHJCSUJoYVZMV0dNZjdEcHhWTDdvN2o1SVhiUFl4Q2FjcmtZMHREZjVqRjcv?= =?utf-8?B?Y2kvWTExeGp2YWxmYUI4Zyswbm1qK2Z5Q0k3VnB2RmN4ZG9WRVR2bk0vMDhY?= =?utf-8?B?RG1XREt1VW5UanpLd0VUVjR2VCtBQzViYk5DYU1LT3Q5QlZSWDRKdld5NGtC?= =?utf-8?B?eHRqeTYyTFpHZFo1MXMwZU4wMmVHSjdUYmhPMEpVYmJoUlNaZXl1cEVCQitR?= =?utf-8?B?emFSTVZUeW12NjRiaEhCcGpZSlFoYWw3TVd1ZHFKY1JGUyttS3JiTjkxd1Ar?= =?utf-8?B?eEVmUFVSWHdHZzZWV09YTXJrQnR2dWhJdWNNaXpEV2I4cFl2eUQ2Rk52Tm8v?= =?utf-8?B?YWFrVFJXemJlc25xcTRva3VKVmNZUWxuMytLSTh2T1ZhaStCZEIweU5kYVZZ?= =?utf-8?B?Z09tbGV3anhyc3B5aXViWUVscmZzNjUzRVNEcS8rK1J6NHFjeWFWNVhsQnVB?= =?utf-8?B?T0xrcDRVU25YVW5qVUF3dHc0OGQ2Myt4WFQyUjZxM1FSWVgrNUJZM0NxNmNz?= =?utf-8?B?UGRJZWdXWDRCZXlXQjZPSzBjQUNEem9rRzE2VSsyMG9kOEoxSU4vUVU2NXVF?= =?utf-8?B?blpDTDVkcDNsM2Z0ZmFCd2VPZFBKT241TTEwZFdXZ0tkeURqR0RBN3R2ZjhC?= =?utf-8?B?NCtja05mTUc4dU9sMHVqU3RQOUlENi9PSkU4Zzk3ZElDWi9UcHRkaEpPVXZm?= =?utf-8?B?QzkwdTlUd3FRYVVxRTZTUkgxZUp4Mm9YN0FVNUxNbU1KakxpaXZYeVV1Mitv?= =?utf-8?B?VnQvcHVZSUNZWUJIQ2sxRHJCS09Rdk1OUFAvamo3TFBMUkxHdjE1eldsbHl5?= =?utf-8?B?SWRwclVEcEg2TmhSZmtlam5FcWxydm1tYU5venlEWU0weGlINmZiSlN5Q1lI?= =?utf-8?B?ZHVPSHNjZzkzcnlkdmZFNUMvZXA0K2k2TXVBSEk3Mmx2M3FuY3VCZGhmdDll?= =?utf-8?B?azh4cVhjZVFsZi8rbFJLb0VCZnBvTFVGeEpUVlZ5K2tnOC80bzhDQk12SGM0?= =?utf-8?B?cTN4R2pnTFJGQXR2ODBVRHRDbW42NjBJMGVSZXNkS0I3b3ovaERKS1JzUG1h?= =?utf-8?B?UGoydDZ0cWVNV2R1bkpoaHB4Zmp3MFhzb0I0R01IeCtjbnVMMzhHbEVSWG9N?= =?utf-8?B?RzJ3WWVoOW1Cam9KMkdKU0dkQTBWQzRkWGNpRWNWSUE3OEl4TjlZYUVRRkNk?= =?utf-8?B?VHFyL1JIOGt3ejB4bjlQSzViR0d2V0lBdjBINFFqMzNJUlBOcVU4dDFEc0la?= =?utf-8?B?QXZvTXpaMlI3NW5pQ1MzTllHOE9sTDdZVjR1MXp1S1pJeG1qM0tkZFhnYmxE?= =?utf-8?B?QnBGbXhkVXJUeVVQYmFscWdDVTVDeW12V0MweFNPTTZRNnFkR0kzYjBSUllT?= =?utf-8?B?SEZCVjJxd1pIM1FUQThoN0Y4NkJLdjhVSis4VzVoQXVuOTR2OVlIZ25tRkgx?= =?utf-8?B?bThLTTRXR3lrMU42WHkwZnRVak9aaTRGVVZZTEVNclNSNGlVTjU5ek8vTTZt?= =?utf-8?B?L3FuOGF5aDF3alhaaGhlWjJibGMwcThxOGJlV2JDSmtmZnhLZGh1UytHQlI0?= =?utf-8?B?S2UrS1dhdjdKUDZJaUY1NzFoZlR4MDg0OW1PdDNUUWdpNnF3SkQrdXFNWG5y?= =?utf-8?B?N1FIV3VNcnFLWi9oRUtTdlNNZTVRc1B4dnYxQVcrcEdLNWxJWjNVNkFlY1hj?= =?utf-8?B?L09qcmMrazBQSkNOaHNTWk1hV00vZHlCSVJyalBuWHF3U2N0dzIwVEVQb2Fo?= =?utf-8?B?Y1p0ZHhIYXh1SnhnbHlDb3JyUVpzbVR4RVVGT0pNeUs2b21PUnN0Q3NabzFL?= =?utf-8?B?bE1OdU5BajhHbmRaUGwyWGJ2UHlMSXNGOUlYd3h6aTBTRXpPeER0YWllblpm?= =?utf-8?B?Nkx6TWV6L0dvVmdEa3orWEtNWkNJSzdoRVVqV1hCVFZxRmlrQm8yelc0T0Qr?= =?utf-8?B?Lzh5ZE9ITHBRcEZERDIzdGZ0T1N0SW1RZ0daRVlPeW5mK2dxVWcxWkFHdmFW?= =?utf-8?B?ZlBsa2hsVUt2S3ZPMVY5ditZTDIyekx4TXp1YUNCN3BpWHR2d2tIM1hIWkxV?= =?utf-8?B?Rnc9PQ==?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 28696872-1181-481d-e4b6-08db6bbc83f9 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jun 2023 03:16:01.7532 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: pvYFMRK3wg6ZH3x0o0YWodPnCF3zrM/XaGpFTKzIjaBdo2hGSLXbS9v4EQAVZv7+Za3z2kVm2b0d6PshnxZuY0RxaWNoNMfXQnArZUFWL3Y= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR13MB5745 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org 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") Cc: stable@dpdk.org 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 5acb7f6ff3..ac4b15c763 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -2747,7 +2747,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; @@ -2785,7 +2785,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.39.1