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 547D042C9D; Tue, 13 Jun 2023 05:21:14 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 492D242D13; Tue, 13 Jun 2023 05:21:07 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2100.outbound.protection.outlook.com [40.107.236.100]) by mails.dpdk.org (Postfix) with ESMTP id 23B4B40ED6; Tue, 13 Jun 2023 05:21:05 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RTDeoGtD+4+cLJ9br0z09pTt7prEdAktWnRSpqSnHZRduhfOnN4QDDO27a3vvbv+P6baKbHJlnWvdwUg42Cj9oAjrot3BPhyfoak8PF/CXnxlGHU2FtJO2+bBuIwugE8XU4SU6LFyyHpLagkk50HLG4QbSlhCHD5qMeCww8hRRAjZStm65R3U5AEnap8hkua5Rk1Rd7fZxQeE9Nl65yOo0DZZpPCGoz87qpfxjuc+FXXpFa8c26Yb2HGm83/uGbWhLoC2YeLRWKLXrxy3drjzPZV2oLRKjLaZbGdbCz/5bnVc0cfuDojAY9quzeqJKl3y2sFvDGgimnduLKvCF8rGw== 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=F5zNnxAy0MwmIi50S0f9crWso+1qv/MJu+4DhQ3Ut38=; b=m/ZASbfegdoK+cHHhfK7Ub3UT1kb/T+whXndVvg7vErFp8njrhpJJbtOkOap9HuuiVoBqHxvqoJAP5/yaY18I/ojICa/9+DS54COOYuDeX1Umb4sOBaqc+FMf8hOYpn/BCLL2pCshRRN5hksZD/H8luTGkOvwPeLQk8hq7RcQY26dATmKmc4q97LvsoqmuEffRq7HyGeTsNm387TWupENcWyu7KdohkYmxsvNskSlLGsYvq7375gZ2r6zwgLEPe80G+vkl5Br2BAyZwC4MKWCPNs/QfmOepGEpYmDA5ZNx1WZPgxCD8qk4XDdMsdcywAGhT1xP6BOIYs79ALLdM0HA== 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=F5zNnxAy0MwmIi50S0f9crWso+1qv/MJu+4DhQ3Ut38=; b=gxjEIaAgHjvryiHkxobYY8kF8KpIPUDvGKM4ICwnCpeh5hZJsWQFB20/ArBSrUlVQyW+lVKesZDW/7ckSsmPAwwosjY4T2V4Poj3exrtachr4JLyYUWa8Iop3ZSYZGXW67GI71rn0fIEkHKK3RcTvCfcR+PA4ZGG1ts0hne5c1U= 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 BL0PR13MB4452.namprd13.prod.outlook.com (2603:10b6:208:1c3::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6455.44; Tue, 13 Jun 2023 03:21:04 +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:21:03 +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/2] net/nfp: fix VNI of IPv6 NVGRE encap action Date: Tue, 13 Jun 2023 11:20:36 +0800 Message-Id: <20230613032036.30968-3-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230613032036.30968-1-chaoyong.he@corigine.com> References: <20230613032036.30968-1-chaoyong.he@corigine.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: SGAP274CA0002.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b6::14) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|BL0PR13MB4452:EE_ X-MS-Office365-Filtering-Correlation-Id: b0cc112b-becd-474c-0afc-08db6bbd380f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 02o9moft8PhJzRrefT/9jmM/0dYOfaX9yBvZNwiICXDQErjrw4SmOxt1Kp1ecVWwrBW3HqkwTUljIqqkLbpVFRfdJn7ikSZgXIqqE+QPZQbvCYFLay0dGlzdQraLzhpoQoy/h6RF7AujUHlzZfyGjEzCtzCCwBQo+yTF4wJhNwCEA8/mC8ZCrYsIXdLC73X50LtT4XHu9sSdgppINcAak2rhvQX7UUdc6s1qEOt2TqOm6Ko3HxKzElhwJaSoqWKHuE5Ix1M+uy9lRUkcW82cLc44lD2ALSTjfumsHf5v4o8FL1nxJqPmAwUBZ6uNXTrPo/Y7DLlIsQS8WvOqwqbKeFUiWk6Bw6YBo2rpq5xej2SUaVu95EqKMJU/ejZ6c8ie/V+9dKXoaO9SKtgXMILWP0A3jorSz9lXzVfeUdIjkGOcTvFoB9ovpgu8MFHby9YYv9YrHfkX7vYNgyfvv5IGHA7Rwi//IzEwtGgH510Mkl4WNunhtBbki3Zzbdq5s1MhL89/bwwR2Za4Nhexx6ZpVscb/Y9I4rKG7hjvJe9SZTR6rv2kz9jRkdTEpMcuynOj65HGUokCetsCunvDqR/Ztq13v4HMFTc0okHIwc9USlsLW6WDtg/Py/UoVRCN8BSi 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)(396003)(39830400003)(136003)(376002)(366004)(346002)(451199021)(83380400001)(66574015)(66556008)(66946007)(41300700001)(4326008)(36756003)(66476007)(316002)(38100700002)(38350700002)(6512007)(6666004)(52116002)(6506007)(1076003)(26005)(6486002)(6916009)(450100002)(2616005)(5660300002)(86362001)(2906002)(8676002)(8936002)(44832011)(478600001)(186003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Nk9CYk5ObkliQWZvS3EzczZiOFRReG5ZaDNzOGd3Z2tHM0s3SC9TT09VbDR0?= =?utf-8?B?M3V0aHNvL1ZvcUlqNlQ3V0RFampMd05Nb1l3Q0FBUWpHU1ZiVTlCZ3JEb0Fj?= =?utf-8?B?NEJ6Zk5UZG5EYy90MUNkNWFtZDdDZ2lBNlBFRVY3N0NkQUllK3hJaXBQZW9k?= =?utf-8?B?VXhkSllMdW1zdXVUTDZNbnB5YkpGelU5cGhDcFplRjJOYkhWM3pTVnBUdHFa?= =?utf-8?B?bFJ2VG9aUk5nZmZNUzJzTE4xOENOWFNydjFVd2FLb3R5bHFpQWV1ekpXVmZj?= =?utf-8?B?WWt5b21hY29vMjBRNWFKR2x0YzNWVEU5OEkvdTJDNUtUYmZhSkYyZDdZY3l3?= =?utf-8?B?YjYyc0FCY3ZPTXJ0MElhK1dXR25ZSlNYcTkwekNIZTVnOTZNcFlrMTEzYUQ2?= =?utf-8?B?UEk2U1VRSGFYR0xIa0J3ejdIUGJTM3lGTzVlWGlKcVNJUmZqeU94NEtrcmY3?= =?utf-8?B?Tk9XdEEvZmpRTnpVVGpTd0YwNXBQT3dOUVJSNzZjTzV0cXNxUEo5Y0Zod1ZR?= =?utf-8?B?QVV4WXFDNkpBQXMyd0xmMHlpeGsvc0w1VUVzUlFCNy9sRjlBZmFtK3d6YTlJ?= =?utf-8?B?MkJxM2ErU24zb0NTL2x3Y2RWc2I3MWNBUnpuVFFIaEZLTEZFMG1acWNFVHNp?= =?utf-8?B?UitENmFhc2hodjNuQUJOK29hOHg0REZzU2R2N0plZlpUVU9NbHg1c3YzUDZh?= =?utf-8?B?OHNhSVZvQWk2YURNMHVYaVVMU2hENSt6dHdscCtJanhta3RNU0lWbjAxWHlv?= =?utf-8?B?dzlRaGVBak8xVDFoQTlucmlqUjY0YmNMLzJsT08vdkpVOGVINEJCUWsrSmc5?= =?utf-8?B?Ly8yL3dhWTI4YWtuWFlXR3BpU2EwZTNkWVR5c05COVVjbjdHS1YweDc1ZWtT?= =?utf-8?B?TXk2a3hEeWZ6S05qc3ZlcEZ5L1JMMUozckRzdnBrdHZQOWQ2U0dQSHdFSzlo?= =?utf-8?B?UHpYeng0dTFhSXRLOC84azVTUFNHUWd2L0Nsc3FlMllSUjBpanloaG5iYmNH?= =?utf-8?B?YlpRdWF1c1BKRlUwbTZXY3BmTysvZE8wZEM2bG85Skh6ZGRLblNUZXBMTHFI?= =?utf-8?B?Q3hYZHM4RU83UnlSYjd6NlREQ2lBQTVNb2pWVHZJVEFnZTRPaE9sMFVsWTk4?= =?utf-8?B?b2ZkbzdWUElJbEtMb2JObXNCTVFPaDYwTmxSTTJSMVUrcXoyWmNIcHNwTVU0?= =?utf-8?B?Sy9RcmYyYkpaMkVNQ1BKWlByeGpkYnBBTy9ERG96R0Rvd2VMNXVvZ25UaUNU?= =?utf-8?B?dzN3RS9ndkY3TmxKeURHaVpJSkdFeG1nTXhibW5aV0ZNV3JKR040b0F0OGU5?= =?utf-8?B?VUFDdHJRc1B4cUFNWVpqOGQ3elhla29nbXVnMHVZcFpOeGh0WWw2SlN5MFVy?= =?utf-8?B?TDRMNjl3SzJDU0MxSkJTR3p1YnJaS3BsVWlXc3FaODhHekxMamU0OHRUN3k5?= =?utf-8?B?NzYrMHBLTHRmOTFEUW5uMGp2ZGVMbGI1V0R4NjIzVUtObklzenFRNGNXOXJJ?= =?utf-8?B?b0IrUXBhSUpQK09SVUlJblgwcFV1SkI1bG84Z2ZpcnQrT2ZBNi9PMWptYkN6?= =?utf-8?B?T0FXV3ZCa2hQT2NXbElVb3lwRG5zaE5HOWt0bEVkMDJKUi9Sc2tDa1ZnNnFJ?= =?utf-8?B?d3ZrSURkcmFYYk9WTFhBWVBOV0s3TGJ5VU0rY1ZHTTlUY3lUNGFrV1EvQytH?= =?utf-8?B?dWtlSlQ1TzZSeFplekIxZnJidjhlWTZ2cEhuZjBHSVlGbUNKTzVxZGQvbHZj?= =?utf-8?B?TUl1WmI0MUxybXg4dDQrRG4rVXZJY3M2Uzc0dUlXaHloUFRjSVRLMURXQkxS?= =?utf-8?B?NEY2djlaZE9TK0E2cDRVQ2hhbEl1b0dselNVak1aY29rcEk2bS8rTUFVWlZx?= =?utf-8?B?dkNWNmF6eURjaXVPZTNqMTlOU3dSUDJXT0hQWjJiNDhXS0JOZXVpT2kwMGhT?= =?utf-8?B?eE1WTDlYR2I1aEoxWWFuNzQvcHBPd2Rqc0pKcEZXOWlGc01GcEVaZ0hGbHN0?= =?utf-8?B?L2hxazBhUWxZblloQk90RFNsR1JZVEVYZXlvYmpEN253U2dQczQzbEcvQ1c5?= =?utf-8?B?OGttOFcxNFo2d1JhRFFUTVAwcE95TTJXT0F4TG9XeE5CTUVnUWdLTnFualdy?= =?utf-8?B?UUp5YWpEdk9ON0xrQmlrV1NSMGhwcGJzR3pvQ0JKaDlzaFpLVGQ3QUF6QXlT?= =?utf-8?B?OFE9PQ==?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: b0cc112b-becd-474c-0afc-08db6bbd380f 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:21:03.8507 (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: +N2pvUZI3rDgT1fOhURmp1+OKnIx+uTbJzEkcA5nAkVmZve1RLMAxURgoMJUysB8cvch2EhhcHe3jVvx9MT5CTFf3WhuNn1bF+O5vziHSug= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR13MB4452 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 Complete the missing logic of parse the tunnel id of IPv6 NVGRE tunnel and send it to the firmware by control message. Fixes: fff680eef7f9 ("net/nfp: support IPv6 NVGRE encap flow 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, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c index 6aea2b1559..31a21adf15 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -3209,6 +3209,7 @@ nfp_flow_action_nvgre_encap_v6(struct nfp_app_fw_flower *app_fw_flower, struct nfp_fl_tun *tun) { uint8_t tos; + uint64_t tun_id; const struct rte_ether_hdr *eth; const struct rte_flow_item_ipv6 *ipv6; const struct rte_flow_item_gre *gre; @@ -3220,6 +3221,7 @@ nfp_flow_action_nvgre_encap_v6(struct nfp_app_fw_flower *app_fw_flower, eth = (const struct rte_ether_hdr *)raw_encap->data; ipv6 = (const struct rte_flow_item_ipv6 *)(eth + 1); gre = (const struct rte_flow_item_gre *)(ipv6 + 1); + tun_id = rte_be_to_cpu_32(*(const rte_be32_t *)(gre + 1)); pre_tun = (struct nfp_fl_act_pre_tun *)actions; memset(pre_tun, 0, act_pre_size); @@ -3228,7 +3230,7 @@ nfp_flow_action_nvgre_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); 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_GRE, 0, + nfp_flow_set_tun_process(set_tun, NFP_FL_TUN_GRE, tun_id, ipv6->hdr.hop_limits, tos); set_tun->tun_proto = gre->protocol; -- 2.39.1