From patchwork Tue Oct 18 03:22:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 118329 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 9106CA0560; Tue, 18 Oct 2022 05:25:04 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8581D42BC0; Tue, 18 Oct 2022 05:23:38 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2104.outbound.protection.outlook.com [40.107.92.104]) by mails.dpdk.org (Postfix) with ESMTP id 5943742B92 for ; Tue, 18 Oct 2022 05:23:36 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aDEv4maTUhoy8f1CY+Z32OJEPbOQVSpM31uFh99XcXUVZOXMMOKy2/JXWzdepuJlalyuF6q7zfgEU/KytrjhZt7U9UlcRhOIQ2uMqSdbqvmoz8KbJl4SpdH+2+aPPF7OSfZ0WumLCnwu5dXQ1vPSCtg4LX37Synt4IiILln62/yjmUdmVAlCZf1u2lRFuPNd7ho/TPcqFhy0EKvVkAUgwqc/7z2nfEKoScPQ8OF6VFP5hOofKEuc5XeB6oWrCmTvAj2IhSwLi7tpn0/5UA7TBghifr+lp13OboYbT7FzkLR3usMBln51qVAbDTmy6Jhq2s8RJUYI+rLDEJOwSgSC2A== 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=MxJC+Y39NY4NjlZZaYyzngSoBOBIT8B984zvT8jCHSc=; b=icPRi8AXbOHq9Z6SoUUYjc48Q3+p6fDKpuljFkqu3YHxqd5PNzCaXCrpujWUeu0K+Z0zkG7R0xPobg4LsgXy2VhV5A4e/yOHvBcsrrngL0AnJ/tn9Ia8cBWRPSunrQ4Hcyp6bhf5rt0utD6aZ1Z9DFsoRwxVRhkwvdTpJp0rSn5NvavintsU2yRMp9ucSqNnb2+rNzEc+KyyWLX1q1qcvX7Yc/krpDn04iVWMRzzXTRmDAyf+hbgosMg5Tcq5+izQBcBK5s7MNjofv8VgsQylNgpCUPonnNOtk7O5REGxm78od6+HZhRIu7dRuRIdJyDZX/MKlZngpcqcjnpGxp9nA== 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=MxJC+Y39NY4NjlZZaYyzngSoBOBIT8B984zvT8jCHSc=; b=wEeuIvQ/cxSo5Ws6mbXSCXhE4uAyMpQu9GhALIXKEgjJeIHDn+OaDdSLIZ6GhdnblJd1DCksxnLyLd05aF4N2zGKQ7ySx1xymQ7wBa6r/UdtDC7LGQkuqSbMQuEh87Ay32aOFLK5XcJ1zZ6dAgVu0A9Meqfzum/pcrpDo7/6oIc= 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 BL3PR13MB5147.namprd13.prod.outlook.com (2603:10b6:208:33a::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.20; Tue, 18 Oct 2022 03:23:35 +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; Tue, 18 Oct 2022 03:23:35 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH 18/25] net/nfp: add the offload support of IPv6 NVGRE encap action Date: Tue, 18 Oct 2022 11:22:32 +0800 Message-Id: <1666063359-34283-19-git-send-email-chaoyong.he@corigine.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1666063359-34283-1-git-send-email-chaoyong.he@corigine.com> References: <1666063359-34283-1-git-send-email-chaoyong.he@corigine.com> X-ClientProxiedBy: SG2PR01CA0184.apcprd01.prod.exchangelabs.com (2603:1096:4:189::9) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|BL3PR13MB5147:EE_ X-MS-Office365-Filtering-Correlation-Id: c680c670-3c1e-434d-8e1b-08dab0b823c7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WnbIKGVv6Up8Ax3ybmFk2tBTftdKnlLfjZ1QJKEu9+8M9FOUBmeEtbaE8lonnDGhdvwM56eXuKNXiU0rjQ2Q0Wpw4UKNes0jOYng1yIsQFrAFMrTK31GeVZ6EYupfy+BaEyqxRN4CyDMxvEbpFhZ2ZOo/Hgs7v3FhpGd3FFEafn3grLICrnucDyP1Lu+aLaVhNoTmEzxtCi89gKlFGAldJ1m0p2O7azscVQyTG0Af+Txs0/2g1tZnncf4FZPse8gbcOL21Ykg1GlKPlFFz8VIpZLskZfuP7jNGHbNQJ9nwDfpvsgaGsflBK7L3moiEH1C0+Craa/XmDhRJHJT+cMffq3f8V/BJjFuDtQUkKJPp/T9ughpRY61Q3ATywkF8HxpVZRNArNQT+H6++Qb5AOgv+CQzc9xN3avZt2EQWwdPYcNOy6+gDd7w6kE9cOZKdixnLmlzN5VHZhAx+PQ8dLY8A2IlXWF+ocZfBMqCSPr35xksgWFC+JZENSh5h18qg9b2IY053p6a1lANFHCBLwfzXlHYSsaqoRaLQzDsh0iz+g57o/pcdRJKEsvcQtI3Xw20umPZV1oZ9Ddko4gsU6xz/9ri+nfvDIJe78Y0CeDB+x+QGQK7IoAqqzcVf20xC0aAbfdMggkXquYRWJkJAPn/trSg8Gaga7gnLAssaEBHu2UHNO/ApuA8d0fb/sv8bFsU+i/owTmLQwyinGUGnAUCoUQt1t8tOZ3R1Zl0LO6csEqYN99QmijCDpWZhy+Vl8xyLcpcYEfWJy56oiAZ3FYw== 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)(136003)(366004)(346002)(39840400004)(396003)(376002)(451199015)(36756003)(4326008)(66946007)(6916009)(316002)(5660300002)(66476007)(66556008)(38100700002)(38350700002)(86362001)(107886003)(6666004)(6486002)(478600001)(26005)(6512007)(6506007)(52116002)(41300700001)(8936002)(2906002)(44832011)(8676002)(83380400001)(186003)(2616005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?9xLMbp/YFpdjtUElGFpyTaRoSsX9?= =?utf-8?q?PChfmdtHYjRJVz+xqApqCcrgioQuYe8La7Tg4VxUnBiiFCOUr+m/pB58FXnSVQHFg?= =?utf-8?q?NFe+LCakpHhDzg2r9cX04+JeeMuRbSVLOCTSVjAly0ruJtBBg47gvPKAPPw/is2Uz?= =?utf-8?q?vilqVZ8FdKPPCyr3LPgLMu90dhAJa14xbqItfP643GDuigrFKuofQR1gr5gyaCML+?= =?utf-8?q?wq0A7KJoFglAUo15ubCx80VDa8qHz330vCcI2q6Ijyrwa/Po1g60zuBKJXVlb1PeD?= =?utf-8?q?qFc0SufVVIJZ/8a6ruAdLuwm8OwOaJwigV2dMqemgFIvbiy4yPZY16abP+HTkcEhb?= =?utf-8?q?xn2Xq+rA4Ne0Sadg/yNZoFEDhU50G0EvECkyJj4snsD7VizgPqgTnws5MTY+923ie?= =?utf-8?q?Bn5AZ2EeDTGu7noKfT/oklPLdR7eU9ONj9MdC64FRCqX4tFgVZQ1D3lmcjsb2Ham8?= =?utf-8?q?2l8oDEFFs1J1jH+SXcH43S0EN6rQUEdP20pQHeoy1wiLD8hHx/iYhL0hVAi2WJAFM?= =?utf-8?q?yOBjrXolPDamPJZfzIV8jdrhD8WmFLIC1bb6udOm0vcEayphUpR/Gfr7mqjr08CHa?= =?utf-8?q?t9xbwPH1EWAZujETg9TUMOv6Q+OClgSN32iloAQZjMr/XKnOD9wQi5YBGvZWE6IjE?= =?utf-8?q?omimnoWOR7y7sCAlU7VhnQOrzEuWPoYaLMY3uLndKXamqSu7/9MwB2KxtU/f+oLtn?= =?utf-8?q?nGyKfbZGA5HyGjXLtccnlQDO6UuxXg4FXreTeE5tq5G5KKzOjj4/0pyshYAb9rWkO?= =?utf-8?q?8Bw0LBB5Xc0UIbnCUMO5qBPg6tbhrDKTDqFbDQzhsAHW8uCbgyte3HH3NTaqtaUAG?= =?utf-8?q?5OurYZUX+nIg8K4mi22xWoo3SDFzKA23tItWmqeXHfNU3pvHc+yB+PDOiUkXJyi+c?= =?utf-8?q?yhph/WHnaCb0CLKX3hR/tkLH5tDctS9xGiifF9m2mo368hktSQ9HOKPZir3IC3N2b?= =?utf-8?q?NvrL4vtHI0yzVlFEiHsztTB7UQAABegy3VI60cqGdyRMrzmLyVJbooru4lf+tXQAT?= =?utf-8?q?8J3ERhl4FIjkkn37qHRqCJ6HVuQ3ghCrlf9db3T/zTk2vHStI2ZdD02NP5eOw9BK6?= =?utf-8?q?KjBoWW+YOuoSY5yR/RqdapwEwaZ3tatJFSA9/ZYu6NjTS7haq0xNB3atj5RoXuMR6?= =?utf-8?q?v/p8JklrS1UIMTSHmRtbsybVtx4nnc4hpLrPJeuaiMfbXuDvFGHKKJBjFX5HrnLSY?= =?utf-8?q?dGgKMjv7et4hlnbvJl7IdThcfhPLedi3fc5AciIP8ZMPbQ5ygbyqAIAwTxOzv39+D?= =?utf-8?q?qzmhjjYScam+8rZmO48lDPGvogeQ6LyWuGt7MPQZMhOIRB0fSELcBzyyh1M+r060n?= =?utf-8?q?zSLI7Wv5INXhVlYxh9FMbox2ctUW2TcSyuobTRP0HhcBGXjPXldHQSrKbNbFO9gTX?= =?utf-8?q?vcDkwF4oa7/vnRrcqMh7xJfMeIvW/duPsEd6z5CSq91jtzrZuMff/GxB21y1UtbDw?= =?utf-8?q?PUiPyNFd9/lsRDMKcpnoheVkbRzzYZ+JPmrTAOf+iPKFsf4RaP/T+SqRmyNkeUwm7?= =?utf-8?q?kKO9fJZmjP5Dpk3H23TAhI3Jve+6FcQBoA=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: c680c670-3c1e-434d-8e1b-08dab0b823c7 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2022 03:23:35.0066 (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: Gnu1P/NPKx3BTVK9esEWJKJ9ISsSa21WV01PDbXk8wHYfxLFkwJpKPJUe8cy8ZZHZOfY7/yHTnLee8YnPg4KT596BP27XLqdDXvhK0c8Yxg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL3PR13MB5147 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 of IPv6 NVGRE tunnel. Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- doc/guides/rel_notes/release_22_11.rst | 1 + drivers/net/nfp/nfp_flow.c | 45 ++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/doc/guides/rel_notes/release_22_11.rst b/doc/guides/rel_notes/release_22_11.rst index 4adad3c..e2f7295 100644 --- a/doc/guides/rel_notes/release_22_11.rst +++ b/doc/guides/rel_notes/release_22_11.rst @@ -186,6 +186,7 @@ New Features * Set the DSCP of IPv4 and IPv6 * Encap and decap of VXLAN tunnel * Encap and decap of GENEVE tunnel + * Encap of NVGRE tunnel * **Updated NXP dpaa2 driver.** diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c index 823b02a..adba6c3 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -51,6 +51,10 @@ struct vxlan_data { sizeof(struct rte_ipv4_hdr) + \ sizeof(struct rte_flow_item_gre) + \ sizeof(rte_be32_t)) /* gre key */ +#define NVGRE_V6_LEN (sizeof(struct rte_ether_hdr) + \ + sizeof(struct rte_ipv6_hdr) + \ + sizeof(struct rte_flow_item_gre) + \ + sizeof(rte_be32_t)) /* gre key */ /* Process structure associated with a flow item */ struct nfp_flow_item_proc { @@ -2885,6 +2889,43 @@ struct nfp_pre_tun_entry { } static int +nfp_flow_action_nvgre_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; + const struct rte_ether_hdr *eth; + const struct rte_flow_item_ipv6 *ipv6; + const struct rte_flow_item_gre *gre; + 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); + gre = (const struct rte_flow_item_gre *)(ipv6 + 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; + nfp_flow_set_tun_process(set_tun, NFP_FL_TUN_GRE, 0, + ipv6->hdr.hop_limits, tos); + set_tun->tun_proto = gre->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, @@ -2926,6 +2967,10 @@ struct nfp_pre_tun_entry { ret = nfp_flow_action_nvgre_encap_v4(app_fw_flower, act_data, actions, raw_encap, nfp_flow_meta, tun); break; + case NVGRE_V6_LEN: + ret = nfp_flow_action_nvgre_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;