From patchwork Sat Oct 22 08:24:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 118959 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 060CFA0032; Sat, 22 Oct 2022 10:26:25 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C8E2E42B8E; Sat, 22 Oct 2022 10:25:20 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2105.outbound.protection.outlook.com [40.107.244.105]) by mails.dpdk.org (Postfix) with ESMTP id 5ADF642B73 for ; Sat, 22 Oct 2022 10:25:13 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ba0ErcxMAfTQrqWvk/BU7UhOoNBsj19/8iY1ifQ1lmobptwtC3CxhnFVKHQIUV6c1en9sS5DkBPoJ1EMbBvZuDYdNg4kIYoclRePP/fZwmyuYcGslUaH+XbFLmVUqMHIeNNYJ5e84Cr9TwMvqoxP4+aA+9G8QSRKxM7P1CQqvo69KB/sJW3hqpmK/7EMJIFDoIK+hoDWoN7+jOjG1knSIH6qRyJHllKHjuNALn7QmEW2+TL145q99a0FDwPljumGsa8jgOPSs98lV6R7o7Tg1Tml8zJOjI1okR88e7hmDWv14Ji1L8kpM5qKRwAiDX/VdgWvse6qqA+hm6K7rf8ewg== 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=nSpa1aGc8fUu+JaudOXRrdt1lXF3LRqSJfXhxoWElrU=; b=TK/iaIg8G7GvQ9OfVnss+1AptdyOvrZe7/K+8e5MJfTaRzAJ+w1oGes6NOZqyubZvZpaFmBoInDeDhysCKkPJXNUf6Xmi4WNzBSI7YZ2wz+OnwMnf7V9R+7hgXoPHLDUmIJO0pbJiJF+ln90u0b3jb7f7kQ8Co/UHLqZlA8xkpf+j32ZAiJa53uqHIz9l9E37s+KCYwBEuBWR/0dWkLZcEgB52lZkD8Q9hWUOLmwKCPBHfPe1MvREJKUg9CrYISSF2uLblk5oyH8wx6+pg764hKhhHkmqfsRf+9AcF1eU36HAYKXNDbznpVXR2nIygOdpWjZoFe7T+I5TRHFx+5nTQ== 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=nSpa1aGc8fUu+JaudOXRrdt1lXF3LRqSJfXhxoWElrU=; b=kvFMj1/9gVCgVAlWMvtZ5WtU/AzowoevNs75SjnVs0CGW+4S8EMWVAVG3sQ1rza0/68e7V8dJxYDluwSNhi87XZzZJeGYB6POHHrIqp+MXkHUbn78FMjOGLId9IPoyOWhJrwv9V1TyxeZQInLtPIIT7WZHTzIac64GbV3rSZZ34= 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 DM6PR13MB3690.namprd13.prod.outlook.com (2603:10b6:5:24e::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.20; Sat, 22 Oct 2022 08:25:11 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::7c26:1a0b:2825:6f4b]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::7c26:1a0b:2825:6f4b%4]) with mapi id 15.20.5723.014; Sat, 22 Oct 2022 08:25:11 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH v2 12/25] net/nfp: support IPv6 GENEVE encap flow action Date: Sat, 22 Oct 2022 16:24:16 +0800 Message-Id: <1666427069-10553-13-git-send-email-chaoyong.he@corigine.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1666427069-10553-1-git-send-email-chaoyong.he@corigine.com> References: <1666063359-34283-1-git-send-email-chaoyong.he@corigine.com> <1666427069-10553-1-git-send-email-chaoyong.he@corigine.com> X-ClientProxiedBy: SG2PR02CA0056.apcprd02.prod.outlook.com (2603:1096:4:54::20) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|DM6PR13MB3690:EE_ X-MS-Office365-Filtering-Correlation-Id: a6462b71-3b51-49be-ad8b-08dab406efdc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oXHjXFF8/ZaDr14CU9OyKvZCx+V92bgXPar0McZxIePXhGObVuhISLCrDZD/PyImzEX6P3ffhunmPG/6jPihTX7bQGBfRPsV5LmGYqAYxd4ZQBmLyIgYVQxg1Nvq1MJrN4HEzG/SC0zl/EVApVoIc23ZWS1cndQmG/smoyuQ2kbybSa6BLrMTzALcGrbNR2vFtFDKjU9Ml/0NAr6PbnQvoU4x1FVFvS5q4n9CxmdNQecWc98isCN1GHrTDJZIAwNFUMk3SCQ2bUtgjkbJnHXp9dTQ1SgnidpbVBHZlrvU3vIBLYvFHdGO2upoe7JAa1d35O6BeDtHej+OiYnkJOUqAZA0K0thAO6blo5dne7VbGABf/sGQbswn9Ob7xAgBPi5BCNxAY6xebbB003+vAWKdoacg4CbfPwUX3TsVGFd9hfpvi47odkFxgxOeVV8J/Sdv9Zgc1HJgmVX3S6UWQ1DTj7rFTikIYCTwimkoCstDMpQ1WrlcU1NjVPIc8cpO3bDDAMyd9jyTGGQLR6gKPtUsV5pLFDcV0Fc1BenkNT3F5ophFRvAUIyxBMa8fuAg3nGrj6YO+eicHLrfcZIg+7/M8zrrVbw8Pd3iy9BQggn7iY1IJxcu+3BJM132nWSUrlT2bk94rxfy9WctydOV0yBmPnqRY3nrBoRW1EhTfXTiNXtS98MB1uKiTto58JTHNWWOd6c52xSdEDyVe8b9cgP5+syuVzFCPZwgzD0cFNB7wZYroE6owbO6guevJUdqpa65qJWOCnnLTD9M2lcPMUkg== 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:(13230022)(4636009)(376002)(396003)(366004)(346002)(136003)(39830400003)(451199015)(6916009)(316002)(6506007)(66946007)(4326008)(52116002)(6486002)(8676002)(66556008)(66476007)(107886003)(478600001)(6512007)(2616005)(44832011)(41300700001)(2906002)(8936002)(186003)(26005)(5660300002)(83380400001)(36756003)(38350700002)(86362001)(38100700002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?yRAeNHXI8beGvpIdUFVsCrhwWTOv?= =?utf-8?q?7HdBsBNOZ4EtJWLftXRcqxQaYxRgtX26InnCvfbdBHYPIRcc1evuiADK8H9V01U7n?= =?utf-8?q?pLQnobubFAKRDEaK81P9tD2VkU/WNdpSSaZGcDFPQy6do2FTm3hUCkofnPQCcvtHq?= =?utf-8?q?OFr1Tw8CFewq8+UJdNOjnUrbSAP7mRN/PZudGvXeTteaO1kcJrsqI4L9wmJqrsvNp?= =?utf-8?q?qjg1OsiDlpnOLzgvfhMolHsoV7h1tw39NQbgnD3XqS2U37exJYo9zenxeUgrtpU8Y?= =?utf-8?q?G1vcNscamDxEDdu8cW82Oj/YlTVEWdRKb2HXRNcJwpgQG1dXchwWFFt22+XZFg6JW?= =?utf-8?q?odLTN/FBdcHA680zyqgVXQuese9e/ePxcpKbREcw36zKM30A7Teoj08l8aOGNWGw4?= =?utf-8?q?KF1M4b0y2yRF4haDFg2igwRCicWOwGZOUlPuPbIVKPgdnZAByy1B1BpD77czueGWz?= =?utf-8?q?XwzpBo2C/t53bcJ08FMF1D1FaF8M5IQMdzfjuTwfsHTQ4wnt2AA+LigCuUdrv37zM?= =?utf-8?q?NGVmleQpay0X+b4WT18f2P1leZZG1HWHmW5YkHDCek1lLiw8gxLigRJ7AWmMgl+35?= =?utf-8?q?1MSNDej1SqSaaOsAMVY7dW+WLYXc+eDuRRXroSGGKVUXNZqPNZJsIuVj6MQGN53vz?= =?utf-8?q?R52aQAISLx0+iT6E5WWatazK3LUo4bDGfexjyNPQbzE9m/UvovmOHx2UkRmp1BpjD?= =?utf-8?q?RnXVQdYGKH1tys6txvoJzkUcu08dot6q6W+nJWeQlmhcqi9LPCFEkVcw+hZTlo5fF?= =?utf-8?q?zsFN5CsjWZlWSVTFscDq6rEB2H7Xqlm+ZpaUUc8+yvAkyuyCWVbriL0+HMgqza/k7?= =?utf-8?q?OKLmva2gI2aRIvZiKb229VDMI3xPJ/1TZWcA4HL50zgcPPfzFz9xNjpHQz8okAhHD?= =?utf-8?q?FXRH8ogJCimK6gB71yJws9LVsZKPlw52iQkpPC5CInKt66Kb7vCIICpc5vm1vlQo7?= =?utf-8?q?HY+uTbKB6VjtI0ZuAZ+gJK+DyFfJ54xs03EJpretqnrjLK0gP3picAh+g2WuQrsYE?= =?utf-8?q?e1UFeIlmFrPiBEXPW3FXSF6IgYlLZ+7/4v5Q2n2VhL4w1PB/r0AlfSBNY1o/KZnGH?= =?utf-8?q?+4OEryJxk85QP0K+Uwle4uan9GWyiZij3TECyWbecIAAnuFrE2zt0WXI7GEtffWEt?= =?utf-8?q?PvyGAnr5J025ouRkag/yIwgJ+7aU4KlarF+mfO5uwmIBhYNDYQG+TDL/XLr4h3V2l?= =?utf-8?q?+sbYyTRE6MH7Pk2auHXxDTLCCl+YEriIpVsJ8Zz9Yq8+DvAAjx/wldnps42ujutzk?= =?utf-8?q?S38JUJd7zkOhvIL4+JPZLu7dbrVq+C3j9Qh4G5o0l2pp/zBe8HrkY4MHCSvKeJxpN?= =?utf-8?q?4dy0ZVgexo92e4sqZZpJl3T9lyIfaVpxCvnV7+bfTEpgoeMff0ugUTcakz1yBD87L?= =?utf-8?q?PqaugWMTK7pPszQnbRJ/6QSRjYpeQelaoB72GD9BOQ+Lvdw7v4q8siETKJpo6+TtF?= =?utf-8?q?hB90i2AIEXZCx+93EeQ+fFm8Sghp8zh/AIKOH2bGegh5BJLeYz8w1TrfH02m2wZCW?= =?utf-8?q?kiC8riaw9l2nv4h4CuYIG/UrXE3ee6sAtQ=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: a6462b71-3b51-49be-ad8b-08dab406efdc X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Oct 2022 08:25:11.6335 (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: 1VdERNAoG7y88oC+DJSFGduxrs/2z+PI0JSh7yEcXnqURyfeFDceBmIjvJ+RRhnqd4VFgk6YfCCOnlSyVzquYNRFI06U1wT+FmpJdh+aPms= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR13MB3690 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 Add the offload support of encap action for IPv6 GENEVE tunnel. Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/nfp_flow.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c index faa313e..ef19231 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -43,6 +43,10 @@ struct vxlan_data { sizeof(struct rte_ipv4_hdr) + \ sizeof(struct rte_udp_hdr) + \ sizeof(struct rte_flow_item_geneve)) +#define GENEVE_V6_LEN (sizeof(struct rte_ether_hdr) + \ + sizeof(struct rte_ipv6_hdr) + \ + sizeof(struct rte_udp_hdr) + \ + sizeof(struct rte_flow_item_geneve)) /* Process structure associated with a flow item */ struct nfp_flow_item_proc { @@ -2673,6 +2677,47 @@ struct nfp_pre_tun_entry { } static int +nfp_flow_action_geneve_encap_v6(struct nfp_app_fw_flower *app_fw_flower, + char *act_data, + char *actions, + const struct rte_flow_action_raw_encap *raw_encap, + struct nfp_fl_rule_metadata *nfp_flow_meta, + struct nfp_fl_tun *tun) +{ + uint8_t tos; + uint64_t tun_id; + const struct rte_ether_hdr *eth; + const struct rte_flow_item_udp *udp; + const struct rte_flow_item_ipv6 *ipv6; + const struct rte_flow_item_geneve *geneve; + struct nfp_fl_act_pre_tun *pre_tun; + struct nfp_fl_act_set_tun *set_tun; + size_t act_pre_size = sizeof(struct nfp_fl_act_pre_tun); + size_t act_set_size = sizeof(struct nfp_fl_act_set_tun); + + eth = (const struct rte_ether_hdr *)raw_encap->data; + ipv6 = (const struct rte_flow_item_ipv6 *)(eth + 1); + udp = (const struct rte_flow_item_udp *)(ipv6 + 1); + geneve = (const struct rte_flow_item_geneve *)(udp + 1); + + pre_tun = (struct nfp_fl_act_pre_tun *)actions; + memset(pre_tun, 0, act_pre_size); + nfp_flow_pre_tun_v6_process(pre_tun, ipv6->hdr.dst_addr); + + set_tun = (struct nfp_fl_act_set_tun *)(act_data + act_pre_size); + memset(set_tun, 0, act_set_size); + tos = (ipv6->hdr.vtc_flow >> RTE_IPV6_HDR_TC_SHIFT) & 0xff; + tun_id = (geneve->vni[0] << 16) | (geneve->vni[1] << 8) | geneve->vni[2]; + nfp_flow_set_tun_process(set_tun, NFP_FL_TUN_GENEVE, tun_id, + ipv6->hdr.hop_limits, tos); + set_tun->tun_proto = geneve->protocol; + + /* Send the tunnel neighbor cmsg to fw */ + return nfp_flower_add_tun_neigh_v6_encap(app_fw_flower, nfp_flow_meta, + tun, eth, ipv6); +} + +static int nfp_flow_action_raw_encap(struct nfp_app_fw_flower *app_fw_flower, char *act_data, char *actions, @@ -2706,6 +2751,10 @@ struct nfp_pre_tun_entry { ret = nfp_flow_action_geneve_encap_v4(app_fw_flower, act_data, actions, raw_encap, nfp_flow_meta, tun); break; + case GENEVE_V6_LEN: + ret = nfp_flow_action_geneve_encap_v6(app_fw_flower, act_data, + actions, raw_encap, nfp_flow_meta, tun); + break; default: PMD_DRV_LOG(ERR, "Not an valid raw encap action conf."); ret = -EINVAL;