From patchwork Tue Oct 18 03:12:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 118293 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 587E5A0560; Tue, 18 Oct 2022 05:13:47 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5CDD9427F9; Tue, 18 Oct 2022 05:13:08 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2106.outbound.protection.outlook.com [40.107.220.106]) by mails.dpdk.org (Postfix) with ESMTP id 8BFF642B6D for ; Tue, 18 Oct 2022 05:13:06 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PRBGaib/VpRCabR4Ew9bHC7O28LTfBa4jPx86JIxjQ1V7TTbNi0/eEfYt9/ESVpTyCbjmdXHFzujgxnLRHD3WVq97IxPJw01bJ0j3EcmtWFxn5My0MYDZAoSeaJiSne5Uia+lhW/fZADb8pw5gAHuNzzzuxPcMmjDd2x4wENeg0u+kM9bvRTwlctZxzxSZlRGMFZfS1uYkHOB/sKYR/kjrHCbylZuOeVpWOb7xhmj6arRTJXAhq/ejeccCiUib+WhvkRpjauyZvOKoCVXHiBVX2DxN82SMZ3A+Q3PKshvCUJ1/2jaL9FcfM6BaNw1h8r8KUJpUuOCbLgO49XLrZ0sA== 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=bLSAjAQxC9IrN1wV7U99iFr0JMrnkAUB00RGenloIpQ=; b=O+BERljA739DutahRJ5mi17pXLvkpVg6IIrIw8a0nbKW7bP++NTuyOyUanpPnh7JDeFGkIj5R0miJs18JpC3Qru4+C4Z6jDVYXpHmATWRF3SZ+J91/I05eSUVI6XupZHcD4lcdb370yAs9uYc5jfk20vxDR6XgVMoWl1/oejS3p6VYkgvdZEW64+hd/kqx//BGIa6LdCbg/iM/mbJUTo57V8mZxAHQXcvSO+fESvUcQ93xN+WUihjzkK+iMQ8ZKw/t9pgTa2omkv/CVqjnV1P2RVFoE8tgSr7re3Ece3rsKFdDHzfHPV3XuCrSxAE6YVr3bm/5aYIaDqAsbFAdixuQ== 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=bLSAjAQxC9IrN1wV7U99iFr0JMrnkAUB00RGenloIpQ=; b=PkIKKTRETTKqY3Y7g2GH8M5x+ibFft8wbIry/HTOrCDzdAJadXQdk2O8HZkn6Wp6XAIZB1eKVul3XPKsb9isCwTuyu2FCh6FKkdh273NdvUAjzPWvZBrn6OfF2xc1JwBT+aIxB3GuVceQEkYkYcRuMR67/mKK+tHE5VOmejtSMo= 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 DM6PR13MB3788.namprd13.prod.outlook.com (2603:10b6:5:242::12) 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:13:05 +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:13:05 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH v3 08/25] net/nfp: add the offload support of IPv4 item Date: Tue, 18 Oct 2022 11:12:15 +0800 Message-Id: <1666062752-33689-9-git-send-email-chaoyong.he@corigine.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1666062752-33689-1-git-send-email-chaoyong.he@corigine.com> References: <1666062752-33689-1-git-send-email-chaoyong.he@corigine.com> X-ClientProxiedBy: SI1PR02CA0010.apcprd02.prod.outlook.com (2603:1096:4:1f7::17) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|DM6PR13MB3788:EE_ X-MS-Office365-Filtering-Correlation-Id: 4fe16a58-67f3-4c53-d66d-08dab0b6ac49 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aEXSFObsdpjDf7myBg24a6uLqf9OpTXg07rsGHxlStN6CJxF8eO446IXEm8ibduQH5SOuYntZabSr0tYeLfEhRxCgCEHe8P8ilGj2R2GHMtQGL3Uo40VhtxI69DZIpqQR4vxA5GN25SwHToZnU/BO3D/r0QgJPnC4yCKtoZ4ZiUJUoYf92Mps2uya3kRJNQhK0vetcU3dDo4J8OdawqU6hulv+Qh1+ABp7HSbr05mdOFQDrWwhW2khKGHjEp62xk9RK1Pr7x3k51UkVxg6TBy42Y1iDxgtoxgnohwwg3esWty/n6wdDRm6SDm7mpV4nDYHAbJcwPFAxhdA1TRElS6hgsnzAQvOogVKMyUNPkVGvtaaJiTF0+vKABI7bXI586KEdMK1WHbkaNONoUGdbFEWj3FmdmGaTXPWOGmybNvV2jizCGkly9f3KhGDeG8PutfDWTaAMgEXHyqFye+TK6cIYfZX22e2PfCJr0CqPZVzzZxCkq2LAwdK9s1oK7y4ZkJNf2laFQqKZnpQaa7hHEp4GgutqlqrvbC8GGIcu6UgC4rYARPSQLCKkOfNGzspOYZSVUt+jEPxGwMdTyHeZoBDSl6pBrSAairhzxNrvCedUgPqf89x0In8gJghvmNfe9sTXgSIRzMAx21a3dBDmThG3ei5W/ikmi14ygre8eNlejnQ2BZ4tZ+0NIv46UTGkb3SuFGPrJnkcyJ5zcf7IzGM0OsAaaPVeOiIdaY0gSpHzNkccP1SXG7aV+iC3E/GpW 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)(346002)(39830400003)(136003)(366004)(376002)(396003)(451199015)(2616005)(41300700001)(6666004)(26005)(6512007)(107886003)(186003)(316002)(52116002)(83380400001)(66574015)(5660300002)(6506007)(8676002)(44832011)(2906002)(6916009)(8936002)(66476007)(66946007)(478600001)(6486002)(4326008)(66556008)(86362001)(36756003)(38350700002)(38100700002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?p/CS989iwSIWmSqxkaAj9DR7CD6r?= =?utf-8?q?rHSNN7id3Q6IBH8ku9uEunFUV2fmF6h/BEiR3Mg/SFUi/B/PY2XZBRwgk8s1k8Jj6?= =?utf-8?q?9YnvhYWnt5+ArRIJsLVUzeUmSz5eG6A6YXhlyg2eTQLwEdmYn4ASbTmxeyytssI5y?= =?utf-8?q?hgwn8glVqqQH/jCZGgCMnQZs8XarVp/KmMIy1PvR32dOW6UqU52+h8d3eQxBpvr4i?= =?utf-8?q?rOqCrMVJoIejzxVUtxPydJnlnFTksCz60qY6hTt/m9wOE1s2J04WHWHdleCYs2Kbi?= =?utf-8?q?z38ivX7sbRaYq4mJvPncgiasxMpLFtRX0W5A+dQQ4T8hs8ySs5OgGw0Knj6yvFpwt?= =?utf-8?q?gaqdW3nAjEcD5eHHgw3cqo14zrGWoMvTMXQGSarE2Lj+w3jij0Gz0RvKuonfwc+CV?= =?utf-8?q?SypfxFwJuL0XmhhStvyNG6GTralU3uSONpRdnzWsO69ftBHZcK8WeX5Z13q0tfSo9?= =?utf-8?q?8jb6HAw7zXxYxFnwzHGRVFubqvN7WsTL21H9sArgU+U7BJLaYP96JCRHyaAZsFZmo?= =?utf-8?q?5hEEYBuro/ZOrhgCKz2hr+wyEuBEXmBIRBPjuhX3IgMtwmqTcYSumjW6E2u1gp0yh?= =?utf-8?q?RW6uAms2TW+ucXCXz6zEK0WaD6nnH3xDIKUcIETJJC77aAAEv9mVaOjdP2HLBKfV0?= =?utf-8?q?s38HyPAyHzww/R2QzzvGI+Gqib9XQavTn/xLa2iOuBgW6D72EfY63lGfv8DqWGc8t?= =?utf-8?q?MtkUrKnGv39MAjp1SkmKoUSlzi81JOUC/TvZzgs+V0YhZpHuTrpvV2vm4zP3y0bTf?= =?utf-8?q?TPtV6lZSqg4QPH/qB0N+HqpKrShILRUepPrDZhGtvsF06WbBJFhEdP2zSkHrBXpdA?= =?utf-8?q?5uSV5ZASJo6LCL9tRtYuZDSBS93/kqcVTqX6rIu6mJIPvStGfn5J4ZVivGLuO2LSL?= =?utf-8?q?7QyMcRiJgkusLyQu9lDtbXWsW+oWpznhAmqvUjdii5lghgsweEPT2gFVSp4pisK0r?= =?utf-8?q?ToVScC4+jGcACLHGSEnNfrEP3wz7JBij/BL3o0RnmDqJyU/KHVz9qU62eDSBHBVgM?= =?utf-8?q?L5oKIdREN3WQpaIL6SbXOZ1YigtQt0zB1eQfIFWZsJgSrskX6PqbMZd8EngVX4JQq?= =?utf-8?q?OxNbsS+8S3KN7Yr5ZHpQeSQ6Y5C6aszZuPFd8+bijsxAAicgzM5fgzFPLH9aqHHTZ?= =?utf-8?q?NYgcUq24DS3Iqpwod3ptsn5ENy87x8I71xkJxtSYysHy/HgNTn8NPnDMVpSD3rPbO?= =?utf-8?q?t8QipZ5nJpPVi/rNpOxSdHzXJIPuO0f/GM11ZBDhhXlYicFBfbWDWXX2jI23E52vq?= =?utf-8?q?gjpOdnWiTGZ6YscXStDFiqHI6fqBiAYR22UJxtcBWB6YRPMwX7jEhNzQGBeDiR8q/?= =?utf-8?q?3EYgJGqOdXhZYUvC94eqLev53QwevPE2c0Vnpa9vQQ8DHJ20Rg+pnPhOktykbtXtw?= =?utf-8?q?Tng+SP0tBPQFGjMSd8ItQ59ji5+DGUxityMnP+eQTVHUaZBozZlCSHKwaTt87bVRY?= =?utf-8?q?MDFqAMnr/XBz5kUDX1wwzHstX1WR4lfzZlFeRJq12bxxYuFyMCVh4yts9793zY6py?= =?utf-8?q?Ri+9M0aRHvY1XXzfBJN5blzMAzPYCoYomA=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4fe16a58-67f3-4c53-d66d-08dab0b6ac49 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:13:05.0527 (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: I14UvjJJKqleywglXBx0StR/NXOUVCJFL24ZiEm+QGsS0PfzTws8ERXkxMUghPGnOE0qUDrANVFaiaahE7DHCEFGg+UjYiYwZD8nU8cuIk4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR13MB3788 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 fe6cf11..f6c0414 100644 --- a/doc/guides/rel_notes/release_22_11.rst +++ b/doc/guides/rel_notes/release_22_11.rst @@ -167,6 +167,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 361fee2..b8280a6 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