Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/118967/?format=api
{ "id": 118967, "url": "http://patches.dpdk.org/api/patches/118967/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1666427069-10553-21-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-21-git-send-email-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1666427069-10553-21-git-send-email-chaoyong.he@corigine.com", "date": "2022-10-22T08:24:24", "name": "[v2,20/25] net/nfp: prepare for IPv6 GRE tunnel decap flow action", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "9d864923b94804720c5ba0c1098d8c68060e0bad", "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-21-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/118967/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/118967/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 EED43A0032;\n\tSat, 22 Oct 2022 10:27:10 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id AEBB342BB4;\n\tSat, 22 Oct 2022 10:25:39 +0200 (CEST)", "from NAM11-DM6-obe.outbound.protection.outlook.com\n (mail-dm6nam11on2138.outbound.protection.outlook.com [40.107.223.138])\n by mails.dpdk.org (Postfix) with ESMTP id D997E42BB7\n for <dev@dpdk.org>; Sat, 22 Oct 2022 10:25:32 +0200 (CEST)", "from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5)\n by PH7PR13MB5454.namprd13.prod.outlook.com (2603:10b6:510:130::22)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.8; Sat, 22 Oct\n 2022 08:25:30 +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:30 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=DlOsom44xmW/YqZwBb47lypUEONrOpxE7Kt8n2LQifjPHQJakqwT2upm4a0rXpz1XkHR57lB0nM2RgKuCeS7GQgvOwLZjAuTAEyacISh/n0jp4mHXb0FZC//6J7zAIpYIbpTSSbVIwj5N/TulxAHPRrLwLkLO/z5UT4I2zFph2Y6i2U99Iy/JIe8peZmeXTcNde7j7z/uzqch+yQe5Vn+Nx4vyPGZhEA5fnTtPWMol1CxzUAaTCgLcsDKEb+zmSKkmJuU4GtdjLVyGAmzQNoywTKTtdYcdWvobX9VSSp+/Nncn9HFwFRfMG+CwjuxoiartKYMs1yuqyOOQphuOso5w==", "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=8xwzoQu2xoK/HMe1RMuGKafDtzGFC1SAFSTFZQj/A7w=;\n b=Od0HSjpWVrNDhhnO3BpXsQxJXnmJwIyCxZXVD6evCMTRL+HCHLGZ/FpmYJ0sxHkxVlhZ3bbqxp+GJBmZEgmLkFQIrHpiXbsXmSzbxpGd2LGSWTfT+uHjLeF+ORy49ijqllN3iOJw8DOq6xrRFJFNnbJ79nhPB2SvXyxe098nQ+DIH9nO6Wac9t6ZgtUidKCexul6uLBiEZSSirS+uxkk6GBEog67E1JCyPUgRq45v/5ohZJ9ZdVWni6NXZZYoHiYigghoeiSD99nkw8iEQB++4x0uucD4G/7Qy2hLMB8B1YsY7g3Ztc4AXna0bmk0eLr4p+ETL8g11g1zaG7hWVjeg==", "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=8xwzoQu2xoK/HMe1RMuGKafDtzGFC1SAFSTFZQj/A7w=;\n b=tVsR+UxRU9zyvTH4et7JtnQbxT0WIS4wC9j7oNntdZB6sS4d4HetyqXHwQi/p4cdgRM/s3cdPCn78WZZwz86+myqyGUuYkNP+uxxDba8luLZ0iAlXPCkqQ9iZXjC/2+mrXsY+DSwVEqxQmQPzIjftf+RdjOtqFiwA5mGquJFLJQ=", "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 20/25] net/nfp: prepare for IPv6 GRE tunnel decap flow\n action", "Date": "Sat, 22 Oct 2022 16:24:24 +0800", "Message-Id": "<1666427069-10553-21-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_|PH7PR13MB5454:EE_", "X-MS-Office365-Filtering-Correlation-Id": "8d37ab3a-61e4-47a5-9b45-08dab406fb20", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n VH/gydqhSwEEQdw2qYfoO8MkorHFnlDNOc7HQlAz8+lMOWDlyWtDJaotnhR8mwYC3QEE8IiOIa4Fo2WTz3I49gSaSp3o9ZpslSFSP5kGokvph1GrktU0Be69lQrQfTKFu+LHZ8D9/38nGlL2crtq1/2Ybmh67+LlsgSgxa2QlEEZn1wiTa2oRUqpT2UFJRrZj46oc1WF/xfr4R/PUe0d3u4AsiqtY/EEA1PJhYqUKFRf2PnWUuIAKtqweGa+CQciOoT5sUzIcGLjVA/zzmMr4EGpSzuX8g0x0Xde9w/A8UXCmSqYztz8HLDUoRkXksuw4f9+srSIKXEuyP0lN9bbEIt0woL/YIHcJrGY0EjOT4V8oikv1JnPXX+U+HFxliYFWLCYm0UunIv+oae3MNadYcytDQG27JC0+86Tl8YKYvcj/MlTYJr+PxQ003L+mhIrLlQdCfp+LNHmxxMSgmi010xalS65CtRRgyVf/hvv9ifLmUv4UZBW1b5tfsfUhn11yjjTczK8Nw0/aDiw/NirZtPkEUbNMBxa1Tnvt4ehu6Lt7HSCL42lkkqIAfl2XG1IBg+1WEORKNRIgptBbNCsG8ZebUntTRdzKE9pufK0EmZUS69V6PLgUf/ZouXN2bOjv02BF6AX9c5Q1gXsehKhI3f87qMrDKbE41ACjjMoWvoZDtoQLqHlYF9RMLey1ybNe474SeVV5H7IPtDoNS/ejoH6x5StHwHgHTsRWDDgCrXtZx/eFW12Xm1uMm1T6FTSrPSScIidgpsKjyTLVLzroR1qLHWlyUbIiUB4rx3FhUbwEx3CRVik090SlkabLWXL", "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)(376002)(39840400004)(136003)(451199015)(186003)(6916009)(316002)(83380400001)(2616005)(38350700002)(86362001)(44832011)(38100700002)(66556008)(5660300002)(41300700001)(107886003)(478600001)(6506007)(6486002)(6666004)(8676002)(26005)(6512007)(8936002)(4326008)(2906002)(52116002)(66946007)(66476007)(36756003);\n DIR:OUT; SFP:1102;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "=?utf-8?q?3cmg1lI40fJCiJFKviGcmZdz2uI4?=\n\t=?utf-8?q?CbLvR9PfJq8EFcNCmeZ4Wb4VWulIdzax1rwLi42t8bO8XIJxDYnbHL8KJd5Gh0GVF?=\n\t=?utf-8?q?4mhHjzvkqLINnlrZ6AGLwhPQlOJTu3maWqmeeC7YqvS0SQt9IqH16yZow5zZTw6HA?=\n\t=?utf-8?q?9yvTPH4KWTt3qouqb6vKGXg2GGAy0u0cmyLMRbNF+cSWnnIbR3+AfC20ibGG+CzL/?=\n\t=?utf-8?q?NVQXho8UIJkTKHNWk4v6fkFI9nb/jIKrp1fc1f4O+9GM7kbIK/cAkh3SW0EsLAwWK?=\n\t=?utf-8?q?Cd9CjyeOnIgomwwIklot0kt+Bu7hw9ZPujOQC/DKygVaOMcETapHPEvKMnJ8e9IkO?=\n\t=?utf-8?q?Bb7vEjdETbWjW1f0Jt8D3MmDiVrd9ttBuYFITzdCiLRtFh5TQHAT2Z/g2Y+T+QxzO?=\n\t=?utf-8?q?tupnrdQ9aobst8VWzzbaUrEFM7jF7wTdN2ifBCvbXsLbdqih8bD4aPkAILFLY5ChP?=\n\t=?utf-8?q?pC/GsMNcAFU6bPBECp80v38dMw/Je4X4b8OZTlzvA/Mxoh2n4EL2RFHFFiCUCEzzO?=\n\t=?utf-8?q?CADaALsww/8cz1hiFi1kNCV2mz55UWcHsV8mAG0fNRL+gHeklgDs0tXbFmLv1R3tV?=\n\t=?utf-8?q?pW0yn7nTGnliwdYErQR9//iXjx7M4qktE6zao1MHaWSHibYrelIpBDRC8RIwYxRUl?=\n\t=?utf-8?q?Zl7LNxEys2qvxIYojQ74Az8fb4Mxh0pwIznCejh3Da8mynaCX/RqLEZ35U8VzviMI?=\n\t=?utf-8?q?xK4WCtbITXS0c2Q+ZeEvC7vaRMVDWm+gLr3j5BuGsgD2R20h9q1vM+9FUG16CJqUB?=\n\t=?utf-8?q?Hwfb+LaGM9s4UrHBOUcohwiz6NA5pvQRTMoRG7ism8dhTJFVgbAGHJpPvc/UIE6n0?=\n\t=?utf-8?q?SEtAPsyx1fgpjWwCUtKLApyIKV4w7QUYNRH8fJ+2EZ7ayLfhE/qDKhu5Ru7FbBN+8?=\n\t=?utf-8?q?TNjakSheKfulrqcZT1C5whhdXFsMVpaUnvH0gL0gkKDExMDDuziKDdxwl8Onw4QuX?=\n\t=?utf-8?q?VsvxVFbpU/jRBDF6QKMbOxQzrRym0rQShgx06SMqs6SXTGw7gou17aT4adKI/XuGX?=\n\t=?utf-8?q?C/TZrl37oe5HqFUH4scbSJCCcGABIVibNw2ylvDWlOkT4QdpLxipAhzC79vGmXRhz?=\n\t=?utf-8?q?TNnKgYn1hpk1lxfaiK49k+C+mA2SX6gJTe5dYkNO6xsS2NDXHt0qgtNkZR47y2VU2?=\n\t=?utf-8?q?MmwVd6/6aH1pXhz6N908Zto5NsFA1oZt3smcPq3/Ez++9sEmgABnla8mfPrc275Nn?=\n\t=?utf-8?q?WfnfEJX5ZNcCh+vK68S/EjbHExkV1AUQavqIz5R3vWR+Pp7OCskwU4sEzMHylndFd?=\n\t=?utf-8?q?kSbXFw2MDa9frG//VXKrU1/7W3zMs3MKgRIo7B+EkxKFp3JyxWnxclo8tvt3V17MH?=\n\t=?utf-8?q?TxbJi47s06Hzt+K1Ajuc1lZ0RgzgPl95EatWY/wj/wQGbddO+0PcOIgPhl8gbqSIB?=\n\t=?utf-8?q?FybSsF1MgsnnstWKCFAaUWjxyyViw/cBq3SmoCJ7J4Mtr6Gc+OXwcWmSqx19iB2sG?=\n\t=?utf-8?q?m4ryY/o5kyD8OYmg+W8cxgpo6cZoUVhu6/OieQ4s3gGr37jFR7NAmT2iYRVVo3ywK?=\n\t=?utf-8?q?/9ZTQHRxigKji1KpJ66FHd0tvP9caAmoJw=3D=3D?=", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 8d37ab3a-61e4-47a5-9b45-08dab406fb20", "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:30.7523 (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 H3utF3s0q8PhnL0O7J1Yp+DmgA1Zz7p211+mvDTcr6n48/FDPwwfQ/Ip1R8JnzZcFFiXAi0qndVLk06o8goYr7P7T5OoaMW3rLHC4YCY3yw=", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "PH7PR13MB5454", "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 related data structure and logics, prepare for\nthe decap action of IPv6 GRE tunnel.\n\nSigned-off-by: Chaoyong He <chaoyong.he@corigine.com>\nReviewed-by: Niklas Söderlund <niklas.soderlund@corigine.com>\n---\n drivers/net/nfp/flower/nfp_flower_cmsg.h | 41 ++++++++++++++++++++++++++\n drivers/net/nfp/nfp_flow.c | 49 ++++++++++++++++++++++++--------\n 2 files changed, 78 insertions(+), 12 deletions(-)", "diff": "diff --git a/drivers/net/nfp/flower/nfp_flower_cmsg.h b/drivers/net/nfp/flower/nfp_flower_cmsg.h\nindex 8bca7c2..a48da67 100644\n--- a/drivers/net/nfp/flower/nfp_flower_cmsg.h\n+++ b/drivers/net/nfp/flower/nfp_flower_cmsg.h\n@@ -604,6 +604,47 @@ struct nfp_flower_ipv4_gre_tun {\n \trte_be32_t reserved2;\n };\n \n+/*\n+ * Flow Frame GRE TUNNEL V6 --> Tunnel details (12W/48B)\n+ * -----------------------------------------------------------------\n+ * 3 2 1\n+ * 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\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ * | ipv6_addr_src, 31 - 0 |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ * | ipv6_addr_src, 63 - 32 |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ * | ipv6_addr_src, 95 - 64 |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ * | ipv6_addr_src, 127 - 96 |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ * | ipv6_addr_dst, 31 - 0 |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ * | ipv6_addr_dst, 63 - 32 |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ * | ipv6_addr_dst, 95 - 64 |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ * | ipv6_addr_dst, 127 - 96 |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ * | tun_flags | tos | ttl |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ * | Reserved | Ethertype |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ * | Key |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ * | Reserved |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ */\n+struct nfp_flower_ipv6_gre_tun {\n+\tstruct nfp_flower_tun_ipv6 ipv6;\n+\trte_be16_t tun_flags;\n+\tstruct nfp_flower_tun_ip_ext ip_ext;\n+\trte_be16_t reserved1;\n+\trte_be16_t ethertype;\n+\trte_be32_t tun_key;\n+\trte_be32_t reserved2;\n+};\n+\n struct nfp_fl_act_head {\n \tuint8_t jump_id;\n \tuint8_t len_lw;\ndiff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c\nindex 01c6e9a..26d3854 100644\n--- a/drivers/net/nfp/nfp_flow.c\n+++ b/drivers/net/nfp/nfp_flow.c\n@@ -565,6 +565,7 @@ struct nfp_pre_tun_entry {\n \tstruct nfp_flower_ipv4_udp_tun *udp4;\n \tstruct nfp_flower_ipv6_udp_tun *udp6;\n \tstruct nfp_flower_ipv4_gre_tun *gre4;\n+\tstruct nfp_flower_ipv6_gre_tun *gre6;\n \tstruct nfp_flower_meta_tci *meta_tci;\n \tstruct nfp_flower_ext_meta *ext_meta = NULL;\n \n@@ -576,9 +577,15 @@ struct nfp_pre_tun_entry {\n \t\tkey_layer2 = rte_be_to_cpu_32(ext_meta->nfp_flow_key_layer2);\n \n \tif (key_layer2 & NFP_FLOWER_LAYER2_TUN_IPV6) {\n-\t\tudp6 = (struct nfp_flower_ipv6_udp_tun *)(nfp_flow->payload.mask_data -\n-\t\t\t\tsizeof(struct nfp_flower_ipv6_udp_tun));\n-\t\tret = nfp_tun_del_ipv6_off(repr->app_fw_flower, udp6->ipv6.ipv6_dst);\n+\t\tif (key_layer2 & NFP_FLOWER_LAYER2_GRE) {\n+\t\t\tgre6 = (struct nfp_flower_ipv6_gre_tun *)(nfp_flow->payload.mask_data -\n+\t\t\t\t\tsizeof(struct nfp_flower_ipv6_gre_tun));\n+\t\t\tret = nfp_tun_del_ipv6_off(repr->app_fw_flower, gre6->ipv6.ipv6_dst);\n+\t\t} else {\n+\t\t\tudp6 = (struct nfp_flower_ipv6_udp_tun *)(nfp_flow->payload.mask_data -\n+\t\t\t\t\tsizeof(struct nfp_flower_ipv6_udp_tun));\n+\t\t\tret = nfp_tun_del_ipv6_off(repr->app_fw_flower, udp6->ipv6.ipv6_dst);\n+\t\t}\n \t} else {\n \t\tif (key_layer2 & NFP_FLOWER_LAYER2_GRE) {\n \t\t\tgre4 = (struct nfp_flower_ipv4_gre_tun *)(nfp_flow->payload.mask_data -\n@@ -1186,11 +1193,15 @@ struct nfp_pre_tun_entry {\n \tstruct nfp_flower_meta_tci *meta_tci;\n \tconst struct rte_flow_item_ipv6 *spec;\n \tconst struct rte_flow_item_ipv6 *mask;\n+\tstruct nfp_flower_ext_meta *ext_meta = NULL;\n \tstruct nfp_flower_ipv6_udp_tun *ipv6_udp_tun;\n+\tstruct nfp_flower_ipv6_gre_tun *ipv6_gre_tun;\n \n \tspec = item->spec;\n \tmask = item->mask ? item->mask : proc->mask_default;\n \tmeta_tci = (struct nfp_flower_meta_tci *)nfp_flow->payload.unmasked_data;\n+\tif (meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_EXT_META)\n+\t\text_meta = (struct nfp_flower_ext_meta *)(meta_tci + 1);\n \n \tif (is_outer_layer && nfp_flow_is_tunnel(nfp_flow)) {\n \t\tif (spec == NULL) {\n@@ -1199,15 +1210,29 @@ struct nfp_pre_tun_entry {\n \t\t}\n \n \t\thdr = is_mask ? &mask->hdr : &spec->hdr;\n-\t\tipv6_udp_tun = (struct nfp_flower_ipv6_udp_tun *)*mbuf_off;\n-\n-\t\tipv6_udp_tun->ip_ext.tos = (hdr->vtc_flow &\n-\t\t\t\tRTE_IPV6_HDR_TC_MASK) >> RTE_IPV6_HDR_TC_SHIFT;\n-\t\tipv6_udp_tun->ip_ext.ttl = hdr->hop_limits;\n-\t\tmemcpy(ipv6_udp_tun->ipv6.ipv6_src, hdr->src_addr,\n-\t\t\t\tsizeof(ipv6_udp_tun->ipv6.ipv6_src));\n-\t\tmemcpy(ipv6_udp_tun->ipv6.ipv6_dst, hdr->dst_addr,\n-\t\t\t\tsizeof(ipv6_udp_tun->ipv6.ipv6_dst));\n+\n+\t\tif (ext_meta && (rte_be_to_cpu_32(ext_meta->nfp_flow_key_layer2) &\n+\t\t\t\tNFP_FLOWER_LAYER2_GRE)) {\n+\t\t\tipv6_gre_tun = (struct nfp_flower_ipv6_gre_tun *)*mbuf_off;\n+\n+\t\t\tipv6_gre_tun->ip_ext.tos = (hdr->vtc_flow &\n+\t\t\t\t\tRTE_IPV6_HDR_TC_MASK) >> RTE_IPV6_HDR_TC_SHIFT;\n+\t\t\tipv6_gre_tun->ip_ext.ttl = hdr->hop_limits;\n+\t\t\tmemcpy(ipv6_gre_tun->ipv6.ipv6_src, hdr->src_addr,\n+\t\t\t\t\tsizeof(ipv6_gre_tun->ipv6.ipv6_src));\n+\t\t\tmemcpy(ipv6_gre_tun->ipv6.ipv6_dst, hdr->dst_addr,\n+\t\t\t\t\tsizeof(ipv6_gre_tun->ipv6.ipv6_dst));\n+\t\t} else {\n+\t\t\tipv6_udp_tun = (struct nfp_flower_ipv6_udp_tun *)*mbuf_off;\n+\n+\t\t\tipv6_udp_tun->ip_ext.tos = (hdr->vtc_flow &\n+\t\t\t\t\tRTE_IPV6_HDR_TC_MASK) >> RTE_IPV6_HDR_TC_SHIFT;\n+\t\t\tipv6_udp_tun->ip_ext.ttl = hdr->hop_limits;\n+\t\t\tmemcpy(ipv6_udp_tun->ipv6.ipv6_src, hdr->src_addr,\n+\t\t\t\t\tsizeof(ipv6_udp_tun->ipv6.ipv6_src));\n+\t\t\tmemcpy(ipv6_udp_tun->ipv6.ipv6_dst, hdr->dst_addr,\n+\t\t\t\t\tsizeof(ipv6_udp_tun->ipv6.ipv6_dst));\n+\t\t}\n \t} else {\n \t\tif (spec == NULL) {\n \t\t\tPMD_DRV_LOG(DEBUG, \"nfp flow merge ipv6: no item->spec!\");\n", "prefixes": [ "v2", "20/25" ] }