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 25F4E42C57 for ; Thu, 8 Jun 2023 05:20:31 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 210D642D20; Thu, 8 Jun 2023 05:20:31 +0200 (CEST) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2129.outbound.protection.outlook.com [40.107.100.129]) by mails.dpdk.org (Postfix) with ESMTP id 354C241153; Thu, 8 Jun 2023 05:20:26 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FefR1hARUrC6e8psMxtpC2cdu2uE5YfOBSBAsaUJYZyVozfcIQkbdoNwp6djVwCdoeA7ZBtYovQtl7PJMovXdboCtezjl2PEpTYhfbqzuLtNtH5wC/OFUWa52/CPonxYhGvdZfppFJoZpmGw7+GLO5xUmCWCUQ91Q/60F1qUvIZSTYjWt8K1gvY/twkblNNHZvOVwUIH0KKKgL4cUvNXYWCthInn85e36hp+u9IXfrkYkb+L90/VHANEQZCIyy0vuKn/1pqB8+kA983hdRSU/HU3P82BtCUyOhnT3R3EhmLZ5ma+NBmbwIPQ+UdCCyJLCFE6PzvQoT8OVGb0T5bDZA== 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=VK4hxWT45xBPsSrsRTtRg82OYpPzGDpPDeSTABHWyBc=; b=XwKxX6ltc0MsbzPR3Q2981/XX2Gwu6TEVkHFWQSQopqTgxoxc45BsMeFWaNpbpQEKdsfBF7VuxSei/c1c+r2FumC/8kuYe0z5DCfiBu3T8D6JohkfuMyn2qy1obUPUUiCn9E7SZlTuAWSB7k4qGAiMpsibUblDUfiqJfZwsPIpRpcJF8Jys1VHBf0HFWZOAmcR5ojykcDEoZ+h5AW7rEvtroSLfNyN8NsQYXu4AY7EwWmrSceBRCJ9yAbOu1CtbO2BUdzEZSQ+wARGE7h7gTXY8diL0EMbF/L92lnKnuqxP2FzxjpXw1wiZbTPQW+M0ff2vRwUlpSPHwXK8dAZXYTw== 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=VK4hxWT45xBPsSrsRTtRg82OYpPzGDpPDeSTABHWyBc=; b=oYXJtkHAiHGPpg/Y8j6tZgeiWxjlQNo7u3FD3CHFhAGh9lx6UPTHYJ+1BqFjNoqQszt0Rqut9GLiuD+a68PcuZP7IAKMYTzI7q0PvX572lwQheByTXVUQtqeIpqT+E79hH4Q22tAl/gDWwkuW/yn0d+Y+pGg/aPP9dfQvFVXZM4= 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 DM6PR13MB4432.namprd13.prod.outlook.com (2603:10b6:5:1b8::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6455.32; Thu, 8 Jun 2023 03:20:25 +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.030; Thu, 8 Jun 2023 03:20:24 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He , stable@dpdk.org Subject: [PATCH 2/4] net/nfp: fix TOS of IPv6 VXLAN encap flow action Date: Thu, 8 Jun 2023 11:19:54 +0800 Message-Id: <20230608031956.814684-3-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230608031956.814684-1-chaoyong.he@corigine.com> References: <20230608031956.814684-1-chaoyong.he@corigine.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: SI2PR02CA0038.apcprd02.prod.outlook.com (2603:1096:4:196::22) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|DM6PR13MB4432:EE_ X-MS-Office365-Filtering-Correlation-Id: ea528873-f473-4ed3-d6f8-08db67cf4cb3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NFwASPfTffXxuVFwdFOC4WTbRIpzuGPIIzGGMQBLuL53oFats6DeVdZ2JkJ2Za1nOEitnIMbLI99/JZLBxwLxFv/Y5Y6miYs9RYZ9RxvTpCaqu56F0kDEhXXw2aIc0i7aiwoTY0Joz3iU8bL6ZJVVKbAaKzLJcScDv76kzNItcLqqGkXTiASJw6RW20WceNC120u/gfWZDADei/qncTkYQ6TumK+BRfgyUJzH8Wk0hGH28cjPeX3F1c4Z9oSimUQKEaYLhua1nw9isEvsTZGY+Wp7GBSOxtK9LHyAS+Cb8CH2iaaZ2vJZU2uwo3AhHJE733pRFm1DAOa9ts872IQhzPXdtMccWWeGveaE7oXiCFwD3kn71bRlLiTIjGPdpEm3L2+YxV7hEdYqOPIgE80F8UTNwpKafhPE9wvruAklFUXzH+1H4aYj7wwQFuOqK0BH7+femja+OboPVmwJQD/hB0jVBZIJMbAW70Gyox1REKHBgFMj13OMz7arxwIWNJa4mIULDFriKxKRpxiUuBnOIEFMWWBbkdg3RZ7G5Nj/bilglw6X2BweOMndbUNV8BhVvWs0BFiPeHELvg/uSMySHYDh+oA2ACEy5dW+H4+tuIu8EgM8OOthzptalgJ7DRu 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)(39840400004)(366004)(136003)(346002)(376002)(396003)(451199021)(478600001)(2906002)(2616005)(83380400001)(6506007)(1076003)(26005)(186003)(6512007)(86362001)(38100700002)(38350700002)(52116002)(6486002)(36756003)(6666004)(5660300002)(450100002)(8936002)(8676002)(41300700001)(66476007)(6916009)(4326008)(66946007)(66556008)(316002)(44832011); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?SWg4OVo4NW16anRKZmRMSGNNek5GejJmOVNiRnpnSjlNN3dRKzlzNzJYNjhK?= =?utf-8?B?UW90ZEVsRjNKOHFCRDNwcHdab0ZtTzFEMlBsMzRocFBwWEMxMlBqSk51Y2RG?= =?utf-8?B?KzlCR1lxUDdLZEhLd2pzUDhPVE5XMVlJWWpRN3Ywcnp0T0hoT3ZlRUhCSnVw?= =?utf-8?B?YzIwaDFnU053eklUbkJZcmlxSlRHalg3ckFMMnZMNy9MbHRJbE0wTk1sUXBE?= =?utf-8?B?bFRqMFJIMUxEcnFHUE81QVBaTnl5TzhLQ05LSE5wVS9kZnBHc241RjV6R2t1?= =?utf-8?B?Y1c5djlkMzVXUDlwalpnQ2JyMEE1aWIvM0Iybjh0ZUhkN29WazhSWVFaUFJ5?= =?utf-8?B?aU5oZXgzZmVKMnZSQlZOVWFQc2dBcU96Nnc2M0pJazE1QzAzTHBMRG1jZmVu?= =?utf-8?B?QmlwWDFidnBDbzJQTWlaVWxIZ3h5UjUyTmZkaFhjZGMvNHhSWWlmOUF2VHB6?= =?utf-8?B?SWtmMllxTWJxTENpMUFJOVlGOXpkRzc3TkNheDg0a2VuUVM4VWhadmp2dnZm?= =?utf-8?B?V3BjVGg1YnFqTUFnelJOUFZxMFdPMS9vZUNZVFFxcUZ2TVZJZzNWWnFGdmMx?= =?utf-8?B?NDJCMENCaStGaC9Dc3NjdGptNHZJZDVpZEdTSENDMGJDRUN2VG1XdTFTWW1M?= =?utf-8?B?T1psb2U0cld2U3dxZUVyM3ZzYmw5UGpZMGpEaEY4OERQUmh4N2pZb1IzSHJt?= =?utf-8?B?MmJsRTBkRlBBR1dWeW1rVExFYmUvQSthdnA5RU5RY3lRWFBRT2p4NE95K01M?= =?utf-8?B?cFlXYlVYODd6ckJTcnlwbFNVdklUN09jOVV2ZG9ZZm9EdlBtM0szc1Ywandl?= =?utf-8?B?WnJ4MTJLUm5raERuN2M4WlRYVUwxRFJRcVdmNHVuY3VYUU92NEZ3ZTY3L3p4?= =?utf-8?B?S0pHNG1OS3JZUFgwbzI4ckI1V2lEUm5sY2l2aFdaa2tBTEUyMGZZMlk5U200?= =?utf-8?B?YVROQW9vTGlBeUtUSzRNRExuN0RNSEVsTTY4cmNKcSt4dTNHM096VGtUSTFo?= =?utf-8?B?NC8vT285bWozNEljQ0RxUWJnSU1Xcm52WnZhUXlxZW45Vk1kVG5BSHJiang3?= =?utf-8?B?Qklrb1JvNlV3SmlNdG1MaURtY2hIZjlTWkNrZWtMVURkcDVaZWN1Yjh3UGVO?= =?utf-8?B?SFFxUUJBSG5GaE5YcmlvbUVQanUzRzlPTmN5S0pOK0JMOUZNVFVQVVZSMzQz?= =?utf-8?B?MnJXOVFZTlJlYm54b215NEZJR1kyckRjazNpODhBbjNnU203QUZMSTB1WWRQ?= =?utf-8?B?bUNZaEZBN2tFdEFrTW0zUnNZTUZhMXlvVXJyMjRaVFlQRGNaQkJ2ZHh6RDlM?= =?utf-8?B?KzNEQ2tQWVp5RjhqS2pScGJjZkFPT2hIOGxUYmxGaFp3Z2U0ZUpQSURZNHJQ?= =?utf-8?B?dFJhdlBwbVlzNGY4dVFqWGFnTzhUVFpJT3VoWmFWUjJlelUvcHJ3VWlwaks0?= =?utf-8?B?eTk3MVdyelFpbC8xbWd2YzJSTGMrOFY2UUROSzRJVkVHN1l2RWZPeS9tenBX?= =?utf-8?B?dU5HMm5hNmkvZUczVDd5a3AxZlcyZVVSTHA0RGNrV21JUXV5WHNPeEtBTGE1?= =?utf-8?B?eWgzT1JwRGxvRlJkREMxaENlVW0vV3luREc5S1g3K0xVR3V3MHZUTzBGcFNR?= =?utf-8?B?SU5JR1hycEl2dzJTR0cvRjRyVWpQWlZWdlp6anM5eDZtYkVxN01jQjE1ZUxv?= =?utf-8?B?YjBMeFlIQVYrOHdISjFFQ08wSFVobmlsRWZmK0owMUhOSzFUSERwenhkM0JG?= =?utf-8?B?bURBSHNhcExxdmppemJzSFJldC8rY2tid2Qxa0IrMmxDVzludXpCMlFiWGw2?= =?utf-8?B?M3h4Nmc3eVhGbXlTbUlKMkpEWGJTZkpkaER1Wk9oSTRoSVlqaXdOWkFuL1VQ?= =?utf-8?B?cVNhOXg1MWZORThGZjVmTVJDL29nY0tITzRwZ0hTODg2bENKK0Y0R1pmWkUr?= =?utf-8?B?OXA2RnZIM1V4cVNRcWFqTWE2QTB6V0tEdHkxQVFIU1psYVY0U1F0OHRPQ2Qw?= =?utf-8?B?NXFCU01PK1hIMGF1RGFYM1hCbFdpcmoxM3ZrRUdkNWdjTjlOdUdNQThIRk1a?= =?utf-8?B?WlF5OWtQUy9WNDJHRnltMHUrdlpNem55YVRENmJobmFaWjVBWVUzMlMvSlow?= =?utf-8?B?L3RrTmk2MUtvajFrUXBEM2N5bEhoU3VZdFNWYUxmVWVUY1IydmQxY3E3N3lm?= =?utf-8?B?QlE9PQ==?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: ea528873-f473-4ed3-d6f8-08db67cf4cb3 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jun 2023 03:20:24.8014 (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: CCNcQYKh9zbdiD58EbkwMpqDLJK9VRCfKMy21LB8SE2ZlK6GO5iaGKiPCmQU1z9eSbhDbK4LylWTNzP27N1EFue+LbIqilhkGw7KpAlahIk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR13MB4432 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 The former logic directly do shift operation on big endian data, fix it by convert the big endian data into CPU endian firstly. Fixes: c3b7254093c2 ("net/nfp: support IPv6 VXLAN encap flow action") Cc: stable@dpdk.org Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/nfp_flow.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c index 937fb390df..914afb85e3 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -2743,6 +2743,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) { + uint8_t tos; uint64_t tun_id; struct nfp_fl_act_pre_tun *pre_tun; struct nfp_fl_act_set_tun *set_tun; @@ -2763,9 +2764,9 @@ 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); + 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, - (ipv6->hdr.vtc_flow >> RTE_IPV6_HDR_TC_SHIFT) & 0xff); + ipv6->hdr.hop_limits, tos); set_tun->tun_flags = vxlan->hdr.vx_flags; /* Send the tunnel neighbor cmsg to fw */ -- 2.39.1