From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 45772A0544; Mon, 10 Oct 2022 08:10:23 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3278C4281E; Mon, 10 Oct 2022 08:09:39 +0200 (CEST) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1anam02on2094.outbound.protection.outlook.com [40.107.96.94]) by mails.dpdk.org (Postfix) with ESMTP id 195D142B84 for ; Mon, 10 Oct 2022 08:09:37 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FVXs7jZmLQZ9UFovz2JFfvj5h9TIM+jhM8zm1AyfOV/ZwSpWhwbzEY7rKijH01tJqYakMamhaYhL/1gHLbDUDXnnUDi8u9KTrH7NmrrG+WzNndjkk7mlTae2l+UZ4azALRWTcrmYQ1W49WAZ9CGxbfxEAZpuYiyYHK9Tk+1ByFMTX7zOtDTO6IS7PznYVbbQOC2V5UIeDIK6y90+BSGso6FZ/Gs3yfjg+q5ddhhWJK3/y15FGX6UF2YU+Xl7fkSlAidywVV5GMBqMADaabBJOrU9R5TlrgoI6RJNVSKYOYRcV/dVB76XuqvLRMxfqovMkpFsQGZfaSIojoPv2HVKQg== 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=8wN1qmQ9DaV4fyBkWn/rroaFZzmhRwbbPwxcoCjzBDs=; b=dxfesAYLFkbr1Gnm9etiV3e5YOqu/1bhEFAjjtQBynADKLY4++2dyooQBwi93LfhAOaqH6ndgV/GCE6Jm3yxqJS3j+13GKZgCL9a6Xs0gKS2Kq9TDuu/mCNKkpuXelVrdFCDUXYFdgUVAI9KesHiESSkmgN8j+WPfkXuSpPVAHIFYKNpvRY3oAayzQ8zF7Cy7Hu9Wj8u2fwDNYKa5DkFfK50PyhssEi/t7/FLv7OgzA4plNUMhjP4hK7N71azJbYkSCi6igCU0ysTlK6A6nB/UiPFJaYh4ku58HRJ0Z1dDBvOLRRJBL4bQx2KNBa706mHG6tCFYChzSwMSE5sE0HeQ== 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=8wN1qmQ9DaV4fyBkWn/rroaFZzmhRwbbPwxcoCjzBDs=; b=hxF51FMlljWiI1pJG3h0VtisxceD47ngjzLRpNCdYsIIisRLfpFMDJ4dR37gS9Kn5wNMkYhkIV2dsqNTeegaP19A7j/DB1+xAMKvrm+sNgrhrz3nbb2A/JLwgqCgIO20B+rvNgRL4Tk59Z+zLBiMauJTmXwwJpYnSKhwMhRac/k= 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:35 +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:35 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH v2 08/24] net/nfp: add the offload support of IPv6 item Date: Mon, 10 Oct 2022 14:08:46 +0800 Message-Id: <1665382142-21684-9-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> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: f179eea2-3ecd-432f-e69d-08daaa860174 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /5+PNlPluhAnn4B8KK4LpVYyh2Rr+2TOdVRmqomGuORiGGjqOYgZkewmy65Yn5YO04rEwxQUPCYyqjgLkh28MVW7S1wTk4Ppi1rrosm6Rqxp45TBTqwfMNXnM5rHbhJPg2Q/I2c+ZyyQBXCUN+FfinKkb5JlISCHHxt9CdKR3IHFF4HcEnYHJ13mZ0G4Dg0iw/P6Eswrwg3UtRSpvUpXGXkXnjk1K5C3JBK+g2EB5uxSvUBTNS1AHMT4zcGqZ/0fC8N1fWkviI2RPMqZEAoBLGGZ4I0ZZk3UD8/RduudBTLfHHFx8qo1fvqacabwgZCLqHR+9yO5H0lWZ5r4E9/J/og68LSEya7B2bd3oGuuzmwvXefqOoZ2pdGXVDouoLO+dnK8Za8xzuXT3+PtsiWsD6kl239M7g6zpIbp46N0O9J8UcjnqykfJ/Ovjzzrhlr4WF4D3ZqcWGfqzofJzdoIu4o2YHp5npelIwd0ksXHuxFfbUvCYnRqd5UU5veFYmx3ITUKk/G/lUnoXCZ6ii5BQJZbA68v6Xpm65o2yruvpAsPu7I55+3SDz/KydEoeM6WVBpWTOmOX/vh9Xe2DDhMHzxBmU+LBW4HKpGDEXor5fuhI8OQNhCCi/dQ4uA1P8hLvlyU4Akxq43z+RWxXBJHWJ6DEMqL+uRN1QGKM3f1l/FbQTVgFG6/UyI76KFq9G/oTSIc1pSKvjvQeQjn8pNvlShR2G8sQKVKGbMzC44X7fPi9y8wnNlaZa2SdNzNwj/2OJ6Y3jE6RxudwJVymUrWv8aSdphxrLfnveyrbgozhDRDQxMUBL3Np6fu/gKps64+ 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)(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?B?cS9tME5aYld0WDNlcnFCNHc3K3l0eVNJMVdQTDl3OU8zSFM4elV2cVRTaFND?= =?utf-8?B?WWJnL0wrNGczb1hMRU15YWNMeDgveUdGR3hhQzJEZFFMM0ZpbGRRZ0tWNTFB?= =?utf-8?B?MFhvdmlWRGNJSUIyWjdlVUdLdW85VW1qaWRUdk13K2JYSG1JbjFNaFZVYTRP?= =?utf-8?B?bkRYNHJvMU9adnc3M0RtcVRLUkhNazM5QmlYQnFISC9YcktIbzV1MWgzVjd1?= =?utf-8?B?UHl6YWtiOGphM1p5UnhRK3ltV1NEcXZOSXBneURmcEJDSWtWQ3ZFYmU3b2dS?= =?utf-8?B?T1NyRTZiZmZ2c1BpVWtDWkN0dlBGSGd2dzRUMTFWajZkZEZlaHNGSTRvdEM3?= =?utf-8?B?REY1dWdLKzc2UGFBMUNDOVI0WkVUMmZtWGFKNXQ1Y0owa0dQU1JBRi9ibUx5?= =?utf-8?B?SGt0WXBjUFV2TEMwK3FnU0E0S2RINnF5OUtnbzc0b2NZRVovdHVuN2hmT2Vu?= =?utf-8?B?T3l6MEtIZC9JK0hiWXVlRjQvekd6UHR5cm13ZHQrd21uUmlibWVwcHJOUWt1?= =?utf-8?B?SmZsUFJ3UDVxTld2a0c1WGFZelNJbm9XT3JoMVg4VUJ4MWVjNnkvLzJzWWZS?= =?utf-8?B?WWN1UEcwd3I1VEg0bSt3by91dkR6bFlvcm41OSs4ZXVOZGl4YzRMOFhDVDFY?= =?utf-8?B?NTZZLzZKZW9wN3pZVnRBNS9YTkhlVXRHREFyNDFCQkRMaC83NjRwV0x5NUFk?= =?utf-8?B?QUIyVkRmdUYxRExlWWFkb01ZYmxLY3VlZEMwYUl0bEppMFlRaEhCRkMzZW54?= =?utf-8?B?aXJiTUh3NHFDS1pjN1orV1VFZHpSUHlLUnNoaHFKUFhnM01qckVDMnZJMGxN?= =?utf-8?B?N0FXY0NvcUpTT0UxKyt6Z1k0ODE3NXdpNFJVZlY0WDZSNHlZNVprRTl5Y3N2?= =?utf-8?B?RG5NYmJndDdOMlRwTFlVRndvTTB4MEgxTjFVWG85d0NUZUlHQnk2c2FPRWNL?= =?utf-8?B?N2Z3Mkd4QnV3ZFVQUTRrVjE5SE9ONDdBa2RxaWg5aE9yZVExbEEyODBTQ3lG?= =?utf-8?B?TGdPV05SOVRuVVg5NFJOOUY4bE50bTljQzI0WlZWcWVVVHM5Y0xIOEhhWlVD?= =?utf-8?B?UFBTME8zVUR3ZXZWS0FoVmdUTUxrVU42NURDSlFKYjdNQ3RiaGNqR05aSCtQ?= =?utf-8?B?ZVFucW5Zc0dTVjBpRXJxbkVVSlAvaGNHYm9HUnVZb2RTTnhqZ3NzMGZTWTFZ?= =?utf-8?B?LytzekdiWXRmTXdNM0NBbmsrSzlxTTRVVXluakNPNXdWc0kwZ3ZpOFpqa1JB?= =?utf-8?B?aDRJa091bmJYYWhFVUtqSEVwUENIZUZOMG1lS3J1NzN2V3gySFVUZFZKTW02?= =?utf-8?B?VGdUT2ZiS25qV1FvS1o4cXF4aStKcEluMjlIVENVd1RUSmtsRnlNU3pMNjdQ?= =?utf-8?B?dUVtYTRmd3owVFArUG0xOExMdnhyeW1KWkVja1NXMWgxNnRrcHFBWHF5TDVG?= =?utf-8?B?R3pvYTgvY1FoakZqVjRTS1IwWmIxZHlDMEFOdlpkQUN6VmFFWnk1blR6cFJX?= =?utf-8?B?RThVNjdJSjdZVjdWWjFuQ0ZnOFZpcXFGanBZc3VkZ2MvQTVIYmE2c1VYWFVG?= =?utf-8?B?bzRDV0llVXEweTg5MlpSY2lXYlh6NFZBM2UxRDBJQnZwaExZL2tFZkVlOFhB?= =?utf-8?B?QWxoc1JoQjNqYTFpOUNFdkVMejRNc2FzNDBPZTJwVkpBMUg4KzRsSjlJWnd5?= =?utf-8?B?dHhjR0cwalBrTk9SZU5nWW80NGorY1cwZ1JkU3JjTjB4eU5hWVNlbjFySGlZ?= =?utf-8?B?RG1RaDk5WStJYU5Ba3BqQ1FkYk1DZkRtZGc1NndWRFFBM0xtU1EvR3M3RHpy?= =?utf-8?B?RHFObnAxOEREdGVBbzRSMFoyTlBPQzk2M255L2tvTnhqSmdNano1SURFVUNa?= =?utf-8?B?ZGdkL1lGZms1RXc3cUlaeVhQVVdNMyttbzQ1OXdoVzQwWVlCZDk5dEVjY2hr?= =?utf-8?B?bFBSamNIeWQzWC9nZ0JJeHBtNk4xQUp3a2dLbWdGZWthcElMRWtCMC9kZ29Z?= =?utf-8?B?UnJUK2JBNUVSYitsSGJ6STZETHFYVEV4YnhIQk5Zd1V1T3Qzb2pqbmtIR3hs?= =?utf-8?B?aS9wd2ZGU0tGZ0pkL0VvZ28wTzY0STNkNDBTTitYKzVraVRlVlg1YUNYZkRp?= =?utf-8?B?L3hGejh5YnpVMFEwUUZrV0MzM0prVUVEMXVhRGZ0dEpiRUlNL2ZSMFo3Nmxp?= =?utf-8?B?R0E9PQ==?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: f179eea2-3ecd-432f-e69d-08daaa860174 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:35.6093 (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: KIjNdrEIvXjezMHcdrAZSkLjqgXSGtrvIGRyKxgSudUyRXl43guwb13EGkMlRKMH0PB2X0rDYynTo+JdZ/RkTMnb+5HM3LeH4sMPktUIoxc= 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 IPv6 item. Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- doc/guides/nics/features/nfp.ini | 2 + doc/guides/rel_notes/release_22_11.rst | 1 + drivers/net/nfp/flower/nfp_flower_cmsg.h | 33 +++++++++++++++ drivers/net/nfp/nfp_flow.c | 73 +++++++++++++++++++++++++++++++- 4 files changed, 107 insertions(+), 2 deletions(-) diff --git a/doc/guides/nics/features/nfp.ini b/doc/guides/nics/features/nfp.ini index d4ceae0..9dff34b 100644 --- a/doc/guides/nics/features/nfp.ini +++ b/doc/guides/nics/features/nfp.ini @@ -29,6 +29,8 @@ Usage doc = Y [rte_flow items] eth = Y ipv4 = Y +ipv6 = Y +ipv6_frag_ext = 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 8de49df..5039a6f 100644 --- a/doc/guides/rel_notes/release_22_11.rst +++ b/doc/guides/rel_notes/release_22_11.rst @@ -156,6 +156,7 @@ New Features * Ethernet * Single VLAN * IPv4 + * IPv6 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 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 810f2d7..5b78110 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -539,6 +539,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; @@ -723,6 +728,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] = { @@ -730,7 +780,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", @@ -744,7 +795,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), @@ -771,6 +823,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 -- 1.8.3.1