Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/118334/?format=api
{ "id": 118334, "url": "http://patches.dpdk.org/api/patches/118334/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1666063359-34283-23-git-send-email-chaoyong.he@corigine.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<1666063359-34283-23-git-send-email-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1666063359-34283-23-git-send-email-chaoyong.he@corigine.com", "date": "2022-10-18T03:22:36", "name": "[22/25] net/nfp: add the offload support of IPv6 NVGRE item", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "7c6336e482c810337ab042b363dbebfc74a72465", "submitter": { "id": 2554, "url": "http://patches.dpdk.org/api/people/2554/?format=api", "name": "Chaoyong He", "email": "chaoyong.he@corigine.com" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1666063359-34283-23-git-send-email-chaoyong.he@corigine.com/mbox/", "series": [ { "id": 25269, "url": "http://patches.dpdk.org/api/series/25269/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=25269", "date": "2022-10-18T03:22:15", "name": "add the extend rte_flow offload support of nfp PMD", "version": 1, "mbox": "http://patches.dpdk.org/series/25269/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/118334/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/118334/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "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])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 625FDA0560;\n\tTue, 18 Oct 2022 05:25:36 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id BF29142BD8;\n\tTue, 18 Oct 2022 05:23:50 +0200 (CEST)", "from NAM04-BN8-obe.outbound.protection.outlook.com\n (mail-bn8nam04on2115.outbound.protection.outlook.com [40.107.100.115])\n by mails.dpdk.org (Postfix) with ESMTP id 906EE410E8\n for <dev@dpdk.org>; Tue, 18 Oct 2022 05:23:47 +0200 (CEST)", "from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5)\n by MW3PR13MB4122.namprd13.prod.outlook.com (2603:10b6:303:5a::17)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.8; Tue, 18 Oct\n 2022 03:23:43 +0000", "from SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::7c26:1a0b:2825:6f4b]) by SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::7c26:1a0b:2825:6f4b%4]) with mapi id 15.20.5723.014; Tue, 18 Oct 2022\n 03:23:43 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=gEaqORcxUYU6jaCF4M7YjPi7wv0emm9THHmx1DlNe/DiS0lI7GTNspr6MWyFyKJEdEeOxEq+3i0Wjl99qOnvFXmswANjXk7SYX3ZoE5V7uL+hmmN0Dh3a7j4xvAjFSlAlLTbRnPuruuFQP1jmpc1V1dhzzrN1fihZiN0C/E7/xA6vkfPpeXBLr3pzj6SL22rrFlJ0eC7vSgv1ubXTMFBKzqtlldHrL15qewdb7VfbENrXL9WpIiJb9S08HgPquQcvvl6ma9J/8YP2Y/R+DAQQbdXgS0CWC3IBSUgAS6Ns0L/6MGQOK/rONZX9sDbJcaP00e98Eb2lZmqe7HLz8uZqg==", "ARC-Message-Signature": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;\n s=arcselector9901;\n 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;\n bh=JuNdgcWt29KnOLvRrPv66rpc1XoLw0Nd3aQodmRcmdg=;\n b=YwLEOrfz41HCNuWO2OlY5A0aS+DVfsURJXqoBPg3vo/PofucAUSbeszEGrDrXwh4Vx6Jneg4fJFTPFAhI6DSDZ0X4bH6wN+p10ItmIo7H4ehi2bnZ7/PKjFU6gNOIfslDS4q2jc1geCtmkBsXjs1cKSRWxZvsTtU+PCzUOpfZ6yccfSZBxFuPZJf89aJ5zOZNZ5I2VRtSOcyYahR6QZbAQZvydwJ1w7KTL4gEZfec2hnvNDsB0MULTkBirDd2UNIUFZHyOjUqxitbJZRUDRjFQZVBkQ/BqqFP3UJF9O41QEjsaiCjTik9d9dfBd7/1AhQVM4pw0AASiz87aqOMOEzg==", "ARC-Authentication-Results": "i=1; mx.microsoft.com 1; spf=pass\n smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com;\n dkim=pass header.d=corigine.com; arc=none", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=JuNdgcWt29KnOLvRrPv66rpc1XoLw0Nd3aQodmRcmdg=;\n b=d0b51xqgpFZWxHbZGgJ/PSixjvY5dnnM3JmnZ1RYdt/gQPlBv46e6zNKZpJcb93ScsVGv/bSo1Fm+FqCW1dHfJojra/8Rvnwv6XIT3EM4nyFr3oHlJCUJkDasZdhBh8cryT/r4NdhMkqfBU8db9nVCpjcfvWuU4lIu5vhk0sjXI=", "Authentication-Results": "dkim=none (message not signed)\n header.d=none;dmarc=none action=none header.from=corigine.com;", "From": "Chaoyong He <chaoyong.he@corigine.com>", "To": "dev@dpdk.org", "Cc": "oss-drivers@corigine.com, niklas.soderlund@corigine.com,\n Chaoyong He <chaoyong.he@corigine.com>", "Subject": "[PATCH 22/25] net/nfp: add the offload support of IPv6 NVGRE item", "Date": "Tue, 18 Oct 2022 11:22:36 +0800", "Message-Id": "<1666063359-34283-23-git-send-email-chaoyong.he@corigine.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1666063359-34283-1-git-send-email-chaoyong.he@corigine.com>", "References": "<1666063359-34283-1-git-send-email-chaoyong.he@corigine.com>", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "X-ClientProxiedBy": "SG2PR01CA0184.apcprd01.prod.exchangelabs.com\n (2603:1096:4:189::9) To SJ0PR13MB5545.namprd13.prod.outlook.com\n (2603:10b6:a03:424::5)", "MIME-Version": "1.0", "X-MS-PublicTrafficType": "Email", "X-MS-TrafficTypeDiagnostic": "SJ0PR13MB5545:EE_|MW3PR13MB4122:EE_", "X-MS-Office365-Filtering-Correlation-Id": "220f2825-0285-4355-3dcf-08dab0b828bb", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n mDgabfRRNrJ+Byg/xyJ7MZEB8jEzFIGkjLIoN+xhraf5WlZHYhaqHOQBR7yrhDaNRJV2XmHCDW89Hs0hMK6d7FILvxMI6q1SZxlA+jBLtQmnIa8Ez2w3b/ia6UfYr1NJYml/lK6luUGZwvVtxDMadiu5uSL3d5eGctQLXWxhaWGvqUzCWMgKF1h0Lwd2GK1C8JfvpsP9eh7inu4yE5E77F/CS1efgKazIaflK7mMdrkSK9vVLNuKnSf/KHZKeGsOVFGw+C4KJ+/kkRGX6aRdMMA+Kfa1dpvYRqANwGWIerTgs03AgqK2Hk4v54i38pcn3wvDAcqGaeer1FpwGrW0bCLVvZeFmUwUMxSzk8W8fCDO2hft/ihv6j+/UcHEZG0gFT0/+9LVLeZP5py12CXRNSrvVfTBS6c5GqJOSxntcl9fC0BRIKRLqZDUCQJgnTMu55QjVHH455J9wILyJV9pKTPeC+JnGr9fIVDoOhsBa+zQ99RBOPGHZOL5yLwu4zslIXPvDteoX81/m5QsqpRC8MQj7Pi0N64l19PZ9g4oqROqQsf/2O+PWdl7OFDA/gzb3J4CTPjMtxAjV9GNl87ErLtbF4T+ChGppPHabj2992z5z4/tnUiRluQqxjKbstr0WZoU5udW1jfxIQ/Z/lCpQYcyhSuYxfZLxJGNHFhglk4BHs5kzrelpzJQpudL2C/Tf2mDTk9OjgXJ+FQb1hRjg7L9uxVJtYkxCg0/PtmwKQfUDtqK8RYB4+Qh9eErR2z1avtYnUxAU52D4gwLx/tNrkfAwH0TTWJZgtoHtgihdj4BFt37NJd84U+yL0yILIEh", "X-Forefront-Antispam-Report": "CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:;\n IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE;\n SFS:(13230022)(4636009)(136003)(346002)(366004)(376002)(39840400004)(396003)(451199015)(38100700002)(86362001)(38350700002)(4326008)(8676002)(66556008)(66476007)(66946007)(316002)(6916009)(5660300002)(44832011)(41300700001)(8936002)(2616005)(186003)(2906002)(83380400001)(107886003)(6666004)(6486002)(478600001)(6512007)(52116002)(6506007)(26005)(36756003);\n DIR:OUT; SFP:1102;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "=?utf-8?q?ClJR2yVdfmWapWpiV1RRJ2InSag2?=\n\t=?utf-8?q?BkqTBfMKvvk5tCp/ONt+2DmCxEfovLkSaeKPeQ/SVR9AahXQN9OuyI1J9w9jZTr6w?=\n\t=?utf-8?q?B8TihGUESBqiD7SLzEeV0DC1mBOIgV8jjZcekqcLnMGKC3zknpvK9cMNjQA0K3yCv?=\n\t=?utf-8?q?mrYMefOYSFIfccwsbw7FLKyfoLfhngg5lbWo2sdxtkxKeJHI4/Lv+SXmbsezN7byg?=\n\t=?utf-8?q?Tn0oidztik26dELijY3Fi1i+cabWqTWiNzojee+aaJJMHCbD9anVEynGJlIIzeeHl?=\n\t=?utf-8?q?ogd0dvX/UmawN9EI0hahFmP/ELKl79NSI1dQdlrzzDmTvF7qwdxPDuU8L8kKwfWPP?=\n\t=?utf-8?q?Us1TsCL2Q4ECPVI4IGRTIhrtnxogvETBhGx0V+/l8UX3F8wEtx99nrhS3QoAEJaiv?=\n\t=?utf-8?q?xMOIqsvOlUS24Afr8L2N8r/bE/SKSy8zt6rkhHaRaasFFkZqTNuddBmZlkNGsMj9k?=\n\t=?utf-8?q?DqjMaDrr22z6LDS05xhgwKdJFc4gK9nYfjr/kCoSV/q4tpI7OUPKqI+R0dNasijmS?=\n\t=?utf-8?q?1USHA9sh7I+G2gTnLpFEgxix/MU+wCukT3uxKZihLunjacM/Ql+V/+XUOY/5yehTH?=\n\t=?utf-8?q?WKE3b0Y28Ws28xjic1XIXg+klI23Dj1h1lMsPI+UDHq4cTO/LXHu4Qxx1olMky0bu?=\n\t=?utf-8?q?gL4mGxkRwL2cxl3cJIJbEXBWq+zBpRBlmOoB83UWeQteh29pigjBHYp9hZIAEtQjp?=\n\t=?utf-8?q?lGf83nhz70u4ZeACcNvDQ6VKyTQsMlvKb2JyEGZ6vXpswE1yvguObKY7UkmqXY+t5?=\n\t=?utf-8?q?LumlNH68vUfYo6Bo+FJF0i1plWfTG6hMX9SzG+bmO7YDZWFwKB2jLCaaBa2pADf7u?=\n\t=?utf-8?q?nFCVnusxBapD8M6cVrSNIdD965TIGnBRiWZqGAWPTn2urWP1Ra/G9vyJqzEC2aJFn?=\n\t=?utf-8?q?e9pFzjUei6l3vJQVfUXaED8I0WgdBOeoVzxWFyGXYxlIP3jRql/YwrivYGbCM2yxa?=\n\t=?utf-8?q?KO/mZaAiqJvDCaQw9pTWj9lj46eGu4CcZUt1DMlAAfLNjaoG4IdfA0qDCGpiUpCkq?=\n\t=?utf-8?q?LpU3GdfApkZUH1WZlLLlguHhw2b0wgPY/logKKzllaZIcGIzYUCSKd98aj1FCZE3P?=\n\t=?utf-8?q?QmQeqq63yxFEpprBzNZSmbqUyau00ahFXUGa2JmTzfxwvrI0ytZotdDLFAc/K1/jR?=\n\t=?utf-8?q?HcafIDANmHGxRWyK7Qd+aKFaZF3lOvMQ6ErcA7VeHSTJhHld7nI1JOuhvRGJp7209?=\n\t=?utf-8?q?w2/tfFdcE4TxXudkCDFmH5kYnwCqjTmQrWPPGuqgCiy8lzmuj3n2weZvWdHvKt5Tk?=\n\t=?utf-8?q?xwB6TX5XabyeGfuM/i74e42Ldzskl9E5woeTu0vLQMElCRunRf42xT3xEC72m6APK?=\n\t=?utf-8?q?fG5V9z6hcDwCjW/uW3EjnoLBTIojrGpzLIgdyOnppK55gX2mjDKaC1lRgJhiFyYei?=\n\t=?utf-8?q?Kfxuj5oe9hA+UvGYrw7EiesOZYvAkpvxjMwMDhVBLhD6XzxuFth1Xaa09GaVjl+Jl?=\n\t=?utf-8?q?8A754flecx+LShKDSMAYezW/JOEjcHCGzEzkG0R6QYlRzn8nJb5vECfhLfTrK3kUZ?=\n\t=?utf-8?q?BMVWTsVPDuVPFDGjVMBq0gOXBEYes4AWSA=3D=3D?=", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 220f2825-0285-4355-3dcf-08dab0b828bb", "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:23:43.1583 (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": "\n zHqDS0xmUoth5cODwizOmVWkD8+LIEshuHd2OqV4NQk8kP9Dn0M3VsGzm4y3wNlxOnJVqmNHcXx+DE1jLq4W67jc2b4742kU79JXsrn8KdA=", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "MW3PR13MB4122", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "Add the corresponding logics to support the offload of\nIPv6 NVGRE item.\n\nSigned-off-by: Chaoyong He <chaoyong.he@corigine.com>\nReviewed-by: Niklas Söderlund <niklas.soderlund@corigine.com>\n---\n drivers/net/nfp/nfp_flow.c | 73 +++++++++++++++++++++++++++++++++++++---------\n 1 file changed, 59 insertions(+), 14 deletions(-)", "diff": "diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c\nindex 94d7a27..9464211 100644\n--- a/drivers/net/nfp/nfp_flow.c\n+++ b/drivers/net/nfp/nfp_flow.c\n@@ -834,8 +834,9 @@ struct nfp_pre_tun_entry {\n \t\t\tbreak;\n \t\tcase RTE_FLOW_ITEM_TYPE_GRE:\n \t\t\tPMD_DRV_LOG(DEBUG, \"RTE_FLOW_ITEM_TYPE_GRE detected\");\n-\t\t\t/* Clear IPv4 bits */\n+\t\t\t/* Clear IPv4 and IPv6 bits */\n \t\t\tkey_ls->key_layer &= ~NFP_FLOWER_LAYER_IPV4;\n+\t\t\tkey_ls->key_layer &= ~NFP_FLOWER_LAYER_IPV6;\n \t\t\tkey_ls->tun_type = NFP_FL_TUN_GRE;\n \t\t\tkey_ls->key_layer |= NFP_FLOWER_LAYER_EXT_META;\n \t\t\tkey_ls->key_layer_two |= NFP_FLOWER_LAYER2_GRE;\n@@ -847,6 +848,17 @@ struct nfp_pre_tun_entry {\n \t\t\t\t * in `struct nfp_flower_ipv4_gre_tun`\n \t\t\t\t */\n \t\t\t\tkey_ls->key_size -= sizeof(struct nfp_flower_ipv4);\n+\t\t\t} else if (outer_ip6_flag) {\n+\t\t\t\tkey_ls->key_layer_two |= NFP_FLOWER_LAYER2_TUN_IPV6;\n+\t\t\t\tkey_ls->key_size += sizeof(struct nfp_flower_ipv6_gre_tun);\n+\t\t\t\t/*\n+\t\t\t\t * The outer l3 layer information is\n+\t\t\t\t * in `struct nfp_flower_ipv6_gre_tun`\n+\t\t\t\t */\n+\t\t\t\tkey_ls->key_size -= sizeof(struct nfp_flower_ipv6);\n+\t\t\t} else {\n+\t\t\t\tPMD_DRV_LOG(ERR, \"No outer IP layer for GRE tunnel.\");\n+\t\t\t\treturn -1;\n \t\t\t}\n \t\t\tbreak;\n \t\tcase RTE_FLOW_ITEM_TYPE_GRE_KEY:\n@@ -1580,38 +1592,59 @@ struct nfp_pre_tun_entry {\n \n static int\n nfp_flow_merge_gre(__rte_unused struct nfp_app_fw_flower *app_fw_flower,\n-\t\t__rte_unused struct rte_flow *nfp_flow,\n+\t\tstruct rte_flow *nfp_flow,\n \t\tchar **mbuf_off,\n \t\t__rte_unused const struct rte_flow_item *item,\n \t\t__rte_unused const struct nfp_flow_item_proc *proc,\n \t\tbool is_mask,\n \t\t__rte_unused bool is_outer_layer)\n {\n+\tstruct nfp_flower_meta_tci *meta_tci;\n+\tstruct nfp_flower_ext_meta *ext_meta;\n \tstruct nfp_flower_ipv4_gre_tun *tun4;\n+\tstruct nfp_flower_ipv6_gre_tun *tun6;\n+\n+\tmeta_tci = (struct nfp_flower_meta_tci *)nfp_flow->payload.unmasked_data;\n+\text_meta = (struct nfp_flower_ext_meta *)(meta_tci + 1);\n \n \t/* NVGRE is the only supported GRE tunnel type */\n-\ttun4 = (struct nfp_flower_ipv4_gre_tun *)*mbuf_off;\n-\tif (is_mask)\n-\t\ttun4->ethertype = rte_cpu_to_be_16(~0);\n-\telse\n-\t\ttun4->ethertype = rte_cpu_to_be_16(0x6558);\n+\tif (rte_be_to_cpu_32(ext_meta->nfp_flow_key_layer2) &\n+\t\t\tNFP_FLOWER_LAYER2_TUN_IPV6) {\n+\t\ttun6 = (struct nfp_flower_ipv6_gre_tun *)*mbuf_off;\n+\t\tif (is_mask)\n+\t\t\ttun6->ethertype = rte_cpu_to_be_16(~0);\n+\t\telse\n+\t\t\ttun6->ethertype = rte_cpu_to_be_16(0x6558);\n+\t} else {\n+\t\ttun4 = (struct nfp_flower_ipv4_gre_tun *)*mbuf_off;\n+\t\tif (is_mask)\n+\t\t\ttun4->ethertype = rte_cpu_to_be_16(~0);\n+\t\telse\n+\t\t\ttun4->ethertype = rte_cpu_to_be_16(0x6558);\n+\t}\n \n \treturn 0;\n }\n \n static int\n nfp_flow_merge_gre_key(__rte_unused struct nfp_app_fw_flower *app_fw_flower,\n-\t\t__rte_unused struct rte_flow *nfp_flow,\n+\t\tstruct rte_flow *nfp_flow,\n \t\tchar **mbuf_off,\n \t\tconst struct rte_flow_item *item,\n-\t\t__rte_unused const struct nfp_flow_item_proc *proc,\n+\t\tconst struct nfp_flow_item_proc *proc,\n \t\tbool is_mask,\n \t\t__rte_unused bool is_outer_layer)\n {\n \trte_be32_t tun_key;\n \tconst rte_be32_t *spec;\n \tconst rte_be32_t *mask;\n+\tstruct nfp_flower_meta_tci *meta_tci;\n+\tstruct nfp_flower_ext_meta *ext_meta;\n \tstruct nfp_flower_ipv4_gre_tun *tun4;\n+\tstruct nfp_flower_ipv6_gre_tun *tun6;\n+\n+\tmeta_tci = (struct nfp_flower_meta_tci *)nfp_flow->payload.unmasked_data;\n+\text_meta = (struct nfp_flower_ext_meta *)(meta_tci + 1);\n \n \tspec = item->spec;\n \tif (spec == NULL) {\n@@ -1622,12 +1655,23 @@ struct nfp_pre_tun_entry {\n \tmask = item->mask ? item->mask : proc->mask_default;\n \ttun_key = is_mask ? *mask : *spec;\n \n-\ttun4 = (struct nfp_flower_ipv4_gre_tun *)*mbuf_off;\n-\ttun4->tun_key = tun_key;\n-\ttun4->tun_flags = rte_cpu_to_be_16(NFP_FL_GRE_FLAG_KEY);\n+\tif (rte_be_to_cpu_32(ext_meta->nfp_flow_key_layer2) &\n+\t\t\tNFP_FLOWER_LAYER2_TUN_IPV6) {\n+\t\ttun6 = (struct nfp_flower_ipv6_gre_tun *)*mbuf_off;\n+\t\ttun6->tun_key = tun_key;\n+\t\ttun6->tun_flags = rte_cpu_to_be_16(NFP_FL_GRE_FLAG_KEY);\n+\t} else {\n+\t\ttun4 = (struct nfp_flower_ipv4_gre_tun *)*mbuf_off;\n+\t\ttun4->tun_key = tun_key;\n+\t\ttun4->tun_flags = rte_cpu_to_be_16(NFP_FL_GRE_FLAG_KEY);\n+\t}\n \n gre_key_end:\n-\t*mbuf_off += sizeof(struct nfp_flower_ipv4_gre_tun);\n+\tif (rte_be_to_cpu_32(ext_meta->nfp_flow_key_layer2) &\n+\t\t\tNFP_FLOWER_LAYER2_TUN_IPV6)\n+\t\t*mbuf_off += sizeof(struct nfp_flower_ipv6_gre_tun);\n+\telse\n+\t\t*mbuf_off += sizeof(struct nfp_flower_ipv4_gre_tun);\n \n \treturn 0;\n }\n@@ -1693,7 +1737,8 @@ struct nfp_pre_tun_entry {\n \t[RTE_FLOW_ITEM_TYPE_IPV6] = {\n \t\t.next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_TCP,\n \t\t\tRTE_FLOW_ITEM_TYPE_UDP,\n-\t\t\tRTE_FLOW_ITEM_TYPE_SCTP),\n+\t\t\tRTE_FLOW_ITEM_TYPE_SCTP,\n+\t\t\tRTE_FLOW_ITEM_TYPE_GRE),\n \t\t.mask_support = &(const struct rte_flow_item_ipv6){\n \t\t\t.hdr = {\n \t\t\t\t.vtc_flow = RTE_BE32(0x0ff00000),\n", "prefixes": [ "22/25" ] }