Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/118970/?format=api
{ "id": 118970, "url": "http://patches.dpdk.org/api/patches/118970/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1666427069-10553-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": "<1666427069-10553-23-git-send-email-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1666427069-10553-23-git-send-email-chaoyong.he@corigine.com", "date": "2022-10-22T08:24:26", "name": "[v2,22/25] net/nfp: support IPv6 NVGRE flow item", "commit_ref": null, "pull_url": null, "state": "changes-requested", "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/1666427069-10553-23-git-send-email-chaoyong.he@corigine.com/mbox/", "series": [ { "id": 25372, "url": "http://patches.dpdk.org/api/series/25372/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=25372", "date": "2022-10-22T08:24:04", "name": "add the extend rte_flow offload support of nfp PMD", "version": 2, "mbox": "http://patches.dpdk.org/series/25372/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/118970/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/118970/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 5B567A0032;\n\tSat, 22 Oct 2022 10:27:30 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 11DF442BC3;\n\tSat, 22 Oct 2022 10:25:47 +0200 (CEST)", "from NAM10-DM6-obe.outbound.protection.outlook.com\n (mail-dm6nam10on2090.outbound.protection.outlook.com [40.107.93.90])\n by mails.dpdk.org (Postfix) with ESMTP id B9F2942B93\n for <dev@dpdk.org>; Sat, 22 Oct 2022 10:25:38 +0200 (CEST)", "from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5)\n by MW5PR13MB5535.namprd13.prod.outlook.com (2603:10b6:303:196::8)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.20; Sat, 22 Oct\n 2022 08:25:35 +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; Sat, 22 Oct 2022\n 08:25:35 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=WmCCAta/iNQmQjtO+0XMsQoJDIBDruVQfQW1YLHVQo/pk/H0WzX9iZ6NBjkrKbNLy+9f+gcqSwCl7BTnB8HpnPIWIxcSrhEwe1M5DMqWsoSLzSnP/EYkZxb1vN/yCDkp9UpbuHFpTjfbbMETSclgTynFgqjaqlpeVP3GeaZsAP5KCeBmvawzUupef0t0DD2FCyzCeHEO2B8Yx4imz5ielhJbps25ehVSp+dTus6HNqIxSwwHPypbsONA4axDfmXqKQnyyuHDQrvYq9lUY7M2XjMdusjeuo++IYb2fkHT518ZAUlMfL4RW89RTtVjWPqOl838yTTYnyzKfG3Y577Xww==", "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=nMtqURS0lMg/8oLT76o776zRa9NoNMKfLetH2x537Ps=;\n b=Z5zXEArbVObr9wfwYZPGm/8uYad+87O4GQL57gs+G2+2xfrN+IkLEX85Wmof+Mq/1a0+LVEgTYUtsX8kkzhKOHsfqCXk+YcPPvPQlviIjOOsP4rYwNfEYVMdmXby+DLUt1GKqdkT0b8OinlNnsd7br3QmRa9r7yLwGEQE6Fcdzej7HAAHveBkzanCtIqxHa9NzCxhOcTwUlwejj/IqU5fBU3NzhGj0gVeU0yHHxCi3yABMgNsdxVLVK1H2WMqryv85aU/lSJZkKmJcUD4DsWeopQ0iay2ouOlaeXeMQDR/4XhKZUG5peFnmRWAVAsminV90UlCzAs9FM9tpuf+4yjA==", "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=nMtqURS0lMg/8oLT76o776zRa9NoNMKfLetH2x537Ps=;\n b=hgTYJD+vvwZITETo6pBH8WOazhScAsytjpDdBPGoBH81N0Kx+GsQE+Y41c2hj2yMDkm4f8/kakXQnkH2ThJepPDkbEqd/NVCp4Bug63biwYw6mAlupMSTjRU/yQLHWeyCSlm3T1+N8XsLRHJQsZnqDba8LhT1pXCdIk2DgE9qTw=", "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 v2 22/25] net/nfp: support IPv6 NVGRE flow item", "Date": "Sat, 22 Oct 2022 16:24:26 +0800", "Message-Id": "<1666427069-10553-23-git-send-email-chaoyong.he@corigine.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1666427069-10553-1-git-send-email-chaoyong.he@corigine.com>", "References": "<1666063359-34283-1-git-send-email-chaoyong.he@corigine.com>\n <1666427069-10553-1-git-send-email-chaoyong.he@corigine.com>", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "X-ClientProxiedBy": "SG2PR02CA0056.apcprd02.prod.outlook.com\n (2603:1096:4:54::20) 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_|MW5PR13MB5535:EE_", "X-MS-Office365-Filtering-Correlation-Id": "fbf7d4a9-6837-4a62-40cf-08dab406fdfa", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n xPM7DQKoFqUdZBBYe3+a2Ri3OrRheXgw8TAYkeGwnH/ZQUDD26lAKEvMRQjNCwguBAUT7KSAE84p3RBA/6wd3z35sdtcppRvSdZkFAMKH/RWz09MjXBr90lSsA44V1EFZHRD0bH7eX/AXoL5COgoTbtyvMd8Hl5+6gcLWn0+MDUve+J7MRxEiycprsQP+dtPRGOFnFRo9N7+QPJZr1MWyUvD11NfFmB2wTgBNaoPHhhP5ljrusBEUPkMSnHdik2W4rDGNZIoWg0yxk3r8mB0HfItbAxsmCaFXePfksZLCQhHXwu0ww4VcBsG7YbRs++ifni/6n+iCT1PrE9Bw6sYe1p+O1tNMfxIsbTEReng3hzNOhBdLbBkLqfSadawBIDm5BcW13p0h9H+cORLir9fwLqShZWGAF3KNO+cSGFyS0ue1QQ/OPYaaOhuU5wxutRogGogFb+6XIdHRWWIf7jjsP+eLWWd4+dHVVj0/KnbokGo7t+c7Q/TPsJx/p5+IJsi6z4Zkz1FU9mGwvsaKmjrhkqJyAPTK0MqqdNFX+ujVYAiA/oNfWHug1nWfpoHVsl7koGi0G5LqwWbDUJ/jDUj9BdRnSGktVjHEz2pWBlJ38ZiLNrNkX1KSGKXtsrPkp7AE6W6YQILONp3iSAwtXG0DgAtAiZNSVrAYsZS3SmdHUL7ypE/S1pre0+u/3e+ZQ6IBPLtoNa56LYLaTUsA4vwzftE8KUU00zx/nMKQl/nJtaxtu9CGbI7zScrDIUnPVvFUIc+1sza9HJpIgVPos0uHQ==", "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)(346002)(366004)(396003)(136003)(376002)(39840400004)(451199015)(66946007)(316002)(66556008)(66476007)(6916009)(38100700002)(38350700002)(2906002)(36756003)(8936002)(41300700001)(44832011)(6666004)(4326008)(107886003)(52116002)(6506007)(8676002)(186003)(5660300002)(6512007)(26005)(478600001)(6486002)(2616005)(83380400001)(86362001);\n DIR:OUT; SFP:1102;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "=?utf-8?q?EGP4IkLCC9WyW2iTXzERqxrgPH55?=\n\t=?utf-8?q?yjQoXNb2oSnkYcgwFi0W9Pfl3SRR14bQXu5VvTTaB5FnC44EKJhWPGU1zIjElAGyg?=\n\t=?utf-8?q?yNMdwG9SEMAr8sS/vK5cjdIV62LeS5dLf0If3tEeCweOKltezACPqy0mf/BF18Xjy?=\n\t=?utf-8?q?FMUHiLe4FKQZLIOBw2Ni4r/mC543NmsRiNWBaYG6QvJ7AUbii+X/DTo0gBfOFuOxA?=\n\t=?utf-8?q?Y38JozzegAuRkoGYt4eedjYgba98dFKC/F8+VbqzWgUBK2Yc5wxi3LUuwM+vDnf6F?=\n\t=?utf-8?q?o9N3eIliWjxlpsaMojfpuWsjegKY1kkXj0unmtColzSY37N9cVX/l5Zj2tc5W9s2q?=\n\t=?utf-8?q?9YHqb3fJUo/0f0FSsTcGH49SghscIaPCBh1fEouwVd+6WxGQDoEta99rcTGA1wU2T?=\n\t=?utf-8?q?vD/ncUvGj1/NRQqEEWeS3D07x1ijrgSX0IDjRWq3TTzUkeLJ+CZq+AsU+qe4C9Xc8?=\n\t=?utf-8?q?hnBHG8ekQicBmZ5rAd6W5aKhEGUtYo4DuIajOBothZK+6Gbw13rkg4VpZkmX/uVnH?=\n\t=?utf-8?q?OFdcyVYbMBluobUT2m58nmJy0DJhguUE60b7HFBow1qGrGXidVlmTKrRu1oQ6UUIl?=\n\t=?utf-8?q?1LyUsG9SgOj+KIsHebi5rIZSCr7L4+nR9kpMQnSc/14kvF+0/bIYjdvseyqikpjOg?=\n\t=?utf-8?q?tbbjkGsYxIEkJ1keHUK78UtiXlV5i9qnmQcbec1y4e6y5cRReeSV2hSbL2tC5fHKu?=\n\t=?utf-8?q?PkebqFm/16DvOXNhEsJMPVszOLlc6cbEFq40kFpCmQcvAjcIekuuVud6xJCL64qFN?=\n\t=?utf-8?q?ncff9s732uoqDW5v6jSUV4UkKcgMxo0+ywGebI6I6LqnB75zLqUAW21/0XwUpFYKL?=\n\t=?utf-8?q?IlN7Dm8+sVn05a4MQe9o8Y8HvgIRa7Aea8Q0UZjI3Irv4CiBumI6Rt2VXpG1JfCa6?=\n\t=?utf-8?q?JT6ShguKWVIm5X8x8owjIoc2alYujS3t2rAPffT3hW+ewtQLNBVNaC8cwFPI8u3qk?=\n\t=?utf-8?q?fi1f5RNDYSW0arhx14ypd1cBcnGVyjzBm6QxKmYZa8MnyBCFhYlzGS7N9bugSsviz?=\n\t=?utf-8?q?oEJcUzLU0lXabuOWa3FBb2PCVv6uehU6USZP0M+oNU6iD+Nro3orRqXn2dO0OLXqD?=\n\t=?utf-8?q?alQyN9/QhOFGEQsel5aQE+3da4x/qQeFqi8I3uCVeWLggPUeNAialCjlNZHuYIBuH?=\n\t=?utf-8?q?5WnZShx5F4lU4tizsVg5PLdj94uHhQnT+NGDD0lD7tnw7deFNdJk+wu2m18GegqEW?=\n\t=?utf-8?q?81YX6FWIHbj1jTqVS7KSmUU0dnOSW1hLXG4md5n0U0FsufjXnZtudsm6g/91jgtoR?=\n\t=?utf-8?q?5DF4gLZWba3M8ZP9bMc8GvMWldiA9y7BoK4iHcKRZtfHbkYZFviDjRQpUI9Cm67rw?=\n\t=?utf-8?q?WWsajTxUwfnb3Igr76d9kdiJJaHYiQauHIdRVOY55c0Ykx4QLrhOekBfBxv4ht98P?=\n\t=?utf-8?q?/zA/nFzO72YnR7t0L3G1dmEEbIOq3JI8cVh6kzyFQFPEzGNTA4KiMTldOdpRIBw3S?=\n\t=?utf-8?q?PJqOhQLVHmM+DmWCs93lKvXUfuPSIVSfWOxaKDLrr6xaofS4vb/tO3p8tPl3K2IUu?=\n\t=?utf-8?q?hs8HrlDewpYpR94ElbkKCmcsB1gmbqZsVg=3D=3D?=", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n fbf7d4a9-6837-4a62-40cf-08dab406fdfa", "X-MS-Exchange-CrossTenant-AuthSource": "SJ0PR13MB5545.namprd13.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Internal", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "22 Oct 2022 08:25:35.1279 (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 rWyqKSKwcnS/UypSG8DovH1z0Gl9kz8oI5h3thvjMrH0Ir9vPtbAWo8ziGXGHqLvdY8TCFEDj8XM6lmWKZcNfl86tEuAEGKhqhy8V/Ptqcg=", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "MW5PR13MB5535", "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 0a43bf3..6f21c86 100644\n--- a/drivers/net/nfp/nfp_flow.c\n+++ b/drivers/net/nfp/nfp_flow.c\n@@ -822,8 +822,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@@ -835,6 +836,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@@ -1562,38 +1574,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@@ -1604,12 +1637,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@@ -1675,7 +1719,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": [ "v2", "22/25" ] }