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 C181DA0093; Fri, 7 Oct 2022 04:20:12 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 414C942B7A; Fri, 7 Oct 2022 04:19:28 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2123.outbound.protection.outlook.com [40.107.220.123]) by mails.dpdk.org (Postfix) with ESMTP id 606E342B83 for ; Fri, 7 Oct 2022 04:19:26 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=STvB1NbjTGM4e1/ByU8IuXzCRs01uwa6so9/568KON58qMaii/XMgylJiVUOdZCzEuTw1Vfctz5appw0ktvzPJrqwxZwJBm7Bws5sf4jmqpvpLauExihDmD44/jbswrvGqs3Fu6H18hredVFlRVpe90FIZ/oCtrg1o2Cv1U6kmrb8NAdKwrPsJm4HyY5VuQSYeeNj6DA25DMWSgAcUoXKEpmuj07rz8gFpIdrkJYhDv+Im0MEkBG1A6fWcYVdZNXG9d/7VSVz6aWxy7gWgjyG3GznMeJ+k7IMK33JhxEs1dMRx0yXVnfBClZSsSsr/OvkMoImidWUfFTuUCcHHARQg== 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=gnQyFjwmjkI4kEaDAzhGchKgbuufVc9VGqYUj5sE1as=; b=SVoUmE0LBlPLWgaXumgoS3kwFSCsEVeHwjnIv8JvCLXmgoVBmBIlDZ8ndlfggkqw7qJgC3xl2EMyivCojGperruWBhuDDfdl5iUIF5QIXLaR1bijZlJ/qZGw2a34z7mDlcf1bMyzRLdfRcRGx1sm62INDYwEWOkpPklXdItTBHx7+HwtcxeIG04kXMieQNFLnC4dU/SYHDyWdh7F7BajAx0nhTuQyL/7vxtRvQNYN3tuvqFa3zoke2ip2caTXn8NqqyLAH27d/q5zzIPa+FzSnwe5H+2HDiHe76+fXdTyox10NhvU69JDz7+Vv+4dV1QAbcIyj56zn9tBo/dcmR8/A== 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=gnQyFjwmjkI4kEaDAzhGchKgbuufVc9VGqYUj5sE1as=; b=CUIE0kfdiW9g8cSfe7W3XDii2E16ANvmNSwaCxmRtETMi5jrRY0+0iHb18dIV6qK67A6zUI/0xHjk9CaPt95Aw8Ny2O2EvwQHW712rC7cqsu3aLsuBLTtqTK3xEYP7qrDfLX4q84Ljn5qnKTQPHhL8iWvbmb9hBTd0GTBdwD6r4= 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:25 +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:25 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH 08/24] net/nfp: add the offload support of IPv6 item Date: Fri, 7 Oct 2022 10:18:30 +0800 Message-Id: <1665109126-16201-9-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> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: 27a62660-1d46-498a-1d07-08daa80a5a69 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gHO6lWKyvK6rAu8hweBh1OtHjH8IKOFqz3G3/8ij1QwM7gbLY4KUSaSLum8ZZVcYfGXRezmq63cAWxDG17bmRc7QvPgfvthiG52hOlQbFiRxcW40+a9uS54uaUkYxA6q/OMnjkyMOyE8d809dt1hiO04VYNZ4hCyNQAkk6OhIIk/7TjergC76uO7kF9lhfinqegGltlraP2fyNB3dwWhWXv3rKUY4J+a92MFF+XKskxREWSE7sRNcaE0qv5j8doUCUVgaE2j+/Ftw8vqqjNTDUmaQPKUpECW/MkoEjxDPtaSqcF7NUdMFAu2Fn9u75zFq2+Odq28ltBK/aWGMMf/ezzo+irgN6ZuqcjJ6Umw5qQ1X2g+mNFHe7ZHafEhUa7iRUp8RtSfKEptnzVZ7TKTMrO7b3VwToJb+FwIbBAQZkceoje8WiMT+KGsLQ9hbf8kKemyKHgd1Rn7GhD2qwnspeI4bPWwd0Oq/4gietJTxqIsqInT5YnY1NmcI8KlrwxykP6GYPMEGdDSzSUFiOMRnRcYyeP8lP7rMHaifvWKTQN5QwQUHPyEq1SZWd9ZB5k/6sYLfA/W7G1bouKU0Aq/3nU3p6f91XNeAaAck0Rsion8AOnpu9j5hOSD9DWBvluED27moQFnKY35fJy2Ih2X2QXOYrHjoq+OtHL0NDvtkfZzxr1n+oDOyPiwBprbHW9qqgxOt0RAVx/pWMnunVO0+/pXNIAakj+6QuUwBb/TmEfCTdoUqtAmX3ia7pLb4S+I 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)(83380400001)(52116002)(478600001)(41300700001)(6512007)(4326008)(107886003)(26005)(2616005)(6506007)(316002)(6666004)(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?B?Vk84RTRwZmJUSm5ZdWwzcnUzK1RrZysyd2hnMXpxSWNCcEltbUpscUtYTTho?= =?utf-8?B?SENRSjRwVnVTc0pYenphNW12VG5IZ2ZtMXdyQUtqUFNiTEc4VmY3ZjFjblFG?= =?utf-8?B?Q2lTb2VvTGw4OVo1Syt2cFpUNUhYdHRqbTFBNE1yMUZCd01pQnFiRUVucmlO?= =?utf-8?B?MlNkTjEyTk91L3cxcEc5UFZvMFJoVGY5Z2Uxa29lK252Kys3M0hUbXhLWm5G?= =?utf-8?B?ekVEemowcys5TzhaTnRNYU0xMW82Qk4zeWdRa2k3NVk4aGk5M1dFSlZlR052?= =?utf-8?B?MjV5MEFCdEhZSTcyVjhGbzFtNWF0djJyTnd6cEtXMmtUbzh3dk5aZzBNdUh3?= =?utf-8?B?cFZvMFM4TFlzZkowOENmcks3aG9IK1RCbnhJN2F1cGRoNEtVYnNmeFZsOTJj?= =?utf-8?B?bnhYZVREMmxBc3RhUEk1czdhVFliNFV0U1VveE00RUdHQmJsZTdaaExEejBZ?= =?utf-8?B?UDV4NzVuUHdSZkZEUnpVelJTOTlrcG41bHVWNHYybDBaL0hxOXJpWWxrTC8x?= =?utf-8?B?eU4wdDl0Zm1KVE9lMUxQeldFK0xqdG9TRFNVaXJKOGgvQnBsbU9JTGJNUWMv?= =?utf-8?B?VWVlTEp0TExpam5pUnZEZVg0SU82emVTYXgrOEtLUHR0VGh5SnlRaUIvYlZG?= =?utf-8?B?Z0RDdWNBbm9RVmlpNW4rNEVJSTlJUDRVa1RhQ3BjSTZMOXAzM0pwS2hrc3hG?= =?utf-8?B?YXc2SzVQTEg0NnNtT1FTeUdYdEtjS0xtWFA5c0RHaVU5YjBPNnlWYytuSTh1?= =?utf-8?B?MmtqRjg2SU9ETDRWV1g4WVBDWGxiWUlUQ3VnR0dpcndMaTZwUVhjREk4b1hW?= =?utf-8?B?RHJURDJ5RjRnZEl1bUNjSFBpR1NwTFNLdHJYNzZOdHhPTDdIdVoyVW9PQTI5?= =?utf-8?B?N3lIc3lieisxVXNuYjdaN2pLditBUTlYN2hURFpOQXlKOVZxRFdzN1dWbHkx?= =?utf-8?B?RFVhN2E1dzVIazBlL3VkRXVIb2dnZ042eGdwWm9kL045b3BSU3gyUThIVm5M?= =?utf-8?B?UUFWT0dYWmdhc05JUFE1VzdZUEtpNFhtUHg0TUE4R0ZzZm5meUtIS2hUU0JI?= =?utf-8?B?NHk2YTV0dU4wN2ZjVVlLb0JzdkR0Vkl4ZmNIMytTQlV6dGU2clYwTmkyVFND?= =?utf-8?B?amhYek81Z0xqVmVDQnpHK2YzUDlOcTZYRFN1SmdLbFhiMGVDdzFSRkwxbDFJ?= =?utf-8?B?QmpveEM2aTRSVlRLa3o0YzR4c2hJR3prSlBLejloYlZDRmRyYTBxNmV6UXZJ?= =?utf-8?B?cmplR0tWZE4zcTFlUlZMUUJrTytIbWt0dEtvMElIdGFvd3JsMDBleVVGNFc3?= =?utf-8?B?MWdnei9ZRjU3VDFzQnZudGVsSmpJMllEYUNqNGF5RzlhQ2RnVHJDRm4rWU11?= =?utf-8?B?Y0VEK09UcmpRMFNNU09pTitrOEJoVGkzQ3k4aUtzZ3ZBWDZienJJSFNkc2JN?= =?utf-8?B?cVU4QjVuK3JraHNGRnBXNUY0b2ZYZVFGd2oxM2diWGs0WlNPZVZ3UjhDYnVq?= =?utf-8?B?K0I3UGttYTNuejh0MEpCdTA0R1Qxc3poYkdhRCtidDkydUZldDBVSjUzWHpT?= =?utf-8?B?WGJUKzNwLzE3NndQaWpwSmY2VmE0SVVUS2tOVUF3TkVYWnRsVnBoTzRLeDJN?= =?utf-8?B?SDN4QXUyNFF1Q3haMTZDaVh3T0NlQm13Wnk5bnZSU1BHZ3VYNW5pdkpPVGhz?= =?utf-8?B?K3Jqa25QbU93OEVNeEh6ZWJya2FqM0wzVUllSFVMYTR2d2kxeXhKUDMxSEFW?= =?utf-8?B?eGJFMzQ2cG1PMEJTazB5MGdUVjlyMHhTeWwrbUQ2c25CNTA0RndMdHVkZzJj?= =?utf-8?B?NGFOZWVGdXZBY2g3OU5zVlVUNDMzSGhUamZjcU9GcWF0dnNvelI5Um00bHd5?= =?utf-8?B?NlNRcS85MGRhMFFXZzdTSmFBb2w4eHJLQ3FxQXNDNStzWlVhNUV2Mm1zM2pp?= =?utf-8?B?QjE3ZlBrYktrTU16cmwrWTVLd2pCdkdFSmZNeTVkcDg5RTl0cTJ5SitKa0NL?= =?utf-8?B?VnhyUjFZMHh1SERlK0Nyd3NnR2FlTEYvd1hRdVpMM2VNRG4wd2lpSytVN29D?= =?utf-8?B?Q1pFMUVPekVmNlFxdGYrQWRtRFdRRXRjYWttYlBoZy9NdGRjaXluN3c2bWtW?= =?utf-8?B?TGZ0ODdQN2V1a0I1c0E5bGdHaHNLUDRTY1BNMWU3WkF1SHpHYVhLM0NhODdl?= =?utf-8?B?RUE9PQ==?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 27a62660-1d46-498a-1d07-08daa80a5a69 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:24.9135 (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: +lt/cexKspcQh2afr7tuPyLE+kD8CWvItFNBpRJ7yU56X049jPB0mRVFhSW0PbVw1YDPECeUKl2G4ggREHGC1vOFSt0Jib9qBAKD5eaho/Y= 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 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 5eb40df..e794e11 100644 --- a/doc/guides/rel_notes/release_22_11.rst +++ b/doc/guides/rel_notes/release_22_11.rst @@ -110,6 +110,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