From patchwork Fri Oct 7 02:18:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 117512 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 7D72DA0093; Fri, 7 Oct 2022 04:20:05 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5640842B79; Fri, 7 Oct 2022 04:19:26 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2138.outbound.protection.outlook.com [40.107.220.138]) by mails.dpdk.org (Postfix) with ESMTP id AA35042B81 for ; Fri, 7 Oct 2022 04:19:24 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lWqeCY4M1xIkESFAgPioMW5d5UoaxxbNALdBAZhq8Eg1GdBBplD2mdiVCzxzaIimfkPu0yKECaxYqjUHaE1/SQo81gbpW6TV0HwPRKSqBvj32grYs6ljjFaWN5x432PI29COAn+GZ+jzzYZyW7gyyU/I+fqzoAmcNue3/uFvdZq6BnEYJbFu31H2kPH3nw6NKfZF3Crz8Nb2eBy4iy3SKw1kXOm26rGlnXB90cT6Lk22MmDv2JzEzbHDpRvYO/2YJywSgt6QY/l/q9XMQBIDqg1L4Gcc5hoZ0jjjuU9S7XgeuBgRwwDbNiDgdQT2GKhSs/Zm9xEYKZK6qM6k1GuZEg== 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=/WsqtYNYAoQ8U8j++uvFCtlY6RJG5vuJm6y7yMuKpUk=; b=M/afxNawm42l4L05mnO9iYIK+qOrddQ9HB/b3GvSPCApD7Jv8HmIR57/tN6qIYrc+o7sxKqtFhr4kd1qk681eKL9A+gGgzC6MqZzmyMzwi+9essusK9YPSuhMa/bLj8WzQEDohoo3J6tPsDky23HcPFT/QR8LqsMtOqN2WIstmwM6WyCgIVJLNcEfX6vqd7xe5uQ70zP+uPuZV56bZmO9iVXMCHRETiV9sY/S2UzclG/84vNfY2KiGZQKxXLhk/5Gaycmnh6RsWsyieHHX4rOhn80Su3PT/znulqxwcllcxgEmnBNtFsB+2NG9U6HQNJu6FiPIZLjXXLiBAlqKFWlQ== 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=/WsqtYNYAoQ8U8j++uvFCtlY6RJG5vuJm6y7yMuKpUk=; b=f5eQEgMZ77ottGHAoB/a5sLOEZsvgrzhsWNV62n+tBoZApjavjdMeJbdupfSNj+BRRuixd86RFUxePhC778ws/3gjHKmW5bzy8nPcGY1tf27GDKjWQMyygZVFuf7bth1khmpddnA+4+sRu9NTWxRiC8xx5jDUhpi3wy76AzbCvs= 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:23 +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:22 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH 07/24] net/nfp: add the offload support of IPv4 item Date: Fri, 7 Oct 2022 10:18:29 +0800 Message-Id: <1665109126-16201-8-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: ed830205-40a3-4722-438a-08daa80a592e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sPWSOHm7H6PyOegWKhTN5r+QOx/xlKOzRiZ0q24yyI8RfJLoKxPr9q51Yt94ZvzXgmhta5xTLilVQbwFH8/QnqXYNbETLjAnDMlcBIp7KGB/xIoChk9HOaTUr+R7+EMYc+n/pAgP/krmDooxJg3M4IzwXW8UZOBqepg3qNrz0ePS8kQCVAEaw02tg+8a4tz68yMrfWEBHwW0uI0pYQPvf91VvYLAGMoImBZynrbN6sUu03xRrykC/L6vDZjjWO2/+39JoIIP7+sQVaPIbFgyS8Kl0Tz5ECy+L8YAJLk+GJ7TkFjw25cdYLwQOwgL6h9W2ZUbGJjby+TXR9Mv6bUY3iux+4LgGWIpMwR32HIJRzY9Z2lIFi656WDp6F0wjE/EZ+oBmwX17Psskz/T3AcDnVc88JNDX9SMjmFBHHOLpGm+nvG1qdaote4cw6BsOZtfEcrVDSdJcbisQ1jFmiW6LZ761SkuCNnKLmJ4c3zoykvq5eF0Zjfq3KpKSysH2f+tTbTn5V8adexd6mrfMMCdqK4AAa9m2JEirSjl580InogpCi4MS2CA+472+OGtbXpR3j7c2Y3mOLwKQfvDE+tRTb7+zeGp+pfI3j/SNuphx78Nyr2keN6/ieaL1VRmjHBvmZpEwCYte3MFoZE4aQjLiMZa8uE9iUggiLM0AcTgu2U36YRTmyVQMe6fow2NJliBTc/UwOOqCLWNgj4GBqlPEtbzwEuhDcSnaFzMgcG7SWqveKbhSkdreRuKEj8ra5tB 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)(66574015)(83380400001)(52116002)(478600001)(41300700001)(6512007)(4326008)(107886003)(26005)(2616005)(6506007)(316002)(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?Z+hJoYyRAycEv0D5GvBy52f0tCoT?= =?utf-8?q?hXQlO8CyRxuP1TknUDQUiYig9NpStOEqPVJSkIHhYLrOGgVxZk1FRvNLW756gY7au?= =?utf-8?q?vMj5ILwr1LnGcxSxkpFKHkNrXhFbiMtX2QgX8YvOvjsx1zxt30u1d+ItXBdDumTC4?= =?utf-8?q?Ahx7urzTbwvBe1OWXDLfIzatOkHxb0q2E8+o4Gicl4rAmljJz2xJVmhjZb66WPLiJ?= =?utf-8?q?VrE3bOhYbou7vngf49AYZYy9FuZy7iz4M7JPENe3xmxB1f1OJHECLAJLYh7XAp/Xu?= =?utf-8?q?5dYPYLMurFq3BL06cSSUr5WIKK4t1BLkZwTm7q8SFs/hR8VzuJY3+AjwcF2qsF7g4?= =?utf-8?q?SCcJpGmPbethMU3+82GeyowJ5rwwmbc2OFzTplDLEX8IR+YaXWqijSIB2zQTv7h+e?= =?utf-8?q?qhP947xDeVorUErqeZKE8qKmN2eZfHAF6/Y1t/zpaE2OpOqhwszEuDu+0GmeNSnn+?= =?utf-8?q?UnrIz+8e7SFkxXOJww1q1na39GyuXK/q+LL4hPwDGSea0BU6arhVpPcPj5ucl72u3?= =?utf-8?q?4J/KShWjYZrzpvpkegrGktxOm4ZZ7KPooG4y1A/P9TbA36wChCCxTHEn+UymaNfJc?= =?utf-8?q?wKt+pdeOUGivFX6QCriqlu51MthlzyRgYWdas7tULOwNQ1WjOxd0FF4J04+OxM39U?= =?utf-8?q?LQgqcMcSLcojuOlyAJk7wKNpqjG4k9nFvXIZ9rsLaSCzf5KLbvkJVeVQ1FoDuBS9b?= =?utf-8?q?SJYgtAh3S7c0MpnI4g/NfoIEugGZgnp/QvNfazHiZtK1G5+7kZBUnuQfHpyfhTRvM?= =?utf-8?q?MlxJJ6TLGZnIReF3b8CkvVWRdOaXv59Dd9iiII/YdOrXrzvJwNxffNzOqK5dxNyIT?= =?utf-8?q?0KIDJ3FKpjSWqsWQo4TdrQ4OQkOi3tuxZraQ5WQH/lX5+SkLTDkJk8Jk1SZaMJOqo?= =?utf-8?q?r44R2uPlnqdRPHJodIeoBaOSc9n6pfltvOdeda3jLXpU7DroukpajD6pF9GNQ7IaG?= =?utf-8?q?SIm8n0OnH48SKFuB3sM4KIJoOJP5du86tx9gLTbl6zMzKzRpLphjVrXVtjRWujYxf?= =?utf-8?q?5jLi8pRD5XpKvVmKzi0wGjhpJrhv2qKSBZHprgLiAVHMDNVI6uYB9qidhav4WcGBF?= =?utf-8?q?Ab3ZrYtGVz/SohOBJzWjNJfbp9/hmH3F4I8ea7erjJpWK23btJIaCmUdqqoJx7yQ1?= =?utf-8?q?nF6DofqgPDcBN4fTFT+s/L1fE44F0s4Doe8EDKTs1x6dWmrPOlGJJkRuft4HPKp1h?= =?utf-8?q?zlScAdL43y0xt5xzpbc2FThWoM2bPfKKmx7N8fWIxSUfGOLcTV68bQt5A71UvDp70?= =?utf-8?q?140XU9O334BXcZQvRAvW/1LZlr/ocTzTv6Jx5Hhm4Wf87mh6ndR7u4i0UR+mq3K9K?= =?utf-8?q?pE7pq/a26P0Lm5wI5hcB34wJAa8/vp8jrgdfeQAa3TzR/OHROuLQixwvZMIriOuq8?= =?utf-8?q?Bt967kvdmv4NcWWi3D1nAtW2icekH2x8g6wJEcHLNnFRuvKck0Ann6xkYJoKQddzQ?= =?utf-8?q?ElHrYeYf7MIK+2bVcC5h5YMghP1QOFywieDYcjuLLZ7Au1fkRzvx9gw4PbsZyUGlF?= =?utf-8?q?X2kUIAopLh/HQHWhpSnpUFICSNRpCxeawA=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: ed830205-40a3-4722-438a-08daa80a592e 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:22.8501 (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: Vkim/cPzrIAKhYGcHED1Ubi8DGsJF6Jff9VrAWcJeguEyNA7WL5vWL/0iRTHYvSHeSnXux9Z0H4EpOSqyE6zNbYz6odeXFjpluFZ94EOlNc= 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 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 5163264..5eb40df 100644 --- a/doc/guides/rel_notes/release_22_11.rst +++ b/doc/guides/rel_notes/release_22_11.rst @@ -109,6 +109,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