Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/118311/?format=api
{ "id": 118311, "url": "https://patches.dpdk.org/api/patches/118311/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1666063359-34283-2-git-send-email-chaoyong.he@corigine.com/", "project": { "id": 1, "url": "https://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": "<1666063359-34283-2-git-send-email-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1666063359-34283-2-git-send-email-chaoyong.he@corigine.com", "date": "2022-10-18T03:22:15", "name": "[01/25] net/nfp: add the offload support of IPv4 VXLAN item", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "6db34faae8db0df2b9bd275a11e13531036da52e", "submitter": { "id": 2554, "url": "https://patches.dpdk.org/api/people/2554/?format=api", "name": "Chaoyong He", "email": "chaoyong.he@corigine.com" }, "delegate": { "id": 319, "url": "https://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1666063359-34283-2-git-send-email-chaoyong.he@corigine.com/mbox/", "series": [ { "id": 25269, "url": "https://patches.dpdk.org/api/series/25269/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=25269", "date": "2022-10-18T03:22:15", "name": "add the extend rte_flow offload support of nfp PMD", "version": 1, "mbox": "https://patches.dpdk.org/series/25269/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/118311/comments/", "check": "warning", "checks": "https://patches.dpdk.org/api/patches/118311/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 BB30BA0560;\n\tTue, 18 Oct 2022 05:23:04 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id A8DBB410E8;\n\tTue, 18 Oct 2022 05:23:04 +0200 (CEST)", "from NAM11-DM6-obe.outbound.protection.outlook.com\n (mail-dm6nam11on2096.outbound.protection.outlook.com [40.107.223.96])\n by mails.dpdk.org (Postfix) with ESMTP id 4C22F4021E\n for <dev@dpdk.org>; Tue, 18 Oct 2022 05:23:03 +0200 (CEST)", "from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5)\n by MN2PR13MB4149.namprd13.prod.outlook.com (2603:10b6:208:24f::20)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.20; Tue, 18 Oct\n 2022 03:23:01 +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; Tue, 18 Oct 2022\n 03:23:01 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=RArBzau5kF9z/8ZQTImoM8xrby4FT9+J76IjrhbV1UwLUuritabwu8dTKXNqdYIUrKbc0E2MwpnFYBwrDbuYODPm/8Pqvbq5N5j+kKHopL3LTcxWdzTwI5XqcU4/Bik4n0dRWmEw+C+uLEXhKd3WLWZNxkLNav1JTj2L0/30d7URYgnEX6YRifNJQNMndoqPvk6tEqifia+XdnqCaj+mtOE9ohRZQ2zuV12szuRvCn8pXDgj2V+kaCzfjqaTsR3kuPGOllASM0JzeZZPGnTPfLiMc/7IKDmuXmVYHbEssfBYw+XqnCYVNxt/eLmv3Ixj+uOSUaXySWSNvokJ3QDGrw==", "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=J8r2eu8a0dxjQvAUfZ1XGdVcLRjBXgnB8L+CNoSGfVg=;\n b=WuYikm5cR6o4HXhd6Rftu7ABjuXDtSahdFlbCaEORXHsPQzsVTUy5Mtc6IkZNiV+XmBDBPmbrYghxwcLsSbbjWNvxucjE0V2NQdt4RK3rjRjlJeH8N3TnoKHXMeumY0l9lFEZyJz+CniwFJmwfmkHXCisxvX1foUCcv6ljvVIvbr1Mvb5ukzUYVJQEy2jQyhYDiNplZk8GyeFE1tj31x4K6+LxuT5esvs+r94t68nXLbxyT1+BOl7sNEFslfo2JVee5zPDVigRXYipWnnEAmmDDU1IsOIyl6XEIEpGJRsQyD88Om0mzapVUqtAhCycfZA9Xl9S4oxlRXLRGDMNptgw==", "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=J8r2eu8a0dxjQvAUfZ1XGdVcLRjBXgnB8L+CNoSGfVg=;\n b=hyARB4FVDYeXC7IadhgtNKgLkZ4bvyeBf3/vNmxuUiWL661QHE02J7MEBZ8vr/ZDpSkykdLAtZlr6tN/9t+SsimdMDrbM5R6G8AjrsOteHIexlHGqGJT3J21Eckpi4sC01Ak8aWVKvmPSeZZUFA4t1mcn2zVie5XtlojIANKM5c=", "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 01/25] net/nfp: add the offload support of IPv4 VXLAN item", "Date": "Tue, 18 Oct 2022 11:22:15 +0800", "Message-Id": "<1666063359-34283-2-git-send-email-chaoyong.he@corigine.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1666063359-34283-1-git-send-email-chaoyong.he@corigine.com>", "References": "<1666063359-34283-1-git-send-email-chaoyong.he@corigine.com>", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "X-ClientProxiedBy": "SG2PR01CA0184.apcprd01.prod.exchangelabs.com\n (2603:1096:4:189::9) 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_|MN2PR13MB4149:EE_", "X-MS-Office365-Filtering-Correlation-Id": "bf69314a-3c7d-4fba-28c9-08dab0b80f8f", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n n3eD/e1lUKLmJjjm4TGpzU6eF9wJHRWMBpUIW66kYp0FT7Mv5g2shizKRXpMkWLcYsFieYamLfzt46Qpsv36vldpP1NaJL5r/ArYqEoAZLzfOAQfl2+eEMI4sqGIewefqvbU0rPQiogc9rPINjr3RLQWL1EDqCgNqYUZ7muNxWFyCuHnaVr8m3yoYHkzrUNgkS0F6J8Gy52X5OaSR5ZQFq5IcFByPQMOVJGrn3Y1H9Somwm+EO29ewzCM/lXb4/VC6LdB3SiRmjH5ICSM9at/SVrArG+JsmNqOGb9+RMggNe3rgP3pPPnWmnGXnutvGBjJkAa1QV3+caotzDFMEMdlv71/WvNuxV405Ci9XSL2Y47uiS1iKq7gWw9SWxoZ2z3yXBtJ0T2E8e0yyrA+tfTmwrxt7KCqOuJnkMQ0PedSy9zvZISAF+9MsYi3UGHt1UccjHO6aQlfe5HWaVuLQk56EmWSHEW2r8bjb4EVRvmz+go4grUJ1d7Pe+uQ46P3MLbvUh9fIzpV52V2OZiDVr3iqtkfXj76S8jNlhSBlyUbnjvlKFz2th45VhoDkT9uz8X0Zxe2FG4ZXVcAUwzrot5bRimLjUUapd3DOCdzriOI+sPByxawEOilb5+QRNiq2DMi5jKn6c1YOUTCjL8D819Vybd1sBFzvc/usnK/xdf4iNVjDox9RFnsbuon6TqJTrumgNMQdFaAZFBJhv2LBS7hE+V4BICviGY6xJoOeaZcGPOLbNLRurXi6DTdZycEgzBAfxi1Wq0dskH1pSGOCO3eiHZyQOTxJeTqbefaLdCR3A4WlEKYhk2YSgZoPhhYNO", "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)(346002)(376002)(396003)(39840400004)(451199015)(38350700002)(86362001)(38100700002)(36756003)(83380400001)(66574015)(5660300002)(52116002)(30864003)(6506007)(2616005)(26005)(6512007)(186003)(6666004)(2906002)(6916009)(316002)(6486002)(107886003)(4326008)(66946007)(66556008)(478600001)(8936002)(44832011)(41300700001)(8676002)(66476007);\n DIR:OUT; SFP:1102;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "=?utf-8?q?HPDCAhoUrv0sm2PJTsuGcTtd/zT0?=\n\t=?utf-8?q?ill3EhsZxDyC97dZTw5yzG3QlR8x3XX2Elv0HO2rAbe8pxIfNKkRtUvA0oDXh/v0D?=\n\t=?utf-8?q?lFay+vmH4qxtrbta1TxtJz0BQRRTlMw0X8kdR9bPOYwJuNYPLfGYTvRiLQtvsEwVp?=\n\t=?utf-8?q?l51jAPmWpGOM5mPXkLFdQac76XYuSY7T+FBiAuXF/fAOPtsx6xGwpH9i9vlGZuw2+?=\n\t=?utf-8?q?FJoVtzezAYQyJaMT48DzJUATbmGs49KyAKI932XdPjR/Qs+kznFIFdOBeVdm0Tpbr?=\n\t=?utf-8?q?2yUtHWxrqEi47l6hWAKSms6cic2Z1vQZ2qBJsYAlUSPIJpRyQvJ69pGGj4BtQXGm4?=\n\t=?utf-8?q?H4L0NPNBgyeEHUkIf7DQpUkJdGNGBecTMsW7aN/mND4TlN2YuWNP/VQGIZPaclHfi?=\n\t=?utf-8?q?1gFpQNUgxcCKKHJ7CkcLys6/n0fF25c1YvUBwMNF5m4kPyYS7Lhl+sMhcgczIQ+R1?=\n\t=?utf-8?q?Uj5k5qC5n/iyALHyATAJa0T7gvTM54rGelsNPkPes6YcJdzBlt3Nfh64vQQRnsVh5?=\n\t=?utf-8?q?5XGnuv+X0hVxbJ0E5t4IIrW3ErBPY4KKfoZ/9jzf+MzX4mzhubSlxhsABtC5JLwsO?=\n\t=?utf-8?q?8p8P0T7exHnTsEqNnz1JnBE7CPya2cycAE6vtigM5QC/ABgm7L1WNKvBEglZnZJAR?=\n\t=?utf-8?q?zYY2wzNev2T3jGXzqmvm7DCZUTpneqv6N4rZkxV2M4eF2SEBqSzH6CMR3tTw0nKKD?=\n\t=?utf-8?q?DlDYaW2FtAzqKy2UdM3/0ZbT6yXmbHH5eVjyadnH6POSalzDqaf4ve5ES+ejQh9VY?=\n\t=?utf-8?q?WfqPc9pa0NxLHzNQxUSBzXDWt5iUy8fPryhJcPiYdoDlX6qTzKigMmutB1NMfgRB+?=\n\t=?utf-8?q?wajqknAMn3dDPmYuAydigOtUQPuBkUcPNiHOelowU6i8HN+T3uEE7Xqh3lrYMiP4O?=\n\t=?utf-8?q?9OPd1Vb+JFm1y4ArZKgTAS2N824/3EM+kUjEmK28VrmiowDKYygHLrolMjz1jCAHa?=\n\t=?utf-8?q?SNeCFl4PPPfsy599/yf9eXNRysafG5An3DOyaH8ZTsKPNcu8vOKE2v813ZjulF/Wf?=\n\t=?utf-8?q?UQuVSZ12m3HgTLGfr0oMbKdQx8GO1culx92WrJzCioJK5cxlSMDC8VvmSoDegXtMg?=\n\t=?utf-8?q?R5XMBKnz0Mk9gPIJIG0kBib2gGchr/Ga27vykU9Vnv1WLFMJt4MAom/gVf8QQ0m8h?=\n\t=?utf-8?q?nXXj0fQFf+0+cHtwz/J2tVL0Rt/WcwiyFrxb/rjMKyqcmqAjAZnmgKuq31G0SAPUR?=\n\t=?utf-8?q?brFX2xj0lugHAjM69InMK/jqUzLqINl8fwaO+zESg+5ikGsb/kfuberOJgLgPrfIT?=\n\t=?utf-8?q?jQf5zeUUe5Y8NrrlSrpJK7cGbmHqCgePLr7HhpIIxv5bMiaZAE/bUS0U7DW5/4Ui1?=\n\t=?utf-8?q?hkWAyVlYyeEy6Mm0IwK9kJxFxBF5FGbeq5K2p2O5ODn+1aqlzgY/5SPb4HJeWiCWr?=\n\t=?utf-8?q?Dek1dlSIuXdagmqafVTiTURKZ41L56wpJxCYaQFenOiM1vhwyoSoVSsxj2mUeWlel?=\n\t=?utf-8?q?677FjTbksEBaoY5wrIplXJ8zCgoYAKq+BgxLU/92pgNS+nKFaAAMGEImlGvp30/yl?=\n\t=?utf-8?q?vi4z/5JvLDvFKZqQASYV6TRJhvU1F2osJA=3D=3D?=", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n bf69314a-3c7d-4fba-28c9-08dab0b80f8f", "X-MS-Exchange-CrossTenant-AuthSource": "SJ0PR13MB5545.namprd13.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Internal", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "18 Oct 2022 03:23:01.0982 (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 qJHDu/TqXeuj+k7nlzJtKwuWrC/g1OqwuptnXKT+K/YlcXEbyvDVkTYqXhrl3LBS6TxxPSM82avphOEeUr0IgHjdY46tZcuCGmQkBQ0JhQs=", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "MN2PR13MB4149", "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 IPv4 VXLAN 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 | 1 +\n drivers/net/nfp/flower/nfp_flower_cmsg.h | 35 +++++\n drivers/net/nfp/nfp_flow.c | 243 ++++++++++++++++++++++++++-----\n 3 files changed, 246 insertions(+), 33 deletions(-)", "diff": "diff --git a/doc/guides/nics/features/nfp.ini b/doc/guides/nics/features/nfp.ini\nindex 1ad6c2c..40b9a4d 100644\n--- a/doc/guides/nics/features/nfp.ini\n+++ b/doc/guides/nics/features/nfp.ini\n@@ -36,6 +36,7 @@ sctp = Y\n tcp = Y\n udp = Y\n vlan = Y\n+vxlan = Y\n \n [rte_flow actions]\n count = Y\ndiff --git a/drivers/net/nfp/flower/nfp_flower_cmsg.h b/drivers/net/nfp/flower/nfp_flower_cmsg.h\nindex 6bf8ff7..08e2873 100644\n--- a/drivers/net/nfp/flower/nfp_flower_cmsg.h\n+++ b/drivers/net/nfp/flower/nfp_flower_cmsg.h\n@@ -324,6 +324,41 @@ struct nfp_flower_ipv6 {\n \tuint8_t ipv6_dst[16];\n };\n \n+struct nfp_flower_tun_ipv4 {\n+\trte_be32_t src;\n+\trte_be32_t dst;\n+};\n+\n+struct nfp_flower_tun_ip_ext {\n+\tuint8_t tos;\n+\tuint8_t ttl;\n+};\n+\n+/*\n+ * Flow Frame IPv4 UDP TUNNEL --> Tunnel details (5W/20B)\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+ * | Reserved | tos | ttl |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ * | Reserved |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ * | VNI | Reserved |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ */\n+struct nfp_flower_ipv4_udp_tun {\n+\tstruct nfp_flower_tun_ipv4 ipv4;\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 823b020..5f6f800 100644\n--- a/drivers/net/nfp/nfp_flow.c\n+++ b/drivers/net/nfp/nfp_flow.c\n@@ -38,7 +38,8 @@ struct nfp_flow_item_proc {\n \t\t\tchar **mbuf_off,\n \t\t\tconst struct rte_flow_item *item,\n \t\t\tconst struct nfp_flow_item_proc *proc,\n-\t\t\tbool is_mask);\n+\t\t\tbool is_mask,\n+\t\t\tbool is_outer_layer);\n \t/* List of possible subsequent items. */\n \tconst enum rte_flow_item_type *const next_item;\n };\n@@ -503,6 +504,7 @@ struct nfp_mask_id_entry {\n \t\tstruct nfp_fl_key_ls *key_ls)\n {\n \tstruct rte_eth_dev *ethdev;\n+\tbool outer_ip4_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@@ -538,6 +540,8 @@ struct nfp_mask_id_entry {\n \t\t\tPMD_DRV_LOG(DEBUG, \"RTE_FLOW_ITEM_TYPE_IPV4 detected\");\n \t\t\tkey_ls->key_layer |= NFP_FLOWER_LAYER_IPV4;\n \t\t\tkey_ls->key_size += sizeof(struct nfp_flower_ipv4);\n+\t\t\tif (!outer_ip4_flag)\n+\t\t\t\touter_ip4_flag = true;\n \t\t\tbreak;\n \t\tcase RTE_FLOW_ITEM_TYPE_IPV6:\n \t\t\tPMD_DRV_LOG(DEBUG, \"RTE_FLOW_ITEM_TYPE_IPV6 detected\");\n@@ -559,6 +563,21 @@ struct nfp_mask_id_entry {\n \t\t\tkey_ls->key_layer |= NFP_FLOWER_LAYER_TP;\n \t\t\tkey_ls->key_size += sizeof(struct nfp_flower_tp_ports);\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\tkey_ls->key_layer &= ~NFP_FLOWER_LAYER_IPV4;\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+\t\t\t\tkey_ls->key_size += sizeof(struct nfp_flower_ipv4_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_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}\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@@ -737,12 +756,25 @@ struct nfp_mask_id_entry {\n \treturn ret;\n }\n \n+static bool\n+nfp_flow_is_tunnel(struct rte_flow *nfp_flow)\n+{\n+\tstruct nfp_flower_meta_tci *meta_tci;\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_VXLAN)\n+\t\treturn true;\n+\n+\treturn false;\n+}\n+\n static int\n nfp_flow_merge_eth(__rte_unused 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-\t\tbool is_mask)\n+\t\tbool is_mask,\n+\t\t__rte_unused bool is_outer_layer)\n {\n \tstruct nfp_flower_mac_mpls *eth;\n \tconst struct rte_flow_item_eth *spec;\n@@ -778,7 +810,8 @@ struct nfp_mask_id_entry {\n \t\t__rte_unused char **mbuf_off,\n \t\tconst struct rte_flow_item *item,\n \t\tconst struct nfp_flow_item_proc *proc,\n-\t\tbool is_mask)\n+\t\tbool is_mask,\n+\t\t__rte_unused bool is_outer_layer)\n {\n \tstruct nfp_flower_meta_tci *meta_tci;\n \tconst struct rte_flow_item_vlan *spec;\n@@ -807,41 +840,58 @@ struct nfp_mask_id_entry {\n \t\tchar **mbuf_off,\n \t\tconst struct rte_flow_item *item,\n \t\tconst struct nfp_flow_item_proc *proc,\n-\t\tbool is_mask)\n+\t\tbool is_mask,\n+\t\tbool is_outer_layer)\n {\n \tstruct nfp_flower_ipv4 *ipv4;\n \tconst struct rte_ipv4_hdr *hdr;\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_ipv4_udp_tun *ipv4_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 ipv4: no item->spec!\");\n-\t\tgoto ipv4_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 ipv4: 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\tipv4_udp_tun = (struct nfp_flower_ipv4_udp_tun *)*mbuf_off;\n \n-\thdr = is_mask ? &mask->hdr : &spec->hdr;\n-\tipv4 = (struct nfp_flower_ipv4 *)*mbuf_off;\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} else {\n+\t\tif (spec == NULL) {\n+\t\t\tPMD_DRV_LOG(DEBUG, \"nfp flow merge ipv4: no item->spec!\");\n+\t\t\tgoto ipv4_end;\n+\t\t}\n+\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 ipv4\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\tipv4 = (struct nfp_flower_ipv4 *)*mbuf_off;\n \n-\tipv4->ip_ext.tos = hdr->type_of_service;\n-\tipv4->ip_ext.proto = hdr->next_proto_id;\n-\tipv4->ip_ext.ttl = hdr->time_to_live;\n-\tipv4->ipv4_src = hdr->src_addr;\n-\tipv4->ipv4_dst = hdr->dst_addr;\n+\t\tipv4->ip_ext.tos = hdr->type_of_service;\n+\t\tipv4->ip_ext.proto = hdr->next_proto_id;\n+\t\tipv4->ip_ext.ttl = hdr->time_to_live;\n+\t\tipv4->ipv4_src = hdr->src_addr;\n+\t\tipv4->ipv4_dst = hdr->dst_addr;\n \n ipv4_end:\n-\t*mbuf_off += sizeof(struct nfp_flower_ipv4);\n+\t\t*mbuf_off += sizeof(struct nfp_flower_ipv4);\n+\t}\n \n \treturn 0;\n }\n@@ -851,7 +901,8 @@ struct nfp_mask_id_entry {\n \t\tchar **mbuf_off,\n \t\tconst struct rte_flow_item *item,\n \t\tconst struct nfp_flow_item_proc *proc,\n-\t\tbool is_mask)\n+\t\tbool is_mask,\n+\t\t__rte_unused bool is_outer_layer)\n {\n \tstruct nfp_flower_ipv6 *ipv6;\n \tconst struct rte_ipv6_hdr *hdr;\n@@ -896,7 +947,8 @@ struct nfp_mask_id_entry {\n \t\tchar **mbuf_off,\n \t\tconst struct rte_flow_item *item,\n \t\tconst struct nfp_flow_item_proc *proc,\n-\t\tbool is_mask)\n+\t\tbool is_mask,\n+\t\t__rte_unused bool is_outer_layer)\n {\n \tuint8_t tcp_flags;\n \tstruct nfp_flower_tp_ports *ports;\n@@ -968,7 +1020,8 @@ struct nfp_mask_id_entry {\n \t\tchar **mbuf_off,\n \t\tconst struct rte_flow_item *item,\n \t\tconst struct nfp_flow_item_proc *proc,\n-\t\tbool is_mask)\n+\t\tbool is_mask,\n+\t\tbool is_outer_layer)\n {\n \tchar *ports_off;\n \tstruct nfp_flower_tp_ports *ports;\n@@ -982,6 +1035,12 @@ struct nfp_mask_id_entry {\n \t\treturn 0;\n \t}\n \n+\t/* Don't add L4 info if working on a inner layer pattern */\n+\tif (!is_outer_layer) {\n+\t\tPMD_DRV_LOG(INFO, \"Detected inner layer UDP, skipping.\");\n+\t\treturn 0;\n+\t}\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_IPV4) {\n \t\tports_off = *mbuf_off - sizeof(struct nfp_flower_ipv4) -\n@@ -1009,7 +1068,8 @@ struct nfp_mask_id_entry {\n \t\tchar **mbuf_off,\n \t\tconst struct rte_flow_item *item,\n \t\tconst struct nfp_flow_item_proc *proc,\n-\t\tbool is_mask)\n+\t\tbool is_mask,\n+\t\t__rte_unused bool is_outer_layer)\n {\n \tchar *ports_off;\n \tstruct nfp_flower_tp_ports *ports;\n@@ -1045,10 +1105,42 @@ struct nfp_mask_id_entry {\n \treturn 0;\n }\n \n+static int\n+nfp_flow_merge_vxlan(__rte_unused 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+\t\tbool is_mask,\n+\t\t__rte_unused bool is_outer_layer)\n+{\n+\tconst struct rte_vxlan_hdr *hdr;\n+\tstruct nfp_flower_ipv4_udp_tun *tun4;\n+\tconst struct rte_flow_item_vxlan *spec;\n+\tconst struct rte_flow_item_vxlan *mask;\n+\n+\tspec = item->spec;\n+\tif (spec == NULL) {\n+\t\tPMD_DRV_LOG(DEBUG, \"nfp flow merge vxlan: no item->spec!\");\n+\t\tgoto vxlan_end;\n+\t}\n+\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+\n+vxlan_end:\n+\t*mbuf_off += sizeof(struct nfp_flower_ipv4_udp_tun);\n+\n+\treturn 0;\n+}\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-\t\t.next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_ETH),\n+\t\t.next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_ETH,\n+\t\t\tRTE_FLOW_ITEM_TYPE_IPV4),\n \t},\n \t[RTE_FLOW_ITEM_TYPE_ETH] = {\n \t\t.next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_VLAN,\n@@ -1131,6 +1223,7 @@ struct nfp_mask_id_entry {\n \t\t.merge = nfp_flow_merge_tcp,\n \t},\n \t[RTE_FLOW_ITEM_TYPE_UDP] = {\n+\t\t.next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_VXLAN),\n \t\t.mask_support = &(const struct rte_flow_item_udp){\n \t\t\t.hdr = {\n \t\t\t\t.src_port = RTE_BE16(0xffff),\n@@ -1152,6 +1245,17 @@ struct nfp_mask_id_entry {\n \t\t.mask_sz = sizeof(struct rte_flow_item_sctp),\n \t\t.merge = nfp_flow_merge_sctp,\n \t},\n+\t[RTE_FLOW_ITEM_TYPE_VXLAN] = {\n+\t\t.next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_ETH),\n+\t\t.mask_support = &(const struct rte_flow_item_vxlan){\n+\t\t\t.hdr = {\n+\t\t\t\t.vx_vni = RTE_BE32(0xffffff00),\n+\t\t\t},\n+\t\t},\n+\t\t.mask_default = &rte_flow_item_vxlan_mask,\n+\t\t.mask_sz = sizeof(struct rte_flow_item_vxlan),\n+\t\t.merge = nfp_flow_merge_vxlan,\n+\t},\n };\n \n static int\n@@ -1205,21 +1309,53 @@ struct nfp_mask_id_entry {\n \treturn ret;\n }\n \n+static bool\n+nfp_flow_is_tun_item(const struct rte_flow_item *item)\n+{\n+\tif (item->type == RTE_FLOW_ITEM_TYPE_VXLAN)\n+\t\treturn true;\n+\n+\treturn false;\n+}\n+\n+static bool\n+nfp_flow_inner_item_get(const struct rte_flow_item items[],\n+\t\tconst struct rte_flow_item **inner_item)\n+{\n+\tconst struct rte_flow_item *item;\n+\n+\t*inner_item = items;\n+\n+\tfor (item = items; item->type != RTE_FLOW_ITEM_TYPE_END; ++item) {\n+\t\tif (nfp_flow_is_tun_item(item)) {\n+\t\t\t*inner_item = ++item;\n+\t\t\treturn true;\n+\t\t}\n+\t}\n+\n+\treturn false;\n+}\n+\n static int\n nfp_flow_compile_item_proc(const struct rte_flow_item items[],\n \t\tstruct rte_flow *nfp_flow,\n \t\tchar **mbuf_off_exact,\n-\t\tchar **mbuf_off_mask)\n+\t\tchar **mbuf_off_mask,\n+\t\tbool is_outer_layer)\n {\n \tint i;\n \tint ret = 0;\n+\tbool continue_flag = true;\n \tconst struct rte_flow_item *item;\n \tconst struct nfp_flow_item_proc *proc_list;\n \n \tproc_list = nfp_flow_item_proc_list;\n-\tfor (item = items; item->type != RTE_FLOW_ITEM_TYPE_END; ++item) {\n+\tfor (item = items; item->type != RTE_FLOW_ITEM_TYPE_END && continue_flag; ++item) {\n \t\tconst struct nfp_flow_item_proc *proc = NULL;\n \n+\t\tif (nfp_flow_is_tun_item(item))\n+\t\t\tcontinue_flag = false;\n+\n \t\tfor (i = 0; proc_list->next_item && proc_list->next_item[i]; ++i) {\n \t\t\tif (proc_list->next_item[i] == item->type) {\n \t\t\t\tproc = &nfp_flow_item_proc_list[item->type];\n@@ -1248,14 +1384,14 @@ struct nfp_mask_id_entry {\n \t\t}\n \n \t\tret = proc->merge(nfp_flow, mbuf_off_exact, item,\n-\t\t\t\tproc, false);\n+\t\t\t\tproc, false, is_outer_layer);\n \t\tif (ret != 0) {\n \t\t\tPMD_DRV_LOG(ERR, \"nfp flow item %d exact merge failed\", item->type);\n \t\t\tbreak;\n \t\t}\n \n \t\tret = proc->merge(nfp_flow, mbuf_off_mask, item,\n-\t\t\t\tproc, true);\n+\t\t\t\tproc, true, is_outer_layer);\n \t\tif (ret != 0) {\n \t\t\tPMD_DRV_LOG(ERR, \"nfp flow item %d mask merge failed\", item->type);\n \t\t\tbreak;\n@@ -1275,6 +1411,9 @@ struct nfp_mask_id_entry {\n \tint ret;\n \tchar *mbuf_off_mask;\n \tchar *mbuf_off_exact;\n+\tbool is_tun_flow = false;\n+\tbool is_outer_layer = true;\n+\tconst struct rte_flow_item *loop_item;\n \n \tmbuf_off_exact = nfp_flow->payload.unmasked_data +\n \t\t\tsizeof(struct nfp_flower_meta_tci) +\n@@ -1283,14 +1422,29 @@ 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+\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+\t\tis_outer_layer = false;\n+\n \t/* Go over items */\n-\tret = nfp_flow_compile_item_proc(items, nfp_flow,\n-\t\t\t&mbuf_off_exact, &mbuf_off_mask);\n+\tret = nfp_flow_compile_item_proc(loop_item, nfp_flow,\n+\t\t\t&mbuf_off_exact, &mbuf_off_mask, is_outer_layer);\n \tif (ret != 0) {\n \t\tPMD_DRV_LOG(ERR, \"nfp flow item compile failed.\");\n \t\treturn -EINVAL;\n \t}\n \n+\t/* Go over inner items */\n+\tif (is_tun_flow) {\n+\t\tret = nfp_flow_compile_item_proc(items, nfp_flow,\n+\t\t\t\t&mbuf_off_exact, &mbuf_off_mask, true);\n+\t\tif (ret != 0) {\n+\t\t\tPMD_DRV_LOG(ERR, \"nfp flow outer item compile failed.\");\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\t}\n+\n \treturn 0;\n }\n \n@@ -2123,12 +2277,35 @@ struct nfp_mask_id_entry {\n \treturn 0;\n }\n \n+static int\n+nfp_flow_tunnel_match(__rte_unused struct rte_eth_dev *dev,\n+\t\t__rte_unused struct rte_flow_tunnel *tunnel,\n+\t\t__rte_unused struct rte_flow_item **pmd_items,\n+\t\tuint32_t *num_of_items,\n+\t\t__rte_unused struct rte_flow_error *err)\n+{\n+\t*num_of_items = 0;\n+\n+\treturn 0;\n+}\n+\n+static int\n+nfp_flow_tunnel_item_release(__rte_unused struct rte_eth_dev *dev,\n+\t\t__rte_unused struct rte_flow_item *pmd_items,\n+\t\t__rte_unused uint32_t num_of_items,\n+\t\t__rte_unused struct rte_flow_error *err)\n+{\n+\treturn 0;\n+}\n+\n static const struct rte_flow_ops nfp_flow_ops = {\n \t.validate = nfp_flow_validate,\n \t.create = nfp_flow_create,\n \t.destroy = nfp_flow_destroy,\n \t.flush = nfp_flow_flush,\n \t.query = nfp_flow_query,\n+\t.tunnel_match = nfp_flow_tunnel_match,\n+\t.tunnel_item_release = nfp_flow_tunnel_item_release,\n };\n \n int\n", "prefixes": [ "01/25" ] }