From patchwork Fri Oct 21 08:01:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 118907 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 44C0EA0032; Fri, 21 Oct 2022 10:03:57 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C412642C14; Fri, 21 Oct 2022 10:02:48 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2100.outbound.protection.outlook.com [40.107.236.100]) by mails.dpdk.org (Postfix) with ESMTP id C949642C02 for ; Fri, 21 Oct 2022 10:02:44 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WM3sqHLKEhpxfW8Fg+0829w64/OokKHKg3apio3nqeSKEQQjuP2rqFgI6DkD8rlwtoutEUTZirbMlJCRJ/vfijJOcO+XGAxfeHaXBCwTplBHjpoMF33UkfSXInu+VZR1ZrD8EQP3sniMIHPjWGUuirFSYp6i9+dvH2dpUZfylMjtIoMbNnT6B01wmQhqAwv+KJoU07px9wDyCbJ734vB1B2v7ophuEF52uXNiK4zfolM21L5lW/XxYiR7kVcdlr94Ief3/6aJTP/Semf/q2qttNhr8aEikDqeWxtKbfKgZtWF30GCQCTPP4cp/bdMYK58DjGSOW4dpAtgR1zYFJ77w== 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=6pxJkVOnhPjV/bpO9CvZ23XmxzUnXOhkWXb9vAXc8HY=; b=abLi7IAElwzh5m8CbuZTkqsaR/UIgr0fdqISV4yjHuW8bpP3aOSV/7AHELsArq3/u93l1WbWN91g33ZB5kPGpYg/aPl+gjMNzoWJh5bK9gzDcXEWon09S3sDd5ndgo7xQ9oy4DFmN3qIwC/dFRhxYHTuQfcY/cUaZhXa+6h1yWFywUBR7q1EMOy5NmCbNFJFGWebCbamMX1LxRb2np5JAkjSCSK6meAMz5IYbzbWcw4JFy8IfIzIzb5HxFK3vsOglflyd+Iw+cmFz+fDU82ZWrprD6IXUFPr5GbdFXR+Naj3TmFA3cIp79tKc+X98ct3tHfobGXOQ+TTYVFgIUX5NQ== 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=6pxJkVOnhPjV/bpO9CvZ23XmxzUnXOhkWXb9vAXc8HY=; b=PtJ32yuAROetI8SNyV22DTx4sQzZ4mVAQGDz9Tf4nrs+flQWsBriIBtFFYe79zhbvze54Y2f0HXJEJr4s73OlE7mmNS7nlV0vBFTzSRVhEVwItSwkFdsYqrEBxJEJzRXd3r6ckzSIlMkgf+lO3c9AYgJcHBeE4x7L3YOdf/95Hk= 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 BL3PR13MB5162.namprd13.prod.outlook.com (2603:10b6:208:339::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.17; Fri, 21 Oct 2022 08:02:43 +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; Fri, 21 Oct 2022 08:02:43 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH v6 11/27] net/nfp: support IPv6 flow item Date: Fri, 21 Oct 2022 16:01:47 +0800 Message-Id: <1666339323-24016-12-git-send-email-chaoyong.he@corigine.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1666339323-24016-1-git-send-email-chaoyong.he@corigine.com> References: <1666232391-29152-1-git-send-email-chaoyong.he@corigine.com> <1666339323-24016-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_|BL3PR13MB5162:EE_ X-MS-Office365-Filtering-Correlation-Id: 07428453-0ac5-4cd9-cf87-08dab33aa1d8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FbtRoWPUm4VO0YUSXqdd+BM8Xb3Wtqe8ftWBHgj6K17t9Sj06CYwDthDcF0LiDNylz3pIVdui0ubO2xAeT3DascLWbb0Jq6kAVaBnCnmGIA1Jteoe68El9vDFmbrh/zC3hcldgc/oJgIvHYOni3ygeHmEJfHgeMGP2myrie2FWpIIBoq5BnRvH1VN3u/6vFHSvMz8rbj2xKS9Q+yYdX8Z4RSI0rzZY+5CRJ+dJ9FGdxaCKg1M0hov9rCboN4uWNW9xpcwR/PxQJS6/LNYJ3u0TtRkmlO9HD6SUdzb8PlLb/7EaJTpRvDJSe29EKNj7TUHTdvduQUJtuAwqMg01WjicvGJtlLPrxyUvtBJnFcBSFYqLXz96WHPxFWrHKENRaDIv8vixdOcua97T77lGsXyt8BOR2eyUamya7jvHk7HxKDz2yLLCIF//9GwT3a7x7zrcecNr9W2UDJ9lkcJD5J7FTQ8OUeid1jAQvE8kmBlviDPZhXO30LINIAUfRqdd5gor44lSiZH4t+VYBBLJLC6IWPszHLSrG0ttgQfx6zb4jrfYYlXaehJyNgsLsy2qPrqRRLGaI4YbRPiE3PAjsSYMf0laFlFpwK9F/7Np0To27fgM70y8I7Fr+03TyVuR793otIewYKAxuBQN63lTV6YXtlOeiY2pvmXflYxQJmqT+lbHIU9NPdL2/n/PSpRu8QDfITkhi/74pb87+cc8jLxkzGNJKR+OHqn3BdNFGN3La9isBLFbClYDTVohmI15Wnez+viFr8AbnC1ZIbLS1ngQ== 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)(376002)(396003)(346002)(136003)(39840400004)(366004)(451199015)(2616005)(6916009)(38350700002)(6512007)(6506007)(52116002)(8936002)(66946007)(4326008)(186003)(107886003)(8676002)(41300700001)(2906002)(66556008)(316002)(66476007)(38100700002)(44832011)(26005)(5660300002)(83380400001)(478600001)(6486002)(86362001)(36756003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?YLdY7zQjnvXS5Gq92TLrCWa7ZXS3?= =?utf-8?q?uVVoOCBQUexztfJo8y0nix5mfhruZUf4EzYFlKDgDW54ONfzJZqUPM4VTpRURDhM1?= =?utf-8?q?GHpTXtQllcycoDAxZvBMBplq1SQJy5MJN9o26lHP5Fi6W5h3G+cpi5wR0fpg2hsqH?= =?utf-8?q?qG4rpnRE6DfpS2PMKYfdbF4jlFan5/hSh0kDJoMgw57EciX8tMseBunIuRf1HY4vq?= =?utf-8?q?uq/IIXvSKA3MRM7IOzFHkgOTAR/+Qft1bP2c6kk426QDG1VVx+oQwRh53a+1lLd9T?= =?utf-8?q?0YSkMd3F6pKi6UyOFb2kiZ5okEAeRt/81NDzk72dOwtsbpXk9uNrGNKlWW9PVrXDm?= =?utf-8?q?6N2DwWzZkmYkmBLeK4eFj1s6dmDBTIYjPRBj7POGc6iDpkK4DrXlAFjUt2TJEYmiz?= =?utf-8?q?sJmRzqF95Icv9k7WT1HMnWjrRMKsLXIAuXjJnpjyl/58tU0YBn77vxG+rCGpT1bV5?= =?utf-8?q?ZJdvmc628Ml79Kg/s5d5u3N3Ai7W6LXdkzuCBIfkPtDo53J4RCsf73LWiwLNqO/9C?= =?utf-8?q?xWmviR/HfV1pLjHBddvia7ejDl0n1SSCdujSx6bGGYNeoS1Tjo8Cn9D+btJLl1oRS?= =?utf-8?q?RgWirK048nyxHrdzu8i3vIBERUTocpTHssqFMbAToEFkjwxZiHlEzDkHy51iYOwpt?= =?utf-8?q?Jn1l6nXIMzKmI0j8hbFZL/oMBuRwVvHK0di1ckWRxyAKWws6M/clEkPhzCmHoAQBm?= =?utf-8?q?CAtdFYQfFkYXQRWucEAPHiK7r6Lqw07UJGLfCp0ih8HxGcLCHhYjBG493LluedfFJ?= =?utf-8?q?S/2GSF7hQm4RP+QuHI7kbUYs30+VnJvYmgZEzsDyS8dkjCdCm5ibxg+4BJ2O2im+u?= =?utf-8?q?QzTJoM36Z2DABCwk8SlDmYUJmd3k1K4UflcHgP2gE9Y0E50tWELSyTU26PCqkVX2T?= =?utf-8?q?KyUauhU0AtCcrgA9KIIj3bYWu2Lv++Fmvb0w4Bho2BoFXeq4HD7eidtlogsPUmxgp?= =?utf-8?q?nteMz+/7sy2qsg76dYFnVweMQWYe0epU+/47sIxKPwKOpL9valO2x93h+sqixZodn?= =?utf-8?q?CWxSRpzMYR5La/wcnPwNxbQ5l99hrBEFdUOiN1CEllsJbrh4SZsJ/JOxXYeAsubJX?= =?utf-8?q?fWikPJuCIA2F1AYFQ7GULiX/OcIjYdhtFZYv2rnkIThsg3rgWyBYBqEdmP/ODK1rz?= =?utf-8?q?90psa9uuU6Wge0gKmk6KYunjkn9uRKAtai0bw78o0ohlHi9/48RgN+WMpLJWEw+Vt?= =?utf-8?q?dzLUwgIOU6W2NUM3883bDJs2gpDAi+W+/JC4soPqYLdy6juOIcrvgLS1sEpmK4uQj?= =?utf-8?q?13Vdn4fr2WLzj+kLvQcnoCsjR1T6a80A7nUuN1arLeAy0RfP2iuHUzHlDDoNXkJvZ?= =?utf-8?q?fUEBgHMpGHlM0hdz4E0O4DdgYZi5wJDFvAnbhI467Ev92C9yFUhBLrhLGiBubKYDv?= =?utf-8?q?wTYSox7+NN5TCuJAPamq3fyfPDZX9vv8npB+BO380Q5w+ckKff0TugXO+piiFCCOx?= =?utf-8?q?22uyGVADY1FvDwLPqzWsj7ENuljE4k1AHtTyucjbLAbk8K1YHaCD2jIYsaW/laz1V?= =?utf-8?q?W11Wp3gtoSDvbYX9PuKtRv7HLjTqZ4V8GA=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 07428453-0ac5-4cd9-cf87-08dab33aa1d8 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2022 08:02:43.4130 (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: pCQc44IT1YFIWyFqmw//1DxSxjeegp38uPP4GqK+6ujB73egekkUvNZKDcceBX3Usalg2cx4wHBF7PUR3TlgGMjT+TLZ3FDwqB7DrGVZqMc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL3PR13MB5162 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 IPv6 item. Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- doc/guides/nics/features/nfp.ini | 1 + drivers/net/nfp/flower/nfp_flower_cmsg.h | 33 +++++++++++++++ drivers/net/nfp/nfp_flow.c | 73 +++++++++++++++++++++++++++++++- 3 files changed, 105 insertions(+), 2 deletions(-) diff --git a/doc/guides/nics/features/nfp.ini b/doc/guides/nics/features/nfp.ini index bf59123..4869b45 100644 --- a/doc/guides/nics/features/nfp.ini +++ b/doc/guides/nics/features/nfp.ini @@ -29,6 +29,7 @@ Usage doc = Y [rte_flow items] eth = Y ipv4 = Y +ipv6 = Y port_id = Y vlan = Y diff --git a/drivers/net/nfp/flower/nfp_flower_cmsg.h b/drivers/net/nfp/flower/nfp_flower_cmsg.h index 5964ecf..36d406f 100644 --- a/drivers/net/nfp/flower/nfp_flower_cmsg.h +++ b/drivers/net/nfp/flower/nfp_flower_cmsg.h @@ -291,6 +291,39 @@ struct nfp_flower_ipv4 { rte_be32_t ipv4_dst; }; +/* + * L3 IPv6 details (10W/40B) + * 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 | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | ipv6_exthdr | res | ipv6_flow_label | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | ipv6_addr_src, 31 - 0 | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | ipv6_addr_src, 63 - 32 | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | ipv6_addr_src, 95 - 64 | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | ipv6_addr_src, 127 - 96 | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | ipv6_addr_dst, 31 - 0 | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | ipv6_addr_dst, 63 - 32 | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | ipv6_addr_dst, 95 - 64 | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | ipv6_addr_dst, 127 - 96 | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + */ +struct nfp_flower_ipv6 { + struct nfp_flower_ip_ext ip_ext; + rte_be32_t ipv6_flow_label_exthdr; + uint8_t ipv6_src[16]; + uint8_t ipv6_dst[16]; +}; + 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 7a7a873..1da3c89 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -527,6 +527,11 @@ struct nfp_mask_id_entry { key_ls->key_layer |= NFP_FLOWER_LAYER_IPV4; key_ls->key_size += sizeof(struct nfp_flower_ipv4); break; + case RTE_FLOW_ITEM_TYPE_IPV6: + PMD_DRV_LOG(DEBUG, "RTE_FLOW_ITEM_TYPE_IPV6 detected"); + key_ls->key_layer |= NFP_FLOWER_LAYER_IPV6; + key_ls->key_size += sizeof(struct nfp_flower_ipv6); + break; default: PMD_DRV_LOG(ERR, "Item type %d not supported.", item->type); return -ENOTSUP; @@ -705,6 +710,51 @@ struct nfp_mask_id_entry { return 0; } +static int +nfp_flow_merge_ipv6(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_ipv6 *ipv6; + const struct rte_ipv6_hdr *hdr; + struct nfp_flower_meta_tci *meta_tci; + const struct rte_flow_item_ipv6 *spec; + const struct rte_flow_item_ipv6 *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 ipv6: no item->spec!"); + goto ipv6_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; + ipv6 = (struct nfp_flower_ipv6 *)*mbuf_off; + + ipv6->ip_ext.tos = (hdr->vtc_flow & RTE_IPV6_HDR_TC_MASK) >> + RTE_IPV6_HDR_TC_SHIFT; + ipv6->ip_ext.proto = hdr->proto; + ipv6->ip_ext.ttl = hdr->hop_limits; + memcpy(ipv6->ipv6_src, hdr->src_addr, sizeof(ipv6->ipv6_src)); + memcpy(ipv6->ipv6_dst, hdr->dst_addr, sizeof(ipv6->ipv6_dst)); + +ipv6_end: + *mbuf_off += sizeof(struct nfp_flower_ipv6); + + 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] = { @@ -712,7 +762,8 @@ struct nfp_mask_id_entry { }, [RTE_FLOW_ITEM_TYPE_ETH] = { .next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_VLAN, - RTE_FLOW_ITEM_TYPE_IPV4), + RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_IPV6), .mask_support = &(const struct rte_flow_item_eth){ .hdr = { .dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff", @@ -726,7 +777,8 @@ struct nfp_mask_id_entry { .merge = nfp_flow_merge_eth, }, [RTE_FLOW_ITEM_TYPE_VLAN] = { - .next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_IPV4), + .next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_IPV4, + RTE_FLOW_ITEM_TYPE_IPV6), .mask_support = &(const struct rte_flow_item_vlan){ .hdr = { .vlan_tci = RTE_BE16(0xefff), @@ -753,6 +805,23 @@ struct nfp_mask_id_entry { .mask_sz = sizeof(struct rte_flow_item_ipv4), .merge = nfp_flow_merge_ipv4, }, + [RTE_FLOW_ITEM_TYPE_IPV6] = { + .mask_support = &(const struct rte_flow_item_ipv6){ + .hdr = { + .vtc_flow = RTE_BE32(0x0ff00000), + .proto = 0xff, + .hop_limits = 0xff, + .src_addr = "\xff\xff\xff\xff\xff\xff\xff\xff" + "\xff\xff\xff\xff\xff\xff\xff\xff", + .dst_addr = "\xff\xff\xff\xff\xff\xff\xff\xff" + "\xff\xff\xff\xff\xff\xff\xff\xff", + }, + .has_frag_ext = 1, + }, + .mask_default = &rte_flow_item_ipv6_mask, + .mask_sz = sizeof(struct rte_flow_item_ipv6), + .merge = nfp_flow_merge_ipv6, + }, }; static int