From patchwork Tue Jun 13 03:20:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 128527 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4B3F542C9D; Tue, 13 Jun 2023 05:21:08 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 30DF442C76; Tue, 13 Jun 2023 05:21:05 +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 F318141143; Tue, 13 Jun 2023 05:21:02 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VudrJ2fJ5Tg7rb6D/pyeXr5vP3ou03YriNwRhlr5WgRwetEJW2kkDznDv0kKylncWk3Sk6eSBnV+l8HPwqOeJkipgLuKN458ZzmYaHVNEIep/J3EeZ4/c4JVblDSh6yiQk3tkqFCjThKHtF60SxyzFcwyeBohrozYPefftrn3OxkASwgZa9lne1LWBjY5iFWFZhg0AsSjLPSvB73CQDkOKpOrnFaCeR5njwYmHTxsye1pqeHnzwBi/UPMqP0lO5GARcrmzqdByAtkjWCydRnSvYThBtAmPpRqbym6tE0uMDk8yMm6eGg0N3McKFKNv6kMwQxjFsIUUB75WhpShqokw== 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=eJrk9C6yXnWzmWspi4V78gzAiw3zgotLX7YB2WM/Gn0=; b=gXlsXtf80G5hLoZFVUz/TM8ijqRnvaj717w+X+1fc2VyDHryMMTMhS+MvQ5uvLSOkiZjnb7RtJAv/3DNJhAHHGdtJgMqaxP8wL+o24LnjbjqUnYFeS1cP/VjfOsqbgRbG7gxBISSxyD+6oGf9kCG2JyKCtDy6OgfbbMAZ3SbdV8r8isyh0x7hI8vOaXE5CmBUvQ6erpMyOlvChD6ohKosMobyKLGDUeUTuVB4ej6T/zVqbnddavGpwIhTbIXrSWl62CU1SbBGQJaZUOs+FMn7RtJvgtZBoiZOQrTqJqQpqV531g5ymyMcpYRlJZ7jU8UfHzuSJcytpgjgDivoi/L8A== 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=eJrk9C6yXnWzmWspi4V78gzAiw3zgotLX7YB2WM/Gn0=; b=OwmxUa9AMYJtqVaTgwqB4For9FiQqDoV3cG3WrLauU5MtMVgsMGFpe/t54hBLPzLIaePhFrDKICfQSRz27vbUlOdeyW6c8g9hBRWCVPHjMrYjFA9Cw3KXtuYXsTuxkd1rS/Ig/3S4U2GOJYPEVcWOVrJPU34e5wSNePte0YNSA0= 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:01 +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: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 1/2] net/nfp: fix VNI of IPv4 NVGRE encap action Date: Tue, 13 Jun 2023 11:20:35 +0800 Message-Id: <20230613032036.30968-2-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> 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: e48c6017-d474-4a37-1cd6-08db6bbd36a7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: A0PomCCG5xrIC/BOcYmapyS6Oth0KZnQNNUfq8yueUDSBHDc1MfqAvUDXINYQQ9anB36k92lgbO/Vo7t4ZIDQJgRUOAjd62b4C5suWtk7NupX8HkXrrlnDAUAyudV87pSxEOLIluDx/aTkQbhhf8ujkmnfPkcRpfao3PHo39NNoJDW5tqySwgJs3Cy6aUkXE2rLwDz2c7+BtqIyT32Sdx32mVgz3vwBH/Bl++GPYOHyI7zCT4P/NMXzIjSfoAB/EbQEheEnluIL/Pc13bF19vy0ebgmjR9Di6mZpZWRw5FkoIuq8FMqbP9ifxf9Ipdr6dGMml8YSTdDN9/lrFv/iiIgTuONj+FVU02DGybSYr23SSW3TesHMKUVFj+LJOLG/HFUUthxNBxZ72+AAjHQEb2CujI2pyAmVRy7XjSW8Rc8X/BONReq4YAFKvtE680y7NITdl6PC3wkenapZiRoffBYkw1pq4tTwS3KxE1j8tC3Pu8CcJY835xqIduMvZQfJX7VSYSBpUTzSuO60Z+Tad7n3GQ3B/xbfI4JpknWxfJEKHREB/ed9hPlVhAL+8lY5oG4Mc6UJM9NPKiE7b4EhyO4CsVM5SEyCeCD5FhblBItbwGrEGNAHslIkGGzbH3CA 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?q?jlxsh7C9E3kk70d7gYg+f9HkBcvO?= =?utf-8?q?OoOsBlZpU5Th1jrroq0sba7rBL1bR4pnciX2a8jOoSsX3GheIN6wH9yJRl3UusUvX?= =?utf-8?q?We1cgY98QGaovCAfLc9esUdljTMVo5jN4S7w3/XlvBxAV5yd0AREDQ8B/B/Cod+MQ?= =?utf-8?q?oJJN9lOzDZhWtqPi5z9HFV3IhSIZITbUzqOYt3Dh5uB0Ll+rFZkaj7BUnbS9X1x9t?= =?utf-8?q?VFrDdQxtTW8gjhDRt1qQ/v1e2lKeEOK9VktbZgKcxmyuQcSnMqlZTUH6OzAwckv+2?= =?utf-8?q?c82g5UV2d7y6dyqQiqwj+pIzKTjB1JHkeoIjJgblJasxoDHvaRSdt9wwB7xXEozVc?= =?utf-8?q?zBF3aCVoa4Ysu0Kamyz3OQwilHwEF9BKaqGfhzGZp08gDrYjfxSIEZqMJZGWAloM7?= =?utf-8?q?FTea4lz0cN2sybWGDYsw8cnjbcJapt8nk9iwaKK15qCyMd/rvemOv61dZBWw6Sx3t?= =?utf-8?q?HHk03tFtJfcCxx2Ujb1Ej3sjs4hGY38pkxwfv3o6iBR3mJXCOmJPRfJhJFTllsnQp?= =?utf-8?q?VvYbNn6bancDmFt0zuXDEjHPGav5F/KqH0SVTWrY7zYjL5Se1ciLnGTnKB+Q0EX8p?= =?utf-8?q?6C5gOW+kMyFbYN8cFz9RlihbOoKbA5h8Jak4CQ7X9Iu8btH+Hov007pj57USzl1N1?= =?utf-8?q?BuE0cBwiLz5wIaYvy7BF7pUCs07ktNl7iHZHCHY5NBcoFNhQJA0kX4ajmJaMhNVWj?= =?utf-8?q?XlPxeCb/XJq3JdoPxmblCZIVPLlCuDIiF6EF8lk68Anll1PK3pyiMKRlhjF/vasrZ?= =?utf-8?q?kTfy0bhNEC0ZmyQtalY6v5+AQHQILLSLEuWPN8qEJrJ4lccJXdeOVxNjhfxErQx1Y?= =?utf-8?q?w4zWLtdVs4pnUfoE3mJhLVEnY9Jc4mUzrBfQ+Plsb8oeOG20Cscb6TvnQFvaTsyDB?= =?utf-8?q?qz8LV7pQLSkvkSJbrdKu/F+7UkqXoN2OYwb763v43yJLFDIgkvacr56Th+kO5GB7r?= =?utf-8?q?on7POpQORl9d+3L0FmkTJPAyUjuVsRiwBhxF9pP9o0BwXvq/+786Q4kzxzTVvvkOq?= =?utf-8?q?g2tbDye8CUNxgB3DtZE0gAuKwMebqFEs6EcSyV9RPRhJPi9MQ8Lzr3gc4fnRq9k0M?= =?utf-8?q?5c/PFrHj3wRJphiCaYfoRs+Q99jXMJdx5u30gAq61crdlOjg3RMY2VDx5QXZkOx+N?= =?utf-8?q?nGIpRvaQNtY6L+8NWGz9a1xuqKvTjDq6L/+705u4tqsZtTLsBMZ8q+XQ/35+fMcXo?= =?utf-8?q?bTrOnpVpPv1octlOSEWiqUp3d56gJBX7zvnjqidMM3+VPcyOQG3B2rrYmMIpVLjL4?= =?utf-8?q?fsUyL9L/UMRGFZV9HARhLMb1OhyFx46itGd4xIYAI3B+A7f+9eM3eh1ZXVBb8MGa+?= =?utf-8?q?Va0KxmW2huDMEh7nuGrPeKE0ZiemNPcJGstRwbvLPqL2+aOpbtXmdPBc6vLClf5Pk?= =?utf-8?q?nx8VX0EFwKCES37x6hxyo9F20JbSvLRDp/g4Bk48d6dcbVuGm5mKW9EFrkUTolZr0?= =?utf-8?q?6sYk8qu6TrEpfUKMcjE2U/rweYh+5EqBzDgjdMbRvtJWyBB/ZPQsxzGooTmIEVRzO?= =?utf-8?q?infQCWC4I+riel6C2b7S5g4w+H1FE5fDaA=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: e48c6017-d474-4a37-1cd6-08db6bbd36a7 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:01.5340 (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: U/rlvnkQmhnR23r34NN5Pe3FqbOfI0JD6j1MKPgQ8lycTwqxT34eZ55C/iJ+0xJawoIGf7frlz5ai/MGRjS+cPYwXXTxgbF50sv1QjBT9o0= 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 IPv4 NVGRE tunnel and send it to the firmware by control message. Fixes: 88cce0538073 ("net/nfp: support IPv4 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 5acb7f6ff3..6aea2b1559 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -3171,6 +3171,7 @@ nfp_flow_action_nvgre_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; const struct rte_ether_hdr *eth; const struct rte_flow_item_ipv4 *ipv4; const struct rte_flow_item_gre *gre; @@ -3182,6 +3183,7 @@ nfp_flow_action_nvgre_encap_v4(struct nfp_app_fw_flower *app_fw_flower, eth = (const struct rte_ether_hdr *)raw_encap->data; ipv4 = (const struct rte_flow_item_ipv4 *)(eth + 1); gre = (const struct rte_flow_item_gre *)(ipv4 + 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); @@ -3189,7 +3191,7 @@ nfp_flow_action_nvgre_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_GRE, 0, + nfp_flow_set_tun_process(set_tun, NFP_FL_TUN_GRE, tun_id, ipv4->hdr.time_to_live, ipv4->hdr.type_of_service); set_tun->tun_proto = gre->protocol; From patchwork Tue Jun 13 03:20:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 128528 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org 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> 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?q?6OBbNNnIbAfoKq3s6b8TQxnYh3s8?= =?utf-8?q?gwgkG3K7H/SOOUl4t3uthso/VoqIj6T7WDEjjLwNMoYwCAAQjGSVbU9BgrDoAc4Bz?= =?utf-8?q?fNTdnDc/t1Cd5amd7CgiA6PEEV77CdAIe+xIipPeodUxdJYLumsuuTL6MnpybJFzU?= =?utf-8?q?9phCpZeF2NbHV3zSVpTtqZlRvToZRNgffMS2sLN18CNXSrv1UwaKotylqiAeuzJWV?= =?utf-8?q?fcYkyomacoo20Q5aJGltc3VTE98I/u2C5KTbfaJF2d7Ycywb62sABcvOMrt0Ia+WW?= =?utf-8?q?GnYJSXq90zCHe5g96MpYk113aD6PI6SUQHaXGLHkBwz7HPbS3yFO5eXiJqSIRfjyO?= =?utf-8?q?x4Kkrf7NOWtA/fjQNzUTjSwF05pPOwNQRR76cO5tqsqPJ9cFhwVQAUxYqC6JAAs2w?= =?utf-8?q?Lf0yixk/sL5UEsRQB7/lF9Afam+wza9I2Bq3a+Sn3oCS/lwcdVsb71cARznTQHhFK?= =?utf-8?q?LFE0mZqcETsiR+D6aashhv3nABN+oa8x4DFsSdv7JefZTUOMlx5sv3P6a8saIVoAi?= =?utf-8?q?6aDM0uXiULShD5+ztwlp+IjxmktMSIVn01Xyow9QheAjO1T1hA9nrijR64bcL/2lO?= =?utf-8?q?O/vJU8eH4BBQk+Jg9//2/waY28aknXYWGpiSa0e3dYTysNB9Ucn7GKV0x75ekSMy6?= =?utf-8?q?kxDyfzKNjsvepFy/RL1J3rDsvpktvP9d6SGPHwEK9hPzXzx4u1aItK8/8k5SPSGQg?= =?utf-8?q?v/Clsqe2YRR0ijyhhnbbcGbZQuausPJFU0m6WcpfO+/dO0dC6lo9JHzddKnSTepLL?= =?utf-8?q?qHCxXds8EO7RyRb7z6TDCiAA5MojVTvITAge4OhOl0UlY98ofdo7VPIIlKLobNmsB?= =?utf-8?q?MQOh60NlRM2R1U+qz2ZcHpspMU4K/Qrf2bJZ2EMCPJZPrxjdbpAO/DDozGDoweL5u?= =?utf-8?q?ognTiCTw3wE/gvF7NlJyDGiZIJGExmgMxbmnZWFMWrJGN4oAt8e9UACtrQsPxqAMY?= =?utf-8?q?Zj8d7zXekogmug0uYpZNxhtYl6JSy0UrL4L69wK2CSC1JBSGzubrZKplUiWsqZ88G?= =?utf-8?q?zLLje48tT7y976+0pKLtf91DQnn0jvdeLlb5WDx623UKNnIszqQ4cW9rIoB+QpaIJ?= =?utf-8?q?P+ORUIInX0pUuJB5lo8gfirt+OfA6/O1jmbCzOAWWvBkhPOcWlIUoypDnshNG9ktl?= =?utf-8?q?Ed02JR/RskCkVg6qIwvkIDdraXbOVLXAYPNWK7LbyUM+cVGM9TcyT4akWQ/C+Guke?= =?utf-8?q?JT5O6RxZezB1frbv8eY6vpHnf0GIYFmCJO5qdd/lvcMIuZb41Lrmx8t4+Dn+UvIcs?= =?utf-8?q?6S74uIWhyhPTcITK1DWBLR4F6v9ZdOS+A6p4UChalIuoGlzSUjMZcokpI6m/+MAUZ?= =?utf-8?q?VqvCV6azyDciuOe3j19NSwRP2WOHPZ2b48WKBNeuiOi00hSxMVL9XGb5hJ1Yan74/?= =?utf-8?q?ppOwdjsJJpFW9iFsMFpEZgHFlst/hqk0aQlYnYhBOtDSlGRYTEXeyobjD7nwSgPs4?= =?utf-8?q?3lG/CW98km8W14Z6wRaDQTMP0pOyM2WOAxLoWxNBMEgQgKNqnjWrQJyajDvON7LkB?= =?utf-8?q?ikWSR0hppbsGzoCBJh9shZKTd7AAzAyS8Q=3D=3D?= 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;