From patchwork Mon Oct 10 06:08:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 117772 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 46A57A0544; Mon, 10 Oct 2022 08:10:39 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C82AA42B8F; Mon, 10 Oct 2022 08:09:42 +0200 (CEST) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2090.outbound.protection.outlook.com [40.107.100.90]) by mails.dpdk.org (Postfix) with ESMTP id DCF4242B8D for ; Mon, 10 Oct 2022 08:09:40 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OThLuJTOBRSTPKYowXymG7DVPqLefi09zNH7b+3xdT8xbNpepF89XNZNuKrjBmgMnpCuLZ1jD70jzTRpcxwgvB4dP31dI8mAnzvtYRT29mzf+qgJZERgXqrZgS4cBih9VsAVzeChFBYswdXLpYLPtiIv+u2D4c81TUNY3VoWD3FYXMtqpCG142+PFMrAQelt+fD1qwvUfz1u3eWD6x1gRpje4oBCaa2CGtHryBg1Ri/KLiLoRox/ozVFkzUz/7EL2ch23DmQMDx9f2B+c/pc/y9iJMRbuxu4v/VK7b8JIJT/EGLg5Bxd4HxI3IpAVv/8uHJl+WJ66LhOp1SqgWRyJg== 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=qpKu0fi5V4U0JvzL7eBPkh3uFinK4uocNTla1TyrZeQ=; b=bwug/4NsexGP6X8dCHY/7y7Qp4CWS0UR7P9kl6DFzgITOHqNN35rem9PLzfqImA9a0tUUIO+P815lRc72tTcwX0ULIRSVokCEUCuypvQf24QC2j3ayDm/qAVa8RZO3flCKupiQuLg7SSn3DQ9ksQvVHjMy6oit9dUeIQ0gpKjv+K7GGNqEs0mT0ceexsvUFAzMqWqhwNhPjL5yiUTWr6boQbHt5fiPnLEN5Lbqt6WRsAM7XebIGJBz+jj3efNNp1DyZM0PVzRzv09C1lnF9wSJ/fsx2e059QyWfeI17iO2feRglSOa17o9q8onMB2lPY06tVYAeMMC3/FlMxDjdC/A== 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=qpKu0fi5V4U0JvzL7eBPkh3uFinK4uocNTla1TyrZeQ=; b=fnDr1CsSorr4iBb2tqKEPfeMmr0Fg/MbgndVLh24SGuNHea1AyHsPX5URGBHK6gE5uaBFIfneEUpEVTkRVJhXhBfVH9WuuzPsXFuJYEMxBhwh8BQ6ge3mm+OrgVc3DdyIS+UnuBJA/n1ELPvR2KwMlBPGkpH2+0T9gf1AW0hYMs= 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 SN4PR13MB5296.namprd13.prod.outlook.com (2603:10b6:806:207::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.14; Mon, 10 Oct 2022 06:09:39 +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; Mon, 10 Oct 2022 06:09:39 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH v2 10/24] net/nfp: add the offload support of UDP item Date: Mon, 10 Oct 2022 14:08:48 +0800 Message-Id: <1665382142-21684-11-git-send-email-chaoyong.he@corigine.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1665382142-21684-1-git-send-email-chaoyong.he@corigine.com> References: <1665382142-21684-1-git-send-email-chaoyong.he@corigine.com> X-ClientProxiedBy: SI2PR01CA0051.apcprd01.prod.exchangelabs.com (2603:1096:4:193::6) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SN4PR13MB5296:EE_ X-MS-Office365-Filtering-Correlation-Id: b33f667b-59a5-4c9c-d41f-08daaa8603e5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DimMyRyy49Cn1osA6G+Jyfqdl+f+7MJEPKvEtjhCNKxdRpP9ITKKSxVBy+T+U8xPEkbde5D07MGtWnIQBvehlxW0EIjXPI2AqpQ2y/g/zzdCZvRi8WPGz5hXqvHTfjwUSuVTH4NsbEiKa/goOPGfZGdiaA068sYvW9CTwbUGuqPu4qQnm8QWlYGuG0nZ4Y/M1EU0GgEXxbxLfWo/+kJr9fTpbUIgqaAvZ1ifsJBycGJUrKO/iDWKHZyAuoXNInuouTsMwv+XCdOG+4+seMIvTJgHwUWFCEbRr6TXPpwYV/Hmgaj7adPUdrjD9RA1+RMFZ4ser501EbEwlkVZ4XpqeCwPkTPSM6eSTshyL1j9G1nMfLmEq0QAvXv9ffTcFtbAi+E3MxUV2SbmqSIMYHFjQgvvN/8qCCgWmH6zBl/OtRlCFA+/mUk8NbTL0q6WQW27ihMDLKskoJmZbMrxn+IWTcAkbZQIudCHKGkXcIYnP2wx1phTcT0PslQf+L1R55lecSG1/ow820DSlraJDrARdJ938Sc6ULernccRIQBDR7kvvhhTF9pKntzU2TmnEL9VEM0tQGDZKLH3utPorb5lUF7YUi9W7hH1rSUhR71LrPYpexraxbBiXYrgMt0FqL3S1mdpRrrR+QhacpPjM/7Sp7Y7WtGON/nSyG9/mM+HMIAsdqBgbCnxdPB1afSdKLdHbXL5/xwYXoN5iduCcF6mRExLtDVs3/WQ/FQr1XRzZhgBwaDyIGN+IvbHF9AiNZn/JJkwxMrADtZUO36Au7LzNOzsg20+QEc+RaaT6EMJ16XAFiPrVBoCd0iMAD4cRQIj 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)(366004)(396003)(346002)(376002)(136003)(39830400003)(451199015)(6916009)(316002)(2906002)(186003)(6486002)(2616005)(66476007)(6666004)(107886003)(66556008)(41300700001)(66946007)(83380400001)(8936002)(8676002)(4326008)(5660300002)(44832011)(26005)(6506007)(6512007)(52116002)(86362001)(478600001)(36756003)(38350700002)(38100700002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?mu3zlWhe+lHgIvreNuwj5s90ewKm?= =?utf-8?q?pEGpmX8jQmMo5awsX4htUs6IH1crTYl33UWtGth133Xm4Jh+m6VZBX3gwFMYS32/v?= =?utf-8?q?9LOMLD+HP42J880v0IRVmOCgJfuhuOq/LPmDEUFADTrmQxCVousyo+075VI531uWD?= =?utf-8?q?x85C45tw5HEB/1G+w39Xcc+qAPI5Ef2o0co2QKW4LYVjO/ElLsaE0O0gC9GWnJJu1?= =?utf-8?q?knDRSlk/pWM1jtIOyYF2UFmr+BjJBVq7Umb1YVNO/NJMJ3JOYvVMZbEBzq/OoJs3s?= =?utf-8?q?/1Jd3IOgiiBhx6NF9N+QWN5ybRveyRfk3EPjwQfbFyl4G0Z1DnD/HdSAHU0tEJODj?= =?utf-8?q?TAPnWQg+X5/rj+ZsQJOg2GUawdGhUMnAiLk52JnfdEAcesB70ky5P5tmKZS0M7kko?= =?utf-8?q?8DULm2Y1K4eSbP373uIugezOBZgwH39KYGOWYyFJzqaJeflpvCTnwmfApTxVEUAuT?= =?utf-8?q?OpchfrzR7Y9tzO9EWhOgcxZgqufzy/FBDf0PcWIQ8lRrOH2szLhqbWjlvYq4CIlv9?= =?utf-8?q?ByjV2ahiGDPunRxfv2lWHX+Lcj86T7r0E7H4UjwAohTaBrreM4VK/dmityOU/wfyg?= =?utf-8?q?ws1y7EiN12fAQTF1iyLXzTvUCRyaACvD9SSrI8SYytbkyUiys0gXois8ytcpW1VHC?= =?utf-8?q?G49K8jYKSSvt9jDIe43c3ddQhA1HkfWHrFERIdj3MvUtGLGBo/pw+MJgfm4RXPm4L?= =?utf-8?q?9q42KFgfC1uCAkxi0/Ip4zvf7DYeBbCxaQX+DKKpZ+eGLxNW/cJAwJABKuMXkKHA8?= =?utf-8?q?UkG87H3UDwZAHnt6F3bICasfZ4xeZXf1GOSdvon0HXYeUN6Hs/TlT58BdUlQsY+N/?= =?utf-8?q?0SyNs1/oGO9HAGBd8mGMAIxmPLxqmnJwbj8MgRtYHf3raufYSwURQd5yo9Xn2Ud+p?= =?utf-8?q?yT0IGiSDSqIae1YBrqFhgxQhDGyIqY2eCMaQu6+zBKVU8AFQznvTwd6f7gr5c0he7?= =?utf-8?q?B3Y6LkhZllF5/kYQ3/pVFM8VkGjd7D2d0VC+T4PjLQSzffmP0ELWuR1kDg3x5u6uu?= =?utf-8?q?PRLMw/s9LjRpSDMQ8W39hKFeREAHoGOlC56yTP8Azzc7bCGrdocp7quvsRwCyR1h6?= =?utf-8?q?9YJgJ0imIo6wbK9IbqosMMiBQNwd8d0B8xJMGxbdgZPE5lwuoZ79KmlfivbvmdbhL?= =?utf-8?q?DLhrNvkfErhnthHdmIOWoyUx5p3G92uFns6WU9EkVnyzhM7gyv3FucMFicoTTZvwM?= =?utf-8?q?/6+Oy16GVjS77+FIr697y+npliOgHyO8UtnJBCzhNolnfhaJsm033BPesuF7Qv51r?= =?utf-8?q?a+QHlZdZnE5N//XxlHNyTgL4T5UMdygdfFi8i4nP7SG8y0ITD0DuP/WvUYxAzt67/?= =?utf-8?q?Lfdn8V98O8e4XcS4rV32klYwFaQSRAfAMNeg39Yu2ntKjLCwPMFY9d2+toFCXxn2D?= =?utf-8?q?ZnkITho7QZTdnoCPY+csyXmFQA75ZomIVKK0gJeuqVs+Ap6Sxu33aVYRs2bSchO2i?= =?utf-8?q?BiPbCKuy1+GYaqbVFpyCH0p+Eo7DAPxN5+bXlbS5TlG3D+8B1uuWpoLuKggX2QaB2?= =?utf-8?q?JVOx6W7EhIE1E9mdyQUmtjtJq25mfp2f2Q=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: b33f667b-59a5-4c9c-d41f-08daaa8603e5 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Oct 2022 06:09:39.6880 (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: WafCYn5jupw8dSUvYAZlbAn7+mtoCjaPRrly3Ea3WG3ZTZ5SG7TNdswgPPUhboVhO+tiZT6dPaXoiPRd7EYXtcjaE5ZpqPRWfYcDO76l4KA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN4PR13MB5296 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 corresponding logics to support the offload of UDP item. Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- doc/guides/nics/features/nfp.ini | 1 + doc/guides/rel_notes/release_22_11.rst | 1 + drivers/net/nfp/nfp_flow.c | 63 ++++++++++++++++++++++++++++++++-- 3 files changed, 63 insertions(+), 2 deletions(-) diff --git a/doc/guides/nics/features/nfp.ini b/doc/guides/nics/features/nfp.ini index 66ee03c..f6ba2eb 100644 --- a/doc/guides/nics/features/nfp.ini +++ b/doc/guides/nics/features/nfp.ini @@ -33,6 +33,7 @@ ipv6 = Y ipv6_frag_ext = Y port_id = Y tcp = Y +udp = Y vlan = Y [rte_flow actions] diff --git a/doc/guides/rel_notes/release_22_11.rst b/doc/guides/rel_notes/release_22_11.rst index 95e5ed2..2c4afa8 100644 --- a/doc/guides/rel_notes/release_22_11.rst +++ b/doc/guides/rel_notes/release_22_11.rst @@ -158,6 +158,7 @@ New Features * IPv4 * IPv6 * TCP + * UDP Add the support of rte_flow actions as follow: diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c index f1d1bba..b20a341 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -549,6 +549,11 @@ struct nfp_mask_id_entry { key_ls->key_layer |= NFP_FLOWER_LAYER_TP; key_ls->key_size += sizeof(struct nfp_flower_tp_ports); break; + case RTE_FLOW_ITEM_TYPE_UDP: + PMD_DRV_LOG(DEBUG, "RTE_FLOW_ITEM_TYPE_UDP detected"); + key_ls->key_layer |= NFP_FLOWER_LAYER_TP; + key_ls->key_size += sizeof(struct nfp_flower_tp_ports); + break; default: PMD_DRV_LOG(ERR, "Item type %d not supported.", item->type); return -ENOTSUP; @@ -850,6 +855,47 @@ struct nfp_mask_id_entry { return 0; } +static int +nfp_flow_merge_udp(struct rte_flow *nfp_flow, + char **mbuf_off, + const struct rte_flow_item *item, + const struct nfp_flow_item_proc *proc, + bool is_mask) +{ + char *ports_off; + struct nfp_flower_tp_ports *ports; + const struct rte_flow_item_udp *spec; + const struct rte_flow_item_udp *mask; + struct nfp_flower_meta_tci *meta_tci; + + spec = item->spec; + if (spec == NULL) { + PMD_DRV_LOG(DEBUG, "nfp flow merge udp: no item->spec!"); + return 0; + } + + meta_tci = (struct nfp_flower_meta_tci *)nfp_flow->payload.unmasked_data; + if (meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_IPV4) { + ports_off = *mbuf_off - sizeof(struct nfp_flower_ipv4) - + sizeof(struct nfp_flower_tp_ports); + } else {/* IPv6 */ + ports_off = *mbuf_off - sizeof(struct nfp_flower_ipv6) - + sizeof(struct nfp_flower_tp_ports); + } + ports = (struct nfp_flower_tp_ports *)ports_off; + + mask = item->mask ? item->mask : proc->mask_default; + if (is_mask) { + ports->port_src = mask->hdr.src_port; + ports->port_dst = mask->hdr.dst_port; + } else { + ports->port_src = spec->hdr.src_port; + ports->port_dst = spec->hdr.dst_port; + } + + return 0; +} + /* Graph of supported items and associated process function */ static const struct nfp_flow_item_proc nfp_flow_item_proc_list[] = { [RTE_FLOW_ITEM_TYPE_END] = { @@ -886,7 +932,8 @@ struct nfp_mask_id_entry { .merge = nfp_flow_merge_vlan, }, [RTE_FLOW_ITEM_TYPE_IPV4] = { - .next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_TCP), + .next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_TCP, + RTE_FLOW_ITEM_TYPE_UDP), .mask_support = &(const struct rte_flow_item_ipv4){ .hdr = { .type_of_service = 0xff, @@ -902,7 +949,8 @@ struct nfp_mask_id_entry { .merge = nfp_flow_merge_ipv4, }, [RTE_FLOW_ITEM_TYPE_IPV6] = { - .next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_TCP), + .next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_TCP, + RTE_FLOW_ITEM_TYPE_UDP), .mask_support = &(const struct rte_flow_item_ipv6){ .hdr = { .vtc_flow = RTE_BE32(0x0ff00000), @@ -931,6 +979,17 @@ struct nfp_mask_id_entry { .mask_sz = sizeof(struct rte_flow_item_tcp), .merge = nfp_flow_merge_tcp, }, + [RTE_FLOW_ITEM_TYPE_UDP] = { + .mask_support = &(const struct rte_flow_item_udp){ + .hdr = { + .src_port = RTE_BE16(0xffff), + .dst_port = RTE_BE16(0xffff), + }, + }, + .mask_default = &rte_flow_item_udp_mask, + .mask_sz = sizeof(struct rte_flow_item_udp), + .merge = nfp_flow_merge_udp, + }, }; static int