Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/118966/?format=api
{ "id": 118966, "url": "http://patches.dpdk.org/api/patches/118966/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1666427069-10553-20-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-20-git-send-email-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1666427069-10553-20-git-send-email-chaoyong.he@corigine.com", "date": "2022-10-22T08:24:23", "name": "[v2,19/25] net/nfp: prepare for IPv4 GRE tunnel decap flow action", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "9791708d91a3f5d7e4334e9a03ad54c6b7b4705d", "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-20-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/118966/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/118966/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 C5545A0032;\n\tSat, 22 Oct 2022 10:27:04 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 9EACC4281A;\n\tSat, 22 Oct 2022 10:25:38 +0200 (CEST)", "from NAM02-DM3-obe.outbound.protection.outlook.com\n (mail-dm3nam02on2135.outbound.protection.outlook.com [40.107.95.135])\n by mails.dpdk.org (Postfix) with ESMTP id A30C442BA0\n for <dev@dpdk.org>; Sat, 22 Oct 2022 10:25:29 +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:28 +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:28 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=No/+y2VcEblxwJtFT02ykmJzEztBKl2rJggciihqTJsmUz0bdA+hODGnvY1qm3W9XgwIB+eHLRtQzqy08yLWgmn+R263gteFfdw7HOwX/ODK0vIobp6WBOuctnJzJ+Eyr7VGJjNJJcNdQDQbC+8jtrbJvCf1mcXgPz1n64ML3g37Fp57xrL4w0LnOsA9QUzltepIJiUndsSqQ7ET22+RHoSxF8zSwHbi/wjOJHkPi5ySxf4JG0hXB/1WAtlEnjRwil6J787UZCV9P+VmfWQgpwDm78Krgf47F7FI0xtyEnMApDohwIlSjfNfZHHey/AuXCFbWaJmvSXpekRdO0to2g==", "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=f7tto17zYnUx2aIQHM4gxpr30fLJhY/vlCv6kH6kd1g=;\n b=B7BQAUZXuNocgKchwDnptRS3g7YMZ3Lp3hWeGQ8jRx9eEspPy0ziUKtDTaOhdtAto0Z1tNvapYA1rB+ySW8CU8XBPbmACWxN7S3KcLA7e/5U/BI+buXrvXTLG8ffbMSjzILPjfRawvBOfCq+ksHbEGJTYhL0M7F0LMikBxG94Gaz7ESIh4K14w3y/xuJCETKPHodkYbtb8JYB0QdIjNNubMPUrPnNBYeYs1LHZjRNcA/UPvqhGK2C3RjoaDIxHYwwOKvAcMEp7tD6nC03rN2aGacKqxdRUAZ4qJpMu1axJVFC9jtfhmYrKhnc/Ik6JqGg8f3bWxEESLnH0pIDHhdBw==", "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=f7tto17zYnUx2aIQHM4gxpr30fLJhY/vlCv6kH6kd1g=;\n b=l9Rteq7cPJlAzxPra3zASP4oOIrbiz7xouSCTzK74atBpyP5XHOpjGdYRCNH++ZcCS9l5pGLHRg69ocKlUzwNQxEkFm82Dn6rSGvdCs1tWZtCr+lR5IALd2iDYz8XvzGg3zfIi5x/gp7jeEY75B/UYD+vqD7h9zVja9Zz1696F4=", "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 19/25] net/nfp: prepare for IPv4 GRE tunnel decap flow\n action", "Date": "Sat, 22 Oct 2022 16:24:23 +0800", "Message-Id": "<1666427069-10553-20-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": "76388122-bd31-4f12-4429-08dab406f9ac", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n 91TkPsCxMhe5TEETeHC9izwEPMQ4W9Xvt74Xmr4QxUHSYSX7mmE5SWV0/ik3MySl4p1qe3Bvd+NgK21cNFg1N+Na8HODQZRFb7N+Od3M9tmpjgj9SBRazyeOkph4LS58s3Yb+BWkX7dWE/tT+rUwoIdXjL6ZjzFymsomVyeF8gmhT3OmtjKA5wsBbLFNIWKnwrbB9uHW9xTYZhhopoc3oMjEzT02KsJDcz7Yx2aNDGTt0zkbT0ycWfGlLWzxSg1bIIVOzpqobeH6X5VLj1pc4q0r5Wt0201tISFxHGX0hgXs1JEe2craOBxyvdoFtBszYDsPwcLPbEIpwTaf7HS5CU5Psdwdt2/GvxNObUEKXuY+8IFk8rCKkmxPM5VhpPTG8bqOUtamRdX8fZB2+2qRqxZedlB5fL1FABmOvKpn3akSCv+hglZ6IABKMvX5vJNBsvBwYvMxz3X6OFAa+HMLWVoQxH8mlvNCaq3AcSaO5PXqQ4PwHpOtEK24LsT38aHQ4P9OK2hObndRrJwmvNbv8KNQbZ1hpW9+qYwbknj4IKhsAwpKLklQHu3B99BNdPkVLNvlRVHI8ZjFXp6W/9uc8tWLyV65Seevo1xkbxZNWWja6O5m0ANSupEV9r1th+0oOskwGR0sWcC50oYWOc3CH7D0QtGKw+I6FtBUtzRFQGFX9OXeNqS+cMsYp1FwrALEFXurOHEM08itqPB6AOFO0I/zCW03PLF5/c036v3umFPcK04Jo33nBTtdyijA8buielDcqYHfvb2oiWjMnABOUQ==", "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?dNGfODxjOWMj144sfo43Gh2IzPTE?=\n\t=?utf-8?q?55sq3JNDgcotjMEdhU89xMc9ergTJY3j1uKUYSL6bb3OjKuw+6d/08IQ17WfnCAtd?=\n\t=?utf-8?q?WPMQGxOEIzzTrKSSV8iJQaX87AYJrKDNtxcqYqLzkJ2HqWYZQvfH5ttUq223fdAZq?=\n\t=?utf-8?q?TQLdfXmZLRU/TS3LFNiB90p2xQYFsOreKGnhSl6CGYtS1cqcWzXco3dJRdxodwy8O?=\n\t=?utf-8?q?k7x9Lu6YGhMp2zh/c38KDjuOrpFU5kDu4tcqlu7fBoXREICT3K6EI09sNDD8ZyNU4?=\n\t=?utf-8?q?asN3PN/XH6RNV2RwozfgooCoUmDCKj4r4EWxEZR2o0fNoO5+1HgIT0tOCs1RI9XtR?=\n\t=?utf-8?q?hszZ0l7q814e7FoIy8/g6DUkReLbwBraX4q4jjZpC0q5OOg87XO9lx9Crf2SvR0Am?=\n\t=?utf-8?q?pJVdvDLvyUn1fDvoAB1aPss4BTj7QWo6Lchb+Wc5N6mF9uqjs6fUZddyQ3U9NySTK?=\n\t=?utf-8?q?bwc+pQ/rIbw4pxVRCNFj+uJ5htk3Bh2S02Bn1JErPHS4Gjx2cwi8ss+z1jnVvoe2f?=\n\t=?utf-8?q?8HYrl4xD1lKj+f6dA/K3rzuRAe+QOAg8WDUJ6uDItqfkdhQ9x6AbU5oZRZdFfS6Sp?=\n\t=?utf-8?q?mQn1SJ2PBdsX1J7eAdb7K5Cq3FBqjBh25SVeKWdf6id/bcH+jIlQMBDxuEnlRK/c5?=\n\t=?utf-8?q?IKfbW1zflmcrlXUDzFUDkJJAiLZ0q6ajNDM5CjJZFIfFxECoU7yQgq7c55g8Qer7r?=\n\t=?utf-8?q?xOZT9txG9an5nlKM3HDbLLNNzBh0QNQrocBBbiPYQGbxeFG8Tit+XIkYJk0V0hW+L?=\n\t=?utf-8?q?vHRn9KUc5luT3Igt7+ZFTegdnWBA0rdmJOnPFguFGVZnAOG/+L5jiBVNsZ9polSEy?=\n\t=?utf-8?q?h9Yiqh9qWBcIYUSzhsIdfezb6qad3+Tqh9YIUYKTYfBcKAqlqqRiO9m9Ep1EQ31u4?=\n\t=?utf-8?q?QimWQ+Efx4uFj+CB8waGD6ES2pVyUzj6dtomyGTNiBluyD/666bsLk9IHEz85kFCr?=\n\t=?utf-8?q?aATm0Q8dmbbfMoztq4ga0B3O908UVQV74f7nSZaYuQcWLaGR58rPR2lSrzHQtQIOk?=\n\t=?utf-8?q?7izoKreEWJBJcFb31vUlSQR0WncFaEywwV8BfnVkSbFMzL8AqitMor3/WuBPur/nj?=\n\t=?utf-8?q?k2on6/GTS8GFdAsuTjT+fHQ7bywActENfZYxukiv60e99PhQArjj4vTmGCq7w8Nse?=\n\t=?utf-8?q?87BrZqpXBlM5WpmiqsCzTjnsK6MJKDeKeOw9MULaK8pgGQDrs1JUlChzBNq3xGW/q?=\n\t=?utf-8?q?US6eUCtu9VTA7U40Fyo1u9It7S7kXImS3IWhYTz2M6uvWv1NxoHrsV3OgeWAt9WuN?=\n\t=?utf-8?q?DFCf/jG2iYDT1x+sm87i1n2odn4Yjazy7zIUgyQWtBhRdg4Rsy+mYsmZkd+JBdG5+?=\n\t=?utf-8?q?cWtBfyh79BIzdwvs1s0bjhP8u6bYg8l2YNUSeoMGmEUwjirteRNeRYrZyaciIGEyP?=\n\t=?utf-8?q?zDX7vEMgYLN2lRAEQsdV5IYlDhvz/Gnv7+/JfLzcdny/GEbbWVr6JIeiLSVp7Ukd9?=\n\t=?utf-8?q?ngD7x065I3zpTfGvujLIqC53lDGok++MbexDVh7s+/q3XM5JzEGDLoSbmCHqPzZPV?=\n\t=?utf-8?q?lWSBoHzTZyj5BBRiD377Qv/lK8kCSjN/bA=3D=3D?=", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 76388122-bd31-4f12-4429-08dab406f9ac", "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:28.0640 (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 Jl3et5f/nO94I3m+a5GTT2z65z86FRj04+ucA2uDoHO9FpFRu4DDNBEbLxnQhwjJtkY2YKAOBwq1MPM+m4w5xxI8Hujj1P+3t5UnIrvCj5Q=", "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 related data structure and logics, prepare for\nthe decap action of IPv4 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 | 29 +++++++++++++++++++++++\n drivers/net/nfp/nfp_flow.c | 40 +++++++++++++++++++++++++-------\n drivers/net/nfp/nfp_flow.h | 3 +++\n 3 files changed, 63 insertions(+), 9 deletions(-)", "diff": "diff --git a/drivers/net/nfp/flower/nfp_flower_cmsg.h b/drivers/net/nfp/flower/nfp_flower_cmsg.h\nindex 61f2f83..8bca7c2 100644\n--- a/drivers/net/nfp/flower/nfp_flower_cmsg.h\n+++ b/drivers/net/nfp/flower/nfp_flower_cmsg.h\n@@ -575,6 +575,35 @@ struct nfp_flower_ipv6_udp_tun {\n \trte_be32_t tun_id;\n };\n \n+/*\n+ * Flow Frame GRE TUNNEL --> Tunnel details (6W/24B)\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+ * | ipv4_addr_src |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ * | ipv4_addr_dst |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ * | tun_flags | tos | ttl |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ * | Reserved | Ethertype |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ * | Key |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ * | Reserved |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ */\n+struct nfp_flower_ipv4_gre_tun {\n+\tstruct nfp_flower_tun_ipv4 ipv4;\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 fd64da8..01c6e9a 100644\n--- a/drivers/net/nfp/nfp_flow.c\n+++ b/drivers/net/nfp/nfp_flow.c\n@@ -564,6 +564,7 @@ struct nfp_pre_tun_entry {\n \tuint32_t key_layer2 = 0;\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_meta_tci *meta_tci;\n \tstruct nfp_flower_ext_meta *ext_meta = NULL;\n \n@@ -579,9 +580,15 @@ struct nfp_pre_tun_entry {\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} else {\n-\t\tudp4 = (struct nfp_flower_ipv4_udp_tun *)(nfp_flow->payload.mask_data -\n-\t\t\t\tsizeof(struct nfp_flower_ipv4_udp_tun));\n-\t\tret = nfp_tun_del_ipv4_off(repr->app_fw_flower, udp4->ipv4.dst);\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+\t\t\t\t\tsizeof(struct nfp_flower_ipv4_gre_tun));\n+\t\t\tret = nfp_tun_del_ipv4_off(repr->app_fw_flower, gre4->ipv4.dst);\n+\t\t} else {\n+\t\t\tudp4 = (struct nfp_flower_ipv4_udp_tun *)(nfp_flow->payload.mask_data -\n+\t\t\t\t\tsizeof(struct nfp_flower_ipv4_udp_tun));\n+\t\t\tret = nfp_tun_del_ipv4_off(repr->app_fw_flower, udp4->ipv4.dst);\n+\t\t}\n \t}\n \n \treturn ret;\n@@ -1013,7 +1020,7 @@ struct nfp_pre_tun_entry {\n \n \text_meta = (struct nfp_flower_ext_meta *)(meta_tci + 1);\n \tkey_layer2 = rte_be_to_cpu_32(ext_meta->nfp_flow_key_layer2);\n-\tif (key_layer2 & NFP_FLOWER_LAYER2_GENEVE)\n+\tif (key_layer2 & (NFP_FLOWER_LAYER2_GENEVE | NFP_FLOWER_LAYER2_GRE))\n \t\treturn true;\n \n \treturn false;\n@@ -1102,11 +1109,15 @@ struct nfp_pre_tun_entry {\n \tstruct nfp_flower_meta_tci *meta_tci;\n \tconst struct rte_flow_item_ipv4 *spec;\n \tconst struct rte_flow_item_ipv4 *mask;\n+\tstruct nfp_flower_ext_meta *ext_meta = NULL;\n \tstruct nfp_flower_ipv4_udp_tun *ipv4_udp_tun;\n+\tstruct nfp_flower_ipv4_gre_tun *ipv4_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@@ -1115,12 +1126,23 @@ struct nfp_pre_tun_entry {\n \t\t}\n \n \t\thdr = is_mask ? &mask->hdr : &spec->hdr;\n-\t\tipv4_udp_tun = (struct nfp_flower_ipv4_udp_tun *)*mbuf_off;\n \n-\t\tipv4_udp_tun->ip_ext.tos = hdr->type_of_service;\n-\t\tipv4_udp_tun->ip_ext.ttl = hdr->time_to_live;\n-\t\tipv4_udp_tun->ipv4.src = hdr->src_addr;\n-\t\tipv4_udp_tun->ipv4.dst = hdr->dst_addr;\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\tipv4_gre_tun = (struct nfp_flower_ipv4_gre_tun *)*mbuf_off;\n+\n+\t\t\tipv4_gre_tun->ip_ext.tos = hdr->type_of_service;\n+\t\t\tipv4_gre_tun->ip_ext.ttl = hdr->time_to_live;\n+\t\t\tipv4_gre_tun->ipv4.src = hdr->src_addr;\n+\t\t\tipv4_gre_tun->ipv4.dst = hdr->dst_addr;\n+\t\t} else {\n+\t\t\tipv4_udp_tun = (struct nfp_flower_ipv4_udp_tun *)*mbuf_off;\n+\n+\t\t\tipv4_udp_tun->ip_ext.tos = hdr->type_of_service;\n+\t\t\tipv4_udp_tun->ip_ext.ttl = hdr->time_to_live;\n+\t\t\tipv4_udp_tun->ipv4.src = hdr->src_addr;\n+\t\t\tipv4_udp_tun->ipv4.dst = hdr->dst_addr;\n+\t\t}\n \t} else {\n \t\tif (spec == NULL) {\n \t\t\tPMD_DRV_LOG(DEBUG, \"nfp flow merge ipv4: no item->spec!\");\ndiff --git a/drivers/net/nfp/nfp_flow.h b/drivers/net/nfp/nfp_flow.h\nindex a6994e0..b0c2aaf 100644\n--- a/drivers/net/nfp/nfp_flow.h\n+++ b/drivers/net/nfp/nfp_flow.h\n@@ -49,6 +49,9 @@\n #define NFP_FL_SC_ACT_POPV 0x6A000000\n #define NFP_FL_SC_ACT_NULL 0x00000000\n \n+/* GRE Tunnel flags */\n+#define NFP_FL_GRE_FLAG_KEY (1 << 2)\n+\n /* Action opcodes */\n #define NFP_FL_ACTION_OPCODE_OUTPUT 0\n #define NFP_FL_ACTION_OPCODE_PUSH_VLAN 1\n", "prefixes": [ "v2", "19/25" ] }