Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/118948/?format=api
{ "id": 118948, "url": "http://patches.dpdk.org/api/patches/118948/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1666427069-10553-3-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-3-git-send-email-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1666427069-10553-3-git-send-email-chaoyong.he@corigine.com", "date": "2022-10-22T08:24:06", "name": "[v2,02/25] net/nfp: support IPv6 VXLAN flow item", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "03a9509928f46f5c06d936324038a89ddacf5bc8", "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-3-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/118948/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/118948/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 95193A0032;\n\tSat, 22 Oct 2022 10:25:00 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 3AA00410D0;\n\tSat, 22 Oct 2022 10:24:56 +0200 (CEST)", "from NAM10-BN7-obe.outbound.protection.outlook.com\n (mail-bn7nam10on2118.outbound.protection.outlook.com [40.107.92.118])\n by mails.dpdk.org (Postfix) with ESMTP id D82A6400D6\n for <dev@dpdk.org>; Sat, 22 Oct 2022 10:24:53 +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:24:50 +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:24:50 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=HnkGNlMWt9htD+T6lqCIPgoGr4Q+VKwCo86YlvX3xsZ729dWIky19VMAqhKYmzAUIVqqdDZEwytGMsIIu6aybH6/BO/2K9x2zhpVXCZFmwqe3MwmJ+32x+6Q/InjA+1FPyoap+liBrbJHL+iTLWp5qGEY7bQ6a//XXWCh18SAJv+PdOufsY6TbLh+aC/Y2GxSJFCzl+uI/YbapI52uLQ4a0yYKZR7jrM0ZEaMhq3+pPdOy9aHizzd6XU+YS688EkVfDOmbsRhoGlApKHReMW5+OxBsF+up7qE43reltFzWOFtUvM8Do4a2KIiHA/5yk6zOIySoojnpjT4IfSj9rCxA==", "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=ylIX9qxb7o2h9IHt69irR52TEVeukdweLaRvfkCfgd0=;\n b=lT7ioPfh9gE7N2lGh/M0Wia3BvKkcffk0vpy+LAihuLHI3mlvFzlACwNWxNmUPZtvU+UwHpXyk8y/ZpB0YGu7gR/A4Hs4PvzsrzDQgcDlReQn+EmoFVDtGkOU1NZ62XANJBVwEgz5QDnEX2RxmftaMNsmKd4jq93lhQCKYAL2i63Aq8us7syqfClxUy89ftcucHEi0uL9OXZC1LtHYLG+A6aOraInXyAEBLRjmI2bch0HW382lsFY2ByIodbYwaKPhALgKeSEfoqVngvP3j3J6wa+DFsS97m0SWu7FiyQY8R0dubgK3npEIiqe1b8RvbUIebcdWwfeTMe72gzfMjcQ==", "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=ylIX9qxb7o2h9IHt69irR52TEVeukdweLaRvfkCfgd0=;\n b=r8vysjvhHXCtW1cUJkWfPKxXD/eHbNrMmlV3IJBBRJQMptW/e3QmJX30BAjJBFzGM2IU3PQNXUK1DA3Kflm9kHTG5H+Fcryi1nJ4WfnhrA+CJ2k15MYhM5yxp4kBC9ZL1klU8yvmT3wafr0sOMUMApoL8qxbtYEYmxveptwd0xY=", "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 02/25] net/nfp: support IPv6 VXLAN flow item", "Date": "Sat, 22 Oct 2022 16:24:06 +0800", "Message-Id": "<1666427069-10553-3-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": "416fbd37-67bb-4e89-cf6e-08dab406e33d", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n z9db9++WBo5+JivAd8TyqLHiQqxO2h6XeRCHtzxPo9yLh5CgQD2bRN6ppiNVo5hcKXIp8Qv2ArHASECWpXiQJ6ZuVUDX6wnSH7UXcPB7A+shHb2jgpjfs4HY9DDAHWTLzdOOwJ6REKDoUs6bi88nzKhdVxXhVJLXU11Co/5ZlKJ6bLgCirlsmJ6WrYXFcTcirWiQF3px5FLOn1dMa410bQA3oRW1vaYX0io73+66SyLZgqfc3SabS5LEDiG/jIvP+K7MBvdA9JhOmLvXvje3Q/iP6ei8gFE6l+TxBMNmWppkl4HkGCcIlA4j2bSOUpa04fjmU4Zh+VcwNnD6dTT7PCk34gqXKh1ECUVx1lodzwQAeSk/esSphlTLTnsJB6DvFdFYFAR9Pvc9isq2DxWPF6FKig8fVyIVE0f7Ys0peVixeiByiUYI/oWDsyI7xzYQsvxARtpDPtCI5kQf9uNMQTfruwHeA/JQJ35aK5WtsPK2Uof8MJtjmirWjVqoJ51f9VHUHrptSmPSNMSIZ7GT2K33Fa1zQaH5oI6fV1nPHQAhzPmm712sCKkUy98TdFoFdNk1EbceBSQNQ2PJqB7G9gQPIzNiIm+y/WoKYWJRL/OgdyhnIqOPvGbdCt1Po8HGtZhdpS0xyto++LRui6nQ8+cWTJGOjBg5ucSNfbBuODs9iwpTUew84J4n9I05NYz8QogCHh3JRinNq/zO/tWc4A3VPYQov2fmv733888ucoG8/7lS3ZUvPP/0uKYbvlscRYXsMTh8bPVa8f7RP560tQ==", "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)(66574015)(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?GQ5bUEmceQ7pyYo3DU1Q2HS0JAqs?=\n\t=?utf-8?q?ImvQk8Xw0BHjHhnYMS2d97oDu7x6IjFyg0pjvhlJuhjt+SEDk0HzIyjdqBVA+QGqI?=\n\t=?utf-8?q?XOk8ZYbdaXMIsu/mMDuEyWzxwv1YiIecaEoCkdbcqClyARun1q5ByitGrTg3Xxf48?=\n\t=?utf-8?q?6m6jyY4dRHQDt9/crP1TOsXa9U2qdLHDqvpY9eV4i6qLWtayM2ipNDsybqyuuCmww?=\n\t=?utf-8?q?kue2Vu7eAZtez6AnIicPQlOn2Vj7Dw2LfGO3G4qFUZNGo8aImwxYTklwfMDPyIIeo?=\n\t=?utf-8?q?e9WIbeU3J0TO2dRHCYlkmp6W6QV1I5hAX769ZH3ssYIhU6U+L9klqRNd9HqgUf/5u?=\n\t=?utf-8?q?9Qe1wUqnkCLnDsrJEubSvV5xA3TmesQat35Nf8nr9hc3xccfIzlAjZdogaIAq9qtG?=\n\t=?utf-8?q?+7c+cSrbRFR9fPjx67uNTuyD9Bm6gQhMsbh+4gi0bN3HRO0SnpHVOJ4zFFJi+eRkl?=\n\t=?utf-8?q?49NPdwFpwYYTs7NEwfBu4FmmJV5hZGxoe+qRdn8JPRYLP8j2D/4MvG809JKaqBAcf?=\n\t=?utf-8?q?GhsOk2tBu3GUmE8E0ER/Qkh1uC3irwlJba5/rlE/IzIFOOwC4+6QSajFjIiDcImID?=\n\t=?utf-8?q?KrOYUZRZ5URv4DWOCJkP/nf6s6GY7gswf5hjCxoXFEylv0R7ZAu7uuZ4oIvqGOdaf?=\n\t=?utf-8?q?YiKk82/+1pzwjzNEfqJNo/drAXm/udp99hiPAXVELPcvMoQsSSU8DW9sSsJYx3+fb?=\n\t=?utf-8?q?dUoiix2a5Aql3nh0jPvDquEZNt5ckGuGZb0ZZNmDAv4dBieIoAq6z/VGkRWgFVQsu?=\n\t=?utf-8?q?TFHR5hNbodY2m1QfD+AiXxm7uVdQhYmfj+1jCcPxx6/xllQxHPej4MAOfIxwR864M?=\n\t=?utf-8?q?PpGrWsDwp8UTIkfVEalvjhr3mC/khD7gQd7FUrNtl6nrHs+OQiEblH4i3sKAb1doV?=\n\t=?utf-8?q?q9ggoK+XuKcgqRakLdsJmKFpUzQi0b3C3i3OueKa9Bb3mmKCNBjRJ+2CF4MvIQKEr?=\n\t=?utf-8?q?mVuLXsA1YD2uWYicYYtjnbywM4aiwXFBVsJ1cFtwR45wP6Y/Koi/OQUPRobeRa623?=\n\t=?utf-8?q?Do1IBU/dRvI/NftqVnxKnkbVHvwaj0APofFdo7GYh9F8I+bAmsf4v90TO+ivg9qb7?=\n\t=?utf-8?q?NSJkY74qb0QbeGBFmYPUr9y5AsoLJLHW1sy4EK3tqX3vkJyjbg+s8jbszud8sC4VW?=\n\t=?utf-8?q?+gP9o2SudBipZDTYiY9ZIb6V8XkYjZFL235omU9/DKe5TL+dtlc3VEg30+3lUTn2f?=\n\t=?utf-8?q?hD4nWd4HfVjma9XTkVSgiREXw1jq2k958jV8PPEgSx6r5D1DXo+/id76rDrWV0BB6?=\n\t=?utf-8?q?O2sLM57CQu99NMhruV73BrKlbxBEmXa0WhjchRXwyEmW5y52CMi82CK0u0LDK9cyT?=\n\t=?utf-8?q?yaERZ8i2yexZl0jH8+wkFgtWmCBhhHOl7oksMBUm6XIsPLB4alJFBgeZJjb/eUF0B?=\n\t=?utf-8?q?y3sUqa7LA43CSefCC1HbI2IrDy82F8Zsnro1SA9BFnAEo3houJiaWsa2oFZQGGjli?=\n\t=?utf-8?q?qyWk1qzD/FN433X6a9Yn6/9KKm8hGr9woL1bN4PXLTdglVkpwLjKUoNid1sDo4ala?=\n\t=?utf-8?q?uaRg8TtGyr9qQkqnnFJqrVzl5sjJNEstnQ=3D=3D?=", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 416fbd37-67bb-4e89-cf6e-08dab406e33d", "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:24:50.2878 (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 LDgrITUWpNyzbSzv9SDKYm8iePChhWS/a0+oQFTqu5R0eLFNWf0SrhUKanw0ofSczWMCopVxyB2yKBNyxzfi31ybfLHojzGJ7cGOryMIQb8=", "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 data structure and logics, to support\nthe offload of IPv6 VXLAN 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/flower/nfp_flower_cmsg.h | 42 ++++++++++++\n drivers/net/nfp/nfp_flow.c | 113 ++++++++++++++++++++++++-------\n 2 files changed, 129 insertions(+), 26 deletions(-)", "diff": "diff --git a/drivers/net/nfp/flower/nfp_flower_cmsg.h b/drivers/net/nfp/flower/nfp_flower_cmsg.h\nindex 08e2873..996ba3b 100644\n--- a/drivers/net/nfp/flower/nfp_flower_cmsg.h\n+++ b/drivers/net/nfp/flower/nfp_flower_cmsg.h\n@@ -329,6 +329,11 @@ struct nfp_flower_tun_ipv4 {\n \trte_be32_t dst;\n };\n \n+struct nfp_flower_tun_ipv6 {\n+\tuint8_t ipv6_src[16];\n+\tuint8_t ipv6_dst[16];\n+};\n+\n struct nfp_flower_tun_ip_ext {\n \tuint8_t tos;\n \tuint8_t ttl;\n@@ -359,6 +364,43 @@ struct nfp_flower_ipv4_udp_tun {\n \trte_be32_t tun_id;\n };\n \n+/*\n+ * Flow Frame IPv6 UDP TUNNEL --> Tunnel details (11W/44B)\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+ * | Reserved | tos | ttl |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ * | Reserved |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ * | VNI | Reserved |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ */\n+struct nfp_flower_ipv6_udp_tun {\n+\tstruct nfp_flower_tun_ipv6 ipv6;\n+\trte_be16_t reserved1;\n+\tstruct nfp_flower_tun_ip_ext ip_ext;\n+\trte_be32_t reserved2;\n+\trte_be32_t tun_id;\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 0e1e5ea..bbd9dba 100644\n--- a/drivers/net/nfp/nfp_flow.c\n+++ b/drivers/net/nfp/nfp_flow.c\n@@ -493,6 +493,7 @@ struct nfp_mask_id_entry {\n {\n \tstruct rte_eth_dev *ethdev;\n \tbool outer_ip4_flag = false;\n+\tbool outer_ip6_flag = false;\n \tconst struct rte_flow_item *item;\n \tstruct nfp_flower_representor *representor;\n \tconst struct rte_flow_item_port_id *port_id;\n@@ -535,6 +536,8 @@ struct nfp_mask_id_entry {\n \t\t\tPMD_DRV_LOG(DEBUG, \"RTE_FLOW_ITEM_TYPE_IPV6 detected\");\n \t\t\tkey_ls->key_layer |= NFP_FLOWER_LAYER_IPV6;\n \t\t\tkey_ls->key_size += sizeof(struct nfp_flower_ipv6);\n+\t\t\tif (!outer_ip6_flag)\n+\t\t\t\touter_ip6_flag = true;\n \t\t\tbreak;\n \t\tcase RTE_FLOW_ITEM_TYPE_TCP:\n \t\t\tPMD_DRV_LOG(DEBUG, \"RTE_FLOW_ITEM_TYPE_TCP detected\");\n@@ -553,8 +556,9 @@ struct nfp_mask_id_entry {\n \t\t\tbreak;\n \t\tcase RTE_FLOW_ITEM_TYPE_VXLAN:\n \t\t\tPMD_DRV_LOG(DEBUG, \"RTE_FLOW_ITEM_TYPE_VXLAN 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_VXLAN;\n \t\t\tkey_ls->key_layer |= NFP_FLOWER_LAYER_VXLAN;\n \t\t\tif (outer_ip4_flag) {\n@@ -564,6 +568,19 @@ struct nfp_mask_id_entry {\n \t\t\t\t * in `struct nfp_flower_ipv4_udp_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 |= NFP_FLOWER_LAYER_EXT_META;\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_ext_meta);\n+\t\t\t\tkey_ls->key_size += sizeof(struct nfp_flower_ipv6_udp_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_udp_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 VXLAN tunnel.\");\n+\t\t\t\treturn -EINVAL;\n \t\t\t}\n \t\t\tbreak;\n \t\tdefault:\n@@ -884,42 +901,61 @@ struct nfp_mask_id_entry {\n \t\tconst struct rte_flow_item *item,\n \t\tconst struct nfp_flow_item_proc *proc,\n \t\tbool is_mask,\n-\t\t__rte_unused bool is_outer_layer)\n+\t\tbool is_outer_layer)\n {\n \tstruct nfp_flower_ipv6 *ipv6;\n \tconst struct rte_ipv6_hdr *hdr;\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_ipv6_udp_tun *ipv6_udp_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 \n-\tif (spec == NULL) {\n-\t\tPMD_DRV_LOG(DEBUG, \"nfp flow merge ipv6: no item->spec!\");\n-\t\tgoto ipv6_end;\n-\t}\n+\tif (is_outer_layer && nfp_flow_is_tunnel(nfp_flow)) {\n+\t\tif (spec == NULL) {\n+\t\t\tPMD_DRV_LOG(DEBUG, \"nfp flow merge ipv6: no item->spec!\");\n+\t\t\treturn 0;\n+\t\t}\n \n-\t/*\n-\t * reserve space for L4 info.\n-\t * rte_flow has ipv4 before L4 but NFP flower fw requires L4 before ipv4\n-\t */\n-\tif (meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_TP)\n-\t\t*mbuf_off += sizeof(struct nfp_flower_tp_ports);\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+\t} else {\n+\t\tif (spec == NULL) {\n+\t\t\tPMD_DRV_LOG(DEBUG, \"nfp flow merge ipv6: no item->spec!\");\n+\t\t\tgoto ipv6_end;\n+\t\t}\n \n-\thdr = is_mask ? &mask->hdr : &spec->hdr;\n-\tipv6 = (struct nfp_flower_ipv6 *)*mbuf_off;\n+\t\t/*\n+\t\t * reserve space for L4 info.\n+\t\t * rte_flow has ipv4 before L4 but NFP flower fw requires L4 before ipv6\n+\t\t */\n+\t\tif (meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_TP)\n+\t\t\t*mbuf_off += sizeof(struct nfp_flower_tp_ports);\n+\n+\t\thdr = is_mask ? &mask->hdr : &spec->hdr;\n+\t\tipv6 = (struct nfp_flower_ipv6 *)*mbuf_off;\n \n-\tipv6->ip_ext.tos = (hdr->vtc_flow & RTE_IPV6_HDR_TC_MASK) >>\n-\t\t\tRTE_IPV6_HDR_TC_SHIFT;\n-\tipv6->ip_ext.proto = hdr->proto;\n-\tipv6->ip_ext.ttl = hdr->hop_limits;\n-\tmemcpy(ipv6->ipv6_src, hdr->src_addr, sizeof(ipv6->ipv6_src));\n-\tmemcpy(ipv6->ipv6_dst, hdr->dst_addr, sizeof(ipv6->ipv6_dst));\n+\t\tipv6->ip_ext.tos = (hdr->vtc_flow & RTE_IPV6_HDR_TC_MASK) >>\n+\t\t\t\tRTE_IPV6_HDR_TC_SHIFT;\n+\t\tipv6->ip_ext.proto = hdr->proto;\n+\t\tipv6->ip_ext.ttl = hdr->hop_limits;\n+\t\tmemcpy(ipv6->ipv6_src, hdr->src_addr, sizeof(ipv6->ipv6_src));\n+\t\tmemcpy(ipv6->ipv6_dst, hdr->dst_addr, sizeof(ipv6->ipv6_dst));\n \n ipv6_end:\n-\t*mbuf_off += sizeof(struct nfp_flower_ipv6);\n+\t\t*mbuf_off += sizeof(struct nfp_flower_ipv6);\n+\t}\n \n \treturn 0;\n }\n@@ -1088,7 +1124,7 @@ struct nfp_mask_id_entry {\n }\n \n static int\n-nfp_flow_merge_vxlan(__rte_unused struct rte_flow *nfp_flow,\n+nfp_flow_merge_vxlan(struct rte_flow *nfp_flow,\n \t\tchar **mbuf_off,\n \t\tconst struct rte_flow_item *item,\n \t\tconst struct nfp_flow_item_proc *proc,\n@@ -1097,8 +1133,15 @@ struct nfp_mask_id_entry {\n {\n \tconst struct rte_vxlan_hdr *hdr;\n \tstruct nfp_flower_ipv4_udp_tun *tun4;\n+\tstruct nfp_flower_ipv6_udp_tun *tun6;\n+\tstruct nfp_flower_meta_tci *meta_tci;\n \tconst struct rte_flow_item_vxlan *spec;\n \tconst struct rte_flow_item_vxlan *mask;\n+\tstruct nfp_flower_ext_meta *ext_meta = NULL;\n+\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 \tspec = item->spec;\n \tif (spec == NULL) {\n@@ -1109,11 +1152,21 @@ struct nfp_mask_id_entry {\n \tmask = item->mask ? item->mask : proc->mask_default;\n \thdr = is_mask ? &mask->hdr : &spec->hdr;\n \n-\ttun4 = (struct nfp_flower_ipv4_udp_tun *)*mbuf_off;\n-\ttun4->tun_id = hdr->vx_vni;\n+\tif (ext_meta && (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_udp_tun *)*mbuf_off;\n+\t\ttun6->tun_id = hdr->vx_vni;\n+\t} else {\n+\t\ttun4 = (struct nfp_flower_ipv4_udp_tun *)*mbuf_off;\n+\t\ttun4->tun_id = hdr->vx_vni;\n+\t}\n \n vxlan_end:\n-\t*mbuf_off += sizeof(struct nfp_flower_ipv4_udp_tun);\n+\tif (ext_meta && (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_udp_tun);\n+\telse\n+\t\t*mbuf_off += sizeof(struct nfp_flower_ipv4_udp_tun);\n \n \treturn 0;\n }\n@@ -1122,7 +1175,8 @@ struct nfp_mask_id_entry {\n static const struct nfp_flow_item_proc nfp_flow_item_proc_list[] = {\n \t[RTE_FLOW_ITEM_TYPE_END] = {\n \t\t.next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_ETH,\n-\t\t\tRTE_FLOW_ITEM_TYPE_IPV4),\n+\t\t\tRTE_FLOW_ITEM_TYPE_IPV4,\n+\t\t\tRTE_FLOW_ITEM_TYPE_IPV6),\n \t},\n \t[RTE_FLOW_ITEM_TYPE_ETH] = {\n \t\t.next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_VLAN,\n@@ -1395,6 +1449,7 @@ struct nfp_mask_id_entry {\n \tchar *mbuf_off_exact;\n \tbool is_tun_flow = false;\n \tbool is_outer_layer = true;\n+\tstruct nfp_flower_meta_tci *meta_tci;\n \tconst struct rte_flow_item *loop_item;\n \n \tmbuf_off_exact = nfp_flow->payload.unmasked_data +\n@@ -1404,6 +1459,12 @@ struct nfp_mask_id_entry {\n \t\t\tsizeof(struct nfp_flower_meta_tci) +\n \t\t\tsizeof(struct nfp_flower_in_port);\n \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\tmbuf_off_exact += sizeof(struct nfp_flower_ext_meta);\n+\t\tmbuf_off_mask += sizeof(struct nfp_flower_ext_meta);\n+\t}\n+\n \t/* Check if this is a tunnel flow and get the inner item*/\n \tis_tun_flow = nfp_flow_inner_item_get(items, &loop_item);\n \tif (is_tun_flow)\n", "prefixes": [ "v2", "02/25" ] }