From patchwork Fri Oct 7 02:18: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: 117515 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 227E4A0093; Fri, 7 Oct 2022 04:20:29 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4FDFA42B92; Fri, 7 Oct 2022 04:19:32 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2107.outbound.protection.outlook.com [40.107.220.107]) by mails.dpdk.org (Postfix) with ESMTP id 96F5C42B90 for ; Fri, 7 Oct 2022 04:19:30 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HA4PnaBl0e6MEeaIn9RMqVZ07DDH8wSfho4cOli295PpO0oVP1xj0euptBv98r/a0MKOKoTGlc9zbwPS1V34hj3qkiNccRCJc7UQlcdfSTFo/gyLJ8DB0Z5SERe1CojR58bAg9MezYdB4jbwAiY2Q60KpRRpDRApN3OM+OUnd0JYXoBop+3VeyTfqzAtjgbL4GRbSj7AJg8iEh9R4H/Vc0ozPvAs9+J/W4XquHFskPc/mu1KlmeWIX/st23Be4lFxiJL9heADsqY9TsnevBkK/EVzbwgxtII6TzUI+BdXuVg/JPBzWYuOe/Nq3wLtk8g2OEcaNqz5+Ia24oftigaqw== 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=SY8hSkspr1xXK7hFHhzUlLMyahQy41DvnUXDvsmyja8=; b=FtpVsBaQWCT3uIrWrZVZ8vjdTVwzy/gPVbaqJvXaVKQpIH2peoUn0adNaVGImw3dek6V5yTPSazM5Cq3f6uG2qOjZHmZzKQ/C6vcyCiCRYnNmdZcAvzoEgQFU4GFRYRWQfEP79i78HmbSYKe5S30Azofx8N4XTUut/Xn/ihDj/44XcSP/UnFnMsOMLpmXjBH7t/OAi6fRJvbdgnL8FTXULxtipN+m8O09ea2d1QxeQ1fxR760/AJxt4RDlwrVcf0fsTUzZo6p566VvP5vVPCcYhrky+mWjAYV2R9NrR+Fsn9TvoRpvmVZwml7aeNh/5U4fcepfseG8ZBewhk8gJf9Q== 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=SY8hSkspr1xXK7hFHhzUlLMyahQy41DvnUXDvsmyja8=; b=vISv/5AV3HGLEJENEK6UNR8lKCgEcOqe7oQsGJU//Qfsnm8NMwlCM7dPXTh8zU05u2PMvzk1/Y+P8z4CrJzrXdo72vXan56ZkuaQ+ed3FJxxqbLYjgMPf1S1a/VyREo8HypmCHNLNEWXvUj/4Q0bdYROiVDyF6JDCbWhhSMvai4= 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 SA1PR13MB5465.namprd13.prod.outlook.com (2603:10b6:806:230::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.10; Fri, 7 Oct 2022 02:19:29 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::a192:2720:1ef8:2773]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::a192:2720:1ef8:2773%4]) with mapi id 15.20.5723.010; Fri, 7 Oct 2022 02:19:29 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH 10/24] net/nfp: add the offload support of UDP item Date: Fri, 7 Oct 2022 10:18:32 +0800 Message-Id: <1665109126-16201-11-git-send-email-chaoyong.he@corigine.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1665109126-16201-1-git-send-email-chaoyong.he@corigine.com> References: <1665109126-16201-1-git-send-email-chaoyong.he@corigine.com> X-ClientProxiedBy: SG2P153CA0043.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c6::12) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SA1PR13MB5465:EE_ X-MS-Office365-Filtering-Correlation-Id: e213cd41-a123-44bc-fcde-08daa80a5ce3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wnTr318can63w1/oA60rCKgTAHiepBktKooohrbe7lmY4d6OtZZ+8Z3eYBmHMW0gpgBII7GgwCpNypF4QiawNqk3WCH9xgm1iUPcqkC66ZExb+2t1qiTh4vqbAxBP4YOKZ3AAvzpVQjAP+jdUMmhoXD24sm+MRxHVhuXT8Z2dWb/bXs7OWeuCMvAZsbSPVnN+Yj2V20jxJaI6y8S3keFukXxvXw+WP4L7wEl2ihe00++cZW70Loyzv5uO1CIv4Hn5qMGxW5Xh8pUkBBw0+YdgLUuNr/z4Dk1rLSh4C/vINpV1nikZkPhihv5Wv7s9CS0xlTRNtOEJaKQ3PRdLIFhqNUEALRxy01O05w2KvToH+4LR9dnV+z4p6Tgy0X6EIOsah7kTQHqof2oXwz4R9sYZojM78Ukxe8KGTeXn69XRLVNoNiIMFpO4xP8P9l62p5EgqE3PJfdqet8hRvQ0neMv+i12E+xWmxOB63S8lNW4RfyOVpX5ltTE5h4M4+1C6eIHdZolsU1+JZX9yCpyson49Z665QbevCtMkNvZ/1Mhcmt4L50duZuGC064+7y5AMqZmqKGpov6bbzM2ahlPZ2okJ5iw01/u2VnhYTxlk13yI5O8oxTSTZK/M5dyxK65xfGNjf0AMAcvaqOSjnbTUqQ/nOO/GAyGP/tK+tZdiwrDn3xQvQrzgj9xRqiF2zSwebOzZGdI1ub6ndmdJ72Gu0uWG7f9ew/aNCwVQ52oUibcyHNYiglR6aqw1grs8h+orT 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)(39830400003)(366004)(136003)(346002)(376002)(396003)(451199015)(36756003)(86362001)(66946007)(44832011)(38350700002)(38100700002)(8936002)(6486002)(6916009)(83380400001)(52116002)(478600001)(41300700001)(6512007)(4326008)(107886003)(26005)(2616005)(6506007)(316002)(6666004)(5660300002)(66476007)(66556008)(2906002)(186003)(8676002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?w/rnjWhNc2JTbmiLxyP/JOMSEVoa?= =?utf-8?q?yALHmZ7K8TPbU2p5GH73Yi31p2JsCI0WJ9rYyggRwKCoO0qYWJqtVMOCV+6TOJFnA?= =?utf-8?q?rxNkTei/NFJa0h9Wiuvqja6dvr2Y/ac5JYyZphr5QZ6+nBQX6aZ5vbdFDomKc50HZ?= =?utf-8?q?yHDx8s59vUYfK6gUw6M09cKSM2Bt1MYQ6O4J6rKp0TwCPkrJYyybqVjdYbuNvEUnl?= =?utf-8?q?KfFxxwVgscujJMHux4jYjfUNtk7djllnMDCcDvx0mWN9BMeTjGE3OkbISIHLh+h/u?= =?utf-8?q?m+ow18zBIwmS/a6be5KDXSZ+dE2jT6jcz4bHVKO2BQbPX/uuDBohOuTTDeNdGxazP?= =?utf-8?q?YL+MQ5RW5Xc5QEASbBu0sCLsyQ5cGa2ib7M9WtJ2OwR7x5ewj2KW9SW/gIJBB+DgZ?= =?utf-8?q?9Xog/bK8i6GRwoBiMhLlbOdRv6Xv55LpvjGcFyF7wciPfsJwYIR+oSR+HYCIZMaCN?= =?utf-8?q?lELsEtlcLtNUxVtf3cJjo7JnynyzdSuaYW0TG0S6teJVnVYr6o0V2qkuAjdUBe1ec?= =?utf-8?q?2zkJ8jS3eM/lxjLRPVn+Zx7tSIhO3s5ypaB77+0+LECyO+pVZztP/R1JSsNEYRW4B?= =?utf-8?q?Nw9WgsaY2KnEnG0rtY+6HcfXXCCfQS3UWC3KwnJBUXNWU778YbDVTwO1yeLwwb8UH?= =?utf-8?q?LagDIUl5dUMaBZNr42cBIHON47OKS8bgdaZb+RnTJvKYBj+1CCtDvfwy1NtrhvVir?= =?utf-8?q?eXyqogs8uhS1Sr80pqTA7WYWi1OHNDC2isktFNBdTcJk/9XQ4lGqaQYL0eORcmbVB?= =?utf-8?q?l7W0u3ujcsIWt6A30qKy6FgBxQrj6FtBpCUB31K0M4+7NlIvjWY5Bxxcs2+vWAhEI?= =?utf-8?q?YQLkKhZvizo4H2ot1sw2gk+JOjPZttIB7pxdZFfBBgCzFkSZq6+mPfV/oD9AlMj+j?= =?utf-8?q?vcCq5nidIWGAPSzBygGuW3eniZdt5UAJguxndv2KkwLA3lznHSL/7GIs70+Q8nKuB?= =?utf-8?q?xRQzW4IgtV3XXbTLJYYdk6Y59sL0nO4nJ2zx+Dx6ejaeCOMXCSJApFuYcD/2DVtOR?= =?utf-8?q?2C0jvcZ7vTI6D8rNanHVO+++Xv6iRNmiHtEiX7p1NYsB9oScUzg7f/b6B6bV3Reec?= =?utf-8?q?1yTF9tYodtJkx64vlx51DjLtPt4wWQjR8fRWCm3PMSx+WnAuRVc9FbPCAR2ZT/6Gk?= =?utf-8?q?SZO2fsTalmPWxyT6M2mDWpBZqKC1vuJ2r8eQRVOKbPryKbWIStr/xRcLTC31cWwhe?= =?utf-8?q?PUDZMXY/JlhGV4IrmKW6zmw77vF1Zf0SdisHlFvehlHrd7/nKO9MCvKcouowD1UST?= =?utf-8?q?8Wxs+5VqxwAFqapnz82dUWoyHyr76KjQLma1LM1pTfUpIqGjeA+v3DLrQIpaxYiUE?= =?utf-8?q?hG84BVwQPQuLDfkF3jvZeFvxU31cgHm6jGqmDaK76XDnzKjzmE5FUCB5luy/VjCuj?= =?utf-8?q?d1BC7m7CGjsmQEBqm9loJ0zphcd1g1AH6GgRuxXWMANm58Hu1gj1vS6/yOi+870FB?= =?utf-8?q?gU+hqA2zVHxoSyR2gFW+jWFe6vHQFs5i3IwTNnn1QgYOAMJh2KRqClgJw9GuUQV3+?= =?utf-8?q?tCuxnRib7oiVb6vPOWg1OaVLigA10BSrvg=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: e213cd41-a123-44bc-fcde-08daa80a5ce3 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2022 02:19:29.0743 (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: +rNKIzHEl0vublaV8JKeY/9Zkqh4HWNtirpu+LVAgq2XmlKTK3j73rWQaJCuaCqu57h9ZjSXKlqO7uh2ms2Ywt4CZ94Vqwk7mdtI2HxEeig= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR13MB5465 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 aaedd0c..e9e2a63 100644 --- a/doc/guides/rel_notes/release_22_11.rst +++ b/doc/guides/rel_notes/release_22_11.rst @@ -112,6 +112,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