From patchwork Mon Oct 10 06:08:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 117769 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 72255A0544; Mon, 10 Oct 2022 08:10:16 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0573E42B80; Mon, 10 Oct 2022 08:09:36 +0200 (CEST) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1anam02on2099.outbound.protection.outlook.com [40.107.96.99]) by mails.dpdk.org (Postfix) with ESMTP id B73C942802 for ; Mon, 10 Oct 2022 08:09:34 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hA0k0crTFnUxPJw8UDNpDtu+QcY6WkSI/d3hJxom21UqjBe9wzMzpztdP5bmkLbZ5mmwM/Ngh9RQ8hRbuXThA8W+uwExel68x0AEAxi+uOTR6QSBL63V3/C/WZI3WFsrXwfUfwQnFpKXCVMtlaeDfXv/Qur+ZTMhhN3Fav90MkwMJ+UluDDcZhI2x6ZSbGCTZyhCx9KFTbKdl1vcmsCrkhL3hXvOwMUziH251jH0AL3zBE+wbIUGBOnMle9+yOIdARiwlpMKfO4yGuOfXUMZDPTLUsyzPxZOi4/ADJLpBrOaHjaXvfcsSZFpxlJNqYf3SY5hT0U9NdHXLF4YQ7GKvg== 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=zvSGEEBUB0CNMeVkJgjEg5IZa/TXlir4TymKhRTIYto=; b=YJzSH2bvFgSKf+JQuFs6fJR+0+w9vDyWcqev+IlOTOH1W0+TDXQt35NhieP/bj4TVacvyqQr5KNHAUslWxC0Mzmka0ZNNPghOswAdpjPDR4tHsZvAqbeT/Wvn3k2PtKYkSDlhwuS0TBaHA1kplpToY1nDXR00+eMQDtR5+mt/fZ7s9JhsiQczFSfnGv4M4/FHbvkbmXmurYFK12HLBnW2fVWfrPIbBMWywHJpJTmOFgk3Netpi+2I2d4wi3zu7F20TCPaYvLs0wX72N6X10uYnHxMLcBxB3CKsN6IpZhn3PryocRPh4il9MP+NCSaZhlNPunchxN7ipSZ2jRejWA+w== 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=zvSGEEBUB0CNMeVkJgjEg5IZa/TXlir4TymKhRTIYto=; b=Gb7CKz5xjhu7oxpV4Dn6u4fksMhJ0obLhVzClPd1bJc+02eEmqzM6uKl2YvQQkEz8aFPA9Ftj/raKxmjqZ2uw+cyxxkE8ivUlX0xsj8W3YoMCrnDBllE9Ev+UmZYBuxVkMQCP41ByzxImgmT1j370RIEdZ1LTh5JPsgUNlwma60= 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:33 +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:33 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH v2 07/24] net/nfp: add the offload support of IPv4 item Date: Mon, 10 Oct 2022 14:08:45 +0800 Message-Id: <1665382142-21684-8-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: 8dcf2f2e-ce46-435a-3b74-08daaa86003a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BUnO2SnGFWhk07CK2wMpf55okyH8QP4SprscGzxtabO81yESTnI2Ps+KQS9EtfSL7q+WhkR0utllqukcTdekpsyC7NSSuIK1fjDxcpA642thXmJ1fRTvEEQf8XYJaVsXix4ZJ3p50/b/ZaoULLHEYw3G7kZF4IUuosd6BCtoJvehuXIrurD/BGtLdYWLcdfCi4B6ipb3ag+WcEsxsTKsh73W24EME1nykCmswJ1P7iJ0maGVfMFX42dTW4j95F/3rmwKpbuBR/3DpUS8Xyyhj+Y4AqFSmAOUvixKszWpY0qu7MzJtYgYHZ0PxM85103dSablmah1We9W8R5AP4nk01C3bbioUUu3PDvQI0wf6Jl6ej0aZ9qwPV4ebQMhUhRBkTE626Z9jBLtvEBSsW44WpPEDSIXPxOUgW1UpkF3y9Tuhm4WWW3Xbw+mGZbYSR17LGxAK40ZAiEALro8goFjy1GA6OjBDXvglm0AcBlZJ5PP5pmzW+z4VzENZToioTqCmYq9yZU7gOpnIvArDQYQpzTaLF4Om8kpqvKHM2eXrqhe/ZsIaGFeF8mf+2DDHrzkAfQ6UvInZYLM+6lUawkc6F0Y1mdjLxXc99ZPoTQDBbQ1CaEfZl9n4zrfTPCi9OpFADFuEotxtpSt3xpqYeOD3Y+OgMIlKYa56HdDC0NY0KCXx5emrYBm8xlBYLjBXXksshnpTJ+JqGCIxxOoqGe3jMB4SQPeRIbLcVeONqeltZKiFPHJOXSGCjHcYw6mLb3phoECou7orRJj5uk5u/0Rqz71GnT2we6wJQ75Ogv1HkE= 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)(66574015)(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?9zzIo56YwxnEk32XsgbCRl42unbO?= =?utf-8?q?XgUtZwlTZd90tgFeNjvMY11dtrIfubzGnb3/HTWhvWaU9qjZGG+Ncmduw1L1rnWM2?= =?utf-8?q?/4TPBH+7MASIt6cRcsBvZfb7lb7pZe2ggddzx0Cz4+kmernMj98X4h28wYRBqRQN5?= =?utf-8?q?Xj8Ll/GRZOCeH/sA4/X1iVeqI2oF858mCVqQIL2R/Yun2LVaMUQHeKPsuKheJLQ5c?= =?utf-8?q?VGqE7Jkjpi/gFaZR1gg9zq8kv50i/pALztpOiEe0g4E1DQSA9dCzvf0lIKux7WDib?= =?utf-8?q?QMqO44fg+pQZq+bl64oy51NWPbF5Oif7xTtc+lRkdxbT3VBeN6UaI6WWBQvd1GzYU?= =?utf-8?q?3IidNWCFxgoHfDV9Ugd1cIJgLJHuI1BxWrW/70g0cGS7sAjQawcRLYls7OOT8r9sx?= =?utf-8?q?nxC+UkptUTf0ub2Sqm7NbCU1FPQQV7Sm1WaiXWmIhlURdiPNZH+3poWFGudVCRdfG?= =?utf-8?q?MsfWbx9oia68oGi4hiG4l98JVFHBnEWV/k9BdASe0W7r225Jk3lK/4mp/eNeOiWkN?= =?utf-8?q?5G15hOgZ5sJuNjwk7gvHCPFDKorJVNsmdbzK9jgBZ5hI3y6JTQTdfzQQ7czuwrF4C?= =?utf-8?q?ua3uLzjxuD5p2Hz56jC8kejiLIqgTRgeMcP2KmKKjtZkFv1ckHay/OdRzpARWA/OH?= =?utf-8?q?0wcjdeVILknWrdmf8mHP0K5xe45ICkYP7vTAX3lHKHDt971AXBpLXHBJhJaznQPnv?= =?utf-8?q?p/qnxXTy5zUJAhpMi3+pUgxMuGA1qnTsYole4kOp2DyI2HoqMKWXCES9+zzclLxov?= =?utf-8?q?8DRRRGBpzjuF/agGBA8inkOtpVlhesfILceR9Cjs7edCr9LjhF7c3JO4IwvvWfS5p?= =?utf-8?q?BAzOqOJvPyMwzSl9WoduTS3GOvVgMmGktNrRVnmQqzoJdzVKR0Qd/WgQ+UmcD6821?= =?utf-8?q?osMfybW8M6YwbQauGNIsYBesJns8nV046VuMtcfBBiUGU/iyD1Sp0yYODD5dm7gCA?= =?utf-8?q?DpLoMrR2CuDASxB6QzTB7/5v6ZXcHatWjWHnGrXMP56e/S4j7snqfvMluTFhfsxBz?= =?utf-8?q?NsqBrRqTTWYa1ep5v/PELSJq2gzIkg/X+dYi4fKluEwIKYkhmbgme5F9TWlk8iaFi?= =?utf-8?q?ADqxVAxuWv5KwaJapxVb8SZuZiSfk2hJVD+MMtR6e143ESsK7sqNuRX3F51sNBoO4?= =?utf-8?q?6Pv9zA1J9pY/PGX594rSgGHOO3iM+i2UpTRAfMTMJBnna6aDe6K8e4BVjw2YvzdD4?= =?utf-8?q?/yrU/gZGFqGDd69DQEBWSDCgsC3kt3w6Jw90nuVp6gzVTb2e8h2n/B/oWoYPI63yF?= =?utf-8?q?aQN8aXHvQ+gHhJCfATz70N9tYUfsNhQfLuh1E9PGpJ53VMiXn6noJ/auZR8O2ddmf?= =?utf-8?q?3jhOhMj66W3tP2+biCUvSFa8m8RcyoikSNVgDHKOCqMYNKgpJ1VmG5MtMzEeSyCdx?= =?utf-8?q?aoX/hiTQLZI21pnejA4xHEA2fEO+hNe4aJUxK9/zuyIXsTyHp36mNvB0J2LxwvWSl?= =?utf-8?q?XPm10HUVFj5RKf9wY81UCVgfwLv3Y93D+mzDrtRjFoAUeVMRuGlCum1ESO3W422Mi?= =?utf-8?q?Aq8ataXbQADhjQWaLRustnHVqHoEqrtjaQ=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8dcf2f2e-ce46-435a-3b74-08daaa86003a 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:33.5471 (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: JFHMrxz/T3xjPRg5ewXwyCeZpB9pRZpbRmRU1OIG6Cq7Gppis5QsLROpS3GW+IEgYl2f/g422ONROp2KztGNlYsUHYRfXs+ypb1dcOjzONw= 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 data structure and logics, to support the offload of IPv4 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/flower/nfp_flower_cmsg.h | 38 ++++++++++++++++++ drivers/net/nfp/nfp_flow.c | 68 +++++++++++++++++++++++++++++++- 4 files changed, 107 insertions(+), 1 deletion(-) diff --git a/doc/guides/nics/features/nfp.ini b/doc/guides/nics/features/nfp.ini index f0ecae2..d4ceae0 100644 --- a/doc/guides/nics/features/nfp.ini +++ b/doc/guides/nics/features/nfp.ini @@ -28,6 +28,7 @@ Usage doc = Y [rte_flow items] eth = Y +ipv4 = Y port_id = Y vlan = Y diff --git a/doc/guides/rel_notes/release_22_11.rst b/doc/guides/rel_notes/release_22_11.rst index 9160cc6..8de49df 100644 --- a/doc/guides/rel_notes/release_22_11.rst +++ b/doc/guides/rel_notes/release_22_11.rst @@ -155,6 +155,7 @@ New Features * Ethernet * Single VLAN + * IPv4 Add the support of rte_flow actions as follow: diff --git a/drivers/net/nfp/flower/nfp_flower_cmsg.h b/drivers/net/nfp/flower/nfp_flower_cmsg.h index d776e37..5964ecf 100644 --- a/drivers/net/nfp/flower/nfp_flower_cmsg.h +++ b/drivers/net/nfp/flower/nfp_flower_cmsg.h @@ -253,6 +253,44 @@ struct nfp_flower_mac_mpls { rte_be32_t mpls_lse; }; +/* + * L4 ports (for UDP, TCP, SCTP) (1W/4B) + * 3 2 1 + * 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | port_src | port_dst | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + */ +struct nfp_flower_tp_ports { + rte_be16_t port_src; + rte_be16_t port_dst; +}; + +struct nfp_flower_ip_ext { + uint8_t tos; + uint8_t proto; + uint8_t ttl; + uint8_t flags; +}; + +/* + * L3 IPv4 details (3W/12B) + * 3 2 1 + * 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | DSCP |ECN| protocol | ttl | flags | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | ipv4_addr_src | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | ipv4_addr_dst | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + */ +struct nfp_flower_ipv4 { + struct nfp_flower_ip_ext ip_ext; + rte_be32_t ipv4_src; + rte_be32_t ipv4_dst; +}; + struct nfp_fl_act_head { uint8_t jump_id; uint8_t len_lw; diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c index b063b96..810f2d7 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -534,6 +534,11 @@ struct nfp_mask_id_entry { PMD_DRV_LOG(DEBUG, "RTE_FLOW_ITEM_TYPE_VLAN detected"); key_ls->vlan = NFP_FLOWER_MASK_VLAN_CFI; break; + case RTE_FLOW_ITEM_TYPE_IPV4: + PMD_DRV_LOG(DEBUG, "RTE_FLOW_ITEM_TYPE_IPV4 detected"); + key_ls->key_layer |= NFP_FLOWER_LAYER_IPV4; + key_ls->key_size += sizeof(struct nfp_flower_ipv4); + break; default: PMD_DRV_LOG(ERR, "Item type %d not supported.", item->type); return -ENOTSUP; @@ -674,13 +679,58 @@ struct nfp_mask_id_entry { return 0; } +static int +nfp_flow_merge_ipv4(struct rte_flow *nfp_flow, + char **mbuf_off, + const struct rte_flow_item *item, + const struct nfp_flow_item_proc *proc, + bool is_mask) +{ + struct nfp_flower_ipv4 *ipv4; + const struct rte_ipv4_hdr *hdr; + struct nfp_flower_meta_tci *meta_tci; + const struct rte_flow_item_ipv4 *spec; + const struct rte_flow_item_ipv4 *mask; + + spec = item->spec; + mask = item->mask ? item->mask : proc->mask_default; + meta_tci = (struct nfp_flower_meta_tci *)nfp_flow->payload.unmasked_data; + + if (spec == NULL) { + PMD_DRV_LOG(DEBUG, "nfp flow merge ipv4: no item->spec!"); + goto ipv4_end; + } + + /* + * reserve space for L4 info. + * rte_flow has ipv4 before L4 but NFP flower fw requires L4 before ipv4 + */ + if (meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_TP) + *mbuf_off += sizeof(struct nfp_flower_tp_ports); + + hdr = is_mask ? &mask->hdr : &spec->hdr; + ipv4 = (struct nfp_flower_ipv4 *)*mbuf_off; + + ipv4->ip_ext.tos = hdr->type_of_service; + ipv4->ip_ext.proto = hdr->next_proto_id; + ipv4->ip_ext.ttl = hdr->time_to_live; + ipv4->ipv4_src = hdr->src_addr; + ipv4->ipv4_dst = hdr->dst_addr; + +ipv4_end: + *mbuf_off += sizeof(struct nfp_flower_ipv4); + + 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] = { .next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_ETH), }, [RTE_FLOW_ITEM_TYPE_ETH] = { - .next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_VLAN), + .next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_VLAN, + RTE_FLOW_ITEM_TYPE_IPV4), .mask_support = &(const struct rte_flow_item_eth){ .hdr = { .dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff", @@ -694,6 +744,7 @@ struct nfp_mask_id_entry { .merge = nfp_flow_merge_eth, }, [RTE_FLOW_ITEM_TYPE_VLAN] = { + .next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_IPV4), .mask_support = &(const struct rte_flow_item_vlan){ .hdr = { .vlan_tci = RTE_BE16(0xefff), @@ -705,6 +756,21 @@ struct nfp_mask_id_entry { .mask_sz = sizeof(struct rte_flow_item_vlan), .merge = nfp_flow_merge_vlan, }, + [RTE_FLOW_ITEM_TYPE_IPV4] = { + .mask_support = &(const struct rte_flow_item_ipv4){ + .hdr = { + .type_of_service = 0xff, + .fragment_offset = RTE_BE16(0xffff), + .time_to_live = 0xff, + .next_proto_id = 0xff, + .src_addr = RTE_BE32(0xffffffff), + .dst_addr = RTE_BE32(0xffffffff), + }, + }, + .mask_default = &rte_flow_item_ipv4_mask, + .mask_sz = sizeof(struct rte_flow_item_ipv4), + .merge = nfp_flow_merge_ipv4, + }, }; static int