Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/118968/?format=api
{ "id": 118968, "url": "http://patches.dpdk.org/api/patches/118968/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1666427069-10553-22-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-22-git-send-email-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1666427069-10553-22-git-send-email-chaoyong.he@corigine.com", "date": "2022-10-22T08:24:25", "name": "[v2,21/25] net/nfp: support IPv4 NVGRE flow item", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "30fa1f42909e2501df02e10fbccbfe558e310fe0", "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-22-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/118968/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/118968/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 10204A0032;\n\tSat, 22 Oct 2022 10:27:17 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id A8BA9415D7;\n\tSat, 22 Oct 2022 10:25:40 +0200 (CEST)", "from NAM02-DM3-obe.outbound.protection.outlook.com\n (mail-dm3nam02on2114.outbound.protection.outlook.com [40.107.95.114])\n by mails.dpdk.org (Postfix) with ESMTP id C608C42BC1\n for <dev@dpdk.org>; Sat, 22 Oct 2022 10:25:34 +0200 (CEST)", "from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5)\n by CH2PR13MB3848.namprd13.prod.outlook.com (2603:10b6:610:9d::12)\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:33 +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:33 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=Hxy2i60zHDzXjIw3k2A6sf4gT/Q+xPjfTJVpnzEITOKNYyWF22Rv32t6rIxQdi0MpdE5Yq8jD7o7rs0P9a3pF4H8Z9a3JLXW2lUxuRntRJ6YMK55Y7J2h3Tz9hxIhT7lpkyq1nwA5Ntxldb4ESWxYrLc/XDybmin13mh8OPKe6uKFGciIfA+xu7FzIEqiPT0pr3KvdHc9zOmHBRB20/wssOmFYn+497xPG+6ItNuVhK3NPoBJxuARVHQId4d7DKciKZnaCml4HRZgIDhdz48dPltqEfqxdCPwKYTxgYGX/wE6py30qJ5SqxLZd+OI+dbXGXx4bZdm52/o4gVHe6rbg==", "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=k3jluhVp7ZYGWqGy5QXnikSGwOipQSy75/tgeorU1T0=;\n b=XRk4b+160GCAwrkqm62nJJGTkDZKu36ZYgloSdhrGzJ8lKjb/Ss4dlXbCZ4fhSy9UWo3UNG/yi2hP6GUs9zczqoWLr7TYbAlzuy7oMZORufnnOr3uT/e0KuLosO2xbYtDOVEb5xq00/JG6Xlqpo75VEs0CPqeCTOr5EfzjodFLAF8/VnXM/glGkzrYTJUEtq3GGf47+U5cdHL1Lck/OAKr38e38aSj97XtmiPhOl5zqmBCp59ocynFTdkObkMA/nqqTfZa1t8oCJWJasfuEJMr2/C0TdWZl3+J31zFuISlmcZn3HGAEY7axalngVG7aTmVzgb1OzOjnMilwlDutTfw==", "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=k3jluhVp7ZYGWqGy5QXnikSGwOipQSy75/tgeorU1T0=;\n b=VzFpuTDFQlMCM7eou+7btUGrL038O8jDlKcBg1tL08z4PzDKq4UPLzl4rhqqJpBcrNR8YChueNYQx4dIS/T6FiZ/4db0IPj38j452swtdAwozXMExcOBkZ0LehWepUrFj55rB4oU05RDNrhj/3rs4x4I9WAK3Bi2bsIOl2sEUxU=", "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 21/25] net/nfp: support IPv4 NVGRE flow item", "Date": "Sat, 22 Oct 2022 16:24:25 +0800", "Message-Id": "<1666427069-10553-22-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_|CH2PR13MB3848:EE_", "X-MS-Office365-Filtering-Correlation-Id": "013e8f7c-67be-4de9-8f60-08dab406fcc6", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n LVpSYao9wGDs4+BtIw2RsPbssw0GJBMK/zzNO/kwbHdMaDYfkRuRHfThQIpBj8w2ItAK7fwR6KBslqB3vsKkqGc5Wt36jvkTWtZF5Ltw17Wng7MiYu/jcISSk0s8m8Iy9TML0bCdXyTViFuO87HpgCO8pVg7BwrkpVllG0MtIQYHxrEBwTHU17dSvoGo965yLz1OO6T+JlV4Zt8s8Dmm2PKqiuQX9TryF9cseJIyMQDeHPQEnwhaVkpkuXGeQaaHBBHPQXxZ5u1PmzxJQ7XS4jD3xziApOeIEpeRNQpYNqafK/f/5SxlhTM1AIuSv/wNQ8bIpK3xK9oYHCf6svy6qqK8zZ9+VJqswQ42IFeenK9HQ0yeRLmvgu10okChjbqjuGk1P+PLk0hJcJDl2u0KrH5Glck3dZfQxfzV9uVJ+cjTPzd33gVGl6b7OhyulWnrTBwR7I9Wbq+LXF7Y/mmpI+dgVli4i1BjL6vS6VJjDc1ZoPkiMG3zjdVXuGOGZCX3jEP3GBgCSbt28sVYC/ZHQONPUZu0e5De8WOC+Go0XXlRdkfvGxvqoWJi8OjajITxR868qH01X//KCvkknK4oG+wpv+aadjlt47BcrrpUAtZ0w09Q45J5Ug7JrCtx8HU4XM6m6S5XHujUsxTYZaRdJnwtqBr90MKnZbGGdNNgdgj5qd2nZwBYxyNrhvn0MhYvbAQKEBWvNEwZZ6lnJJrMgmSzMFNuekpjClQvSUOS9thdt+R/y6ga27Toeyn1Ew923P443wnvLI5na6JUpdpT9Q==", "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)(366004)(396003)(39830400003)(346002)(376002)(451199015)(4326008)(107886003)(36756003)(38100700002)(66946007)(66556008)(316002)(6512007)(83380400001)(52116002)(66476007)(8676002)(44832011)(6666004)(6506007)(38350700002)(5660300002)(8936002)(6916009)(2616005)(478600001)(186003)(41300700001)(26005)(6486002)(86362001)(2906002);\n DIR:OUT; SFP:1102;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "=?utf-8?q?ihQStJJ1QpobEX/XEu/SnPeaYZf/?=\n\t=?utf-8?q?Md8lghKUAERSShKy+TCZerSmy9j7tW7pQZMumnzLXWHKNNzWgaZn3aJBupbjRbIxs?=\n\t=?utf-8?q?LE/QKcLt7me/3UIF9QkwKdWs7iljU2pQaAdUUEEOvUtRdQojJYX7ukSd6LWGhcQzH?=\n\t=?utf-8?q?HfLGgI3QCb5vjm9N5odm64ImvE0gMFu7UL43azEmucvNFJtQW6208RLn3TWgyKrye?=\n\t=?utf-8?q?Qrf//nrOUU6ZrLL+KItezgoOhvqx7dV3RzqnpxlTu/3L4zP14OZab0XZImMtT5p2b?=\n\t=?utf-8?q?1ulA7LBTYiDWZMFMLY1g2RQ7w9B5i9p3YwHwmIAd7HDccEy6OoAku2h0Wfj1160Zi?=\n\t=?utf-8?q?Y3bcR6Vxn9ejHlp1NPXBLr5JwSO0BTGC9Bt3bZwdQspHMgtym6+g5a0oJZC+Ecmrb?=\n\t=?utf-8?q?Jm+nyACT+TuX7XNwBok4RuwGPau+QCp3JkCu8sfUKoaaQRmOtD/3ExPGfn0nL3knS?=\n\t=?utf-8?q?VAlYzKULbp2iLdiwBMoijVhUcQSlJBmJaR9kJ63qg3f2oa6TM3ZyYTgv7j2MoeRKf?=\n\t=?utf-8?q?YbIkIakeFyceRmAopzlxqqL6ZArvfbGay0bu5t1q5QNT4J/eB/QMQzQL2u7D/2T//?=\n\t=?utf-8?q?vXv24Ni/bguTPJGZrWlyBw+qFtc9ChBJVblm7liGCVehHUjaP2HVp6ybYFUmLe9nk?=\n\t=?utf-8?q?bFnfwNrLoxKKsD5JX0wfqo8dW1kFgJrdG8RPCT1krmMmfJC3lifqCs1dnJh2NQJFP?=\n\t=?utf-8?q?HdKxtFW6WKXm3LFcxyGGCbMVs8O+czzMy7oP2QOe50n0WrKIP/H43xefBnA5FzYSx?=\n\t=?utf-8?q?Ac/N/Y5qwmkOS1Gqx5VzJeNc+zc5llNef6X4r8xAUIvR9IKfndujAqAftBmWMdwQl?=\n\t=?utf-8?q?FmLueZlHzTnkHg+F3TiG5mwIPvuqwVPmAJ5iWjaKaiggHnjeEYUa0WIAtgA51eh5l?=\n\t=?utf-8?q?UB7OV5/5YW863Z/W8FLqLE0KoCBtJD3dyVe4ICeN1A0Sd9fUJGmgcZmKMlC3twwUe?=\n\t=?utf-8?q?eehLBFeoCuo1pMMsNbhTH0UNXSu0k/F3rol+H27ip/VLtz1v+46kE4fxoGNow6tl3?=\n\t=?utf-8?q?4sA+DZVjcQeHhCsIIlbvkiVncYelANvLbM9qmAzMKZyLSDJSzBY2Ocd6QIW97qUYp?=\n\t=?utf-8?q?pvJUelC5ltv/25chNvVzJlZ4ADefAjf1OgO1ANFK4zwnH53dlRtBd7Op5NJ353sGT?=\n\t=?utf-8?q?OEx8nnX+VGvI5/z+LL8ejbkBpjs0opw70zp5gVXI5W93dizgCPrEM5RhDsODL21RE?=\n\t=?utf-8?q?lfpqwPICIhCTe9+qU8dasXhOKJPgWv2bJH4v0mIgM5VgbFZUMDIYtital8m5liuLJ?=\n\t=?utf-8?q?0L3crt5uE+7dhhFj/b5NzgXdTNVSQfBOeX97Pnw3Bk3RaYFVATpSE6YKWJaRXrd4s?=\n\t=?utf-8?q?tBG9fiH9te4hm9U0F1XqSlwHNxBGubNUyHwMWrrsaQqOjqehKqEzw+49dkWSx9ihl?=\n\t=?utf-8?q?NJ+OyZP4XC+vsAC1Nm1h88Xtn+Y5KsXRpAzBGC5KrS+UbuahWdmJKXtIvlPgLzRdG?=\n\t=?utf-8?q?M9U6wITlECstJip3I4zHmSspDirry7mlxc56AhN7RGifTC0KX8ETOY6Ep8F4EniId?=\n\t=?utf-8?q?c23zWKw2M9kF/xvpWVHuScUm/Cc452QIWA=3D=3D?=", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 013e8f7c-67be-4de9-8f60-08dab406fcc6", "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:33.1114 (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 E3L2OJr1x515gWKycsZUGc2kipASEorQ8CT3tSo6cwupbXRxafHPJcgHUBe/IFbWYB4U97csKIg5IZ0SJROyYQr/eZk3E8WZU9ge7sAazIY=", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "CH2PR13MB3848", "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\nIPv4 NVGRE item.\n\nSigned-off-by: Chaoyong He <chaoyong.he@corigine.com>\nReviewed-by: Niklas Söderlund <niklas.soderlund@corigine.com>\n---\n doc/guides/nics/features/nfp.ini | 2 +\n drivers/net/nfp/nfp_flow.c | 99 +++++++++++++++++++++++++++++++++++++++-\n 2 files changed, 99 insertions(+), 2 deletions(-)", "diff": "diff --git a/doc/guides/nics/features/nfp.ini b/doc/guides/nics/features/nfp.ini\nindex f6b658b..2acc809 100644\n--- a/doc/guides/nics/features/nfp.ini\n+++ b/doc/guides/nics/features/nfp.ini\n@@ -29,6 +29,8 @@ Usage doc = Y\n [rte_flow items]\n eth = Y\n geneve = Y\n+gre = Y\n+gre_key = Y\n ipv4 = Y\n ipv6 = Y\n port_id = Y\ndiff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c\nindex 26d3854..0a43bf3 100644\n--- a/drivers/net/nfp/nfp_flow.c\n+++ b/drivers/net/nfp/nfp_flow.c\n@@ -820,6 +820,26 @@ struct nfp_pre_tun_entry {\n \t\t\t\treturn -EINVAL;\n \t\t\t}\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\tkey_ls->key_layer &= ~NFP_FLOWER_LAYER_IPV4;\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+\t\t\tkey_ls->key_size += sizeof(struct nfp_flower_ext_meta);\n+\t\t\tif (outer_ip4_flag) {\n+\t\t\t\tkey_ls->key_size += sizeof(struct nfp_flower_ipv4_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_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}\n+\t\t\tbreak;\n+\t\tcase RTE_FLOW_ITEM_TYPE_GRE_KEY:\n+\t\t\tPMD_DRV_LOG(DEBUG, \"RTE_FLOW_ITEM_TYPE_GRE_KEY detected\");\n+\t\t\tbreak;\n \t\tdefault:\n \t\t\tPMD_DRV_LOG(ERR, \"Item type %d not supported.\", item->type);\n \t\t\treturn -ENOTSUP;\n@@ -1540,6 +1560,62 @@ struct nfp_pre_tun_entry {\n \treturn ret;\n }\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\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_ipv4_gre_tun *tun4;\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+\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\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\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_ipv4_gre_tun *tun4;\n+\n+\tspec = item->spec;\n+\tif (spec == NULL) {\n+\t\tPMD_DRV_LOG(DEBUG, \"nfp flow merge gre key: no item->spec!\");\n+\t\tgoto gre_key_end;\n+\t}\n+\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+\n+gre_key_end:\n+\t*mbuf_off += sizeof(struct nfp_flower_ipv4_gre_tun);\n+\n+\treturn 0;\n+}\n+\n+const rte_be32_t nfp_flow_item_gre_key = 0xffffffff;\n+\n /* Graph of supported items and associated process function */\n static const struct nfp_flow_item_proc nfp_flow_item_proc_list[] = {\n \t[RTE_FLOW_ITEM_TYPE_END] = {\n@@ -1580,7 +1656,8 @@ struct nfp_pre_tun_entry {\n \t[RTE_FLOW_ITEM_TYPE_IPV4] = {\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_ipv4){\n \t\t\t.hdr = {\n \t\t\t\t.type_of_service = 0xff,\n@@ -1671,6 +1748,23 @@ struct nfp_pre_tun_entry {\n \t\t.mask_sz = sizeof(struct rte_flow_item_geneve),\n \t\t.merge = nfp_flow_merge_geneve,\n \t},\n+\t[RTE_FLOW_ITEM_TYPE_GRE] = {\n+\t\t.next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_GRE_KEY),\n+\t\t.mask_support = &(const struct rte_flow_item_gre){\n+\t\t\t.c_rsvd0_ver = RTE_BE16(0xa000),\n+\t\t\t.protocol = RTE_BE16(0xffff),\n+\t\t},\n+\t\t.mask_default = &rte_flow_item_gre_mask,\n+\t\t.mask_sz = sizeof(struct rte_flow_item_gre),\n+\t\t.merge = nfp_flow_merge_gre,\n+\t},\n+\t[RTE_FLOW_ITEM_TYPE_GRE_KEY] = {\n+\t\t.next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_ETH),\n+\t\t.mask_support = &nfp_flow_item_gre_key,\n+\t\t.mask_default = &nfp_flow_item_gre_key,\n+\t\t.mask_sz = sizeof(rte_be32_t),\n+\t\t.merge = nfp_flow_merge_gre_key,\n+\t},\n };\n \n static int\n@@ -1728,7 +1822,8 @@ struct nfp_pre_tun_entry {\n nfp_flow_is_tun_item(const struct rte_flow_item *item)\n {\n \tif (item->type == RTE_FLOW_ITEM_TYPE_VXLAN ||\n-\t\t\titem->type == RTE_FLOW_ITEM_TYPE_GENEVE)\n+\t\t\titem->type == RTE_FLOW_ITEM_TYPE_GENEVE ||\n+\t\t\titem->type == RTE_FLOW_ITEM_TYPE_GRE_KEY)\n \t\treturn true;\n \n \treturn false;\n", "prefixes": [ "v2", "21/25" ] }