Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/118950/?format=api
{ "id": 118950, "url": "http://patches.dpdk.org/api/patches/118950/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1666427069-10553-2-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-2-git-send-email-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1666427069-10553-2-git-send-email-chaoyong.he@corigine.com", "date": "2022-10-22T08:24:05", "name": "[v2,01/25] net/nfp: support IPv4 VXLAN flow item", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "6db34faae8db0df2b9bd275a11e13531036da52e", "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-2-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/118950/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/118950/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 CEA48A0032;\n\tSat, 22 Oct 2022 10:25:14 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 68EFF40DDB;\n\tSat, 22 Oct 2022 10:25:01 +0200 (CEST)", "from NAM10-DM6-obe.outbound.protection.outlook.com\n (mail-dm6nam10on2110.outbound.protection.outlook.com [40.107.93.110])\n by mails.dpdk.org (Postfix) with ESMTP id 50D1640042\n for <dev@dpdk.org>; Sat, 22 Oct 2022 10:24:58 +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:24:48 +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:48 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=UxeKZRkCrGdeRG5rzyM+b/puuuCt5Ax1JN7tpg5auCIlPV1u5znAj75jreI8E9RCafnaG9L8bGatOd8+UySFikfXGr4F0Z/MtFsHOWS7PqHZ4J3fcS/MyVA9LW7bzyS6wFBfxI/7CSK4JWmds7THJPMji5licSJAzAyFx1X7ARMIzmlKSydjM649/uty7LMuBA7FRcQqSsLm9USdAH5Qs9cOYgSDZ13iTxu7PYsUGrFFbcAVKmUvN24rgIxX7UFEtdT6ZeWDeJIyIkmklsGdeAx4s9kUmlKX/s0ab+Ls5qtM/bCD+SrougsXTKa2C8cQ7fStISCml0HqCoAMJCUTGA==", "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=hmcNZpazN8P0Q14vgyZW5nNrOUPPzibmJFRTvwQs7ck=;\n b=NXoXQ4nj6bzLIV68OiTSInXeQ7MT3foJZe+MT9X08hKjgWRkJcr3Pb6M//s2JzZcKsMpHHfVYyxmn/RC6CaKi83eumV9WoJoc3kQAR+q+82bWgauV5cDF3ytmbBpWXnxCwlwRpR4p+BRfAD5e3PYJGi3GUEpZDSstQGLvlTim1XXMjD9PSwaWEffnKSYNwBaLraMkluZ3AYMYpu8RA88AWb2DAYU/QLVgXfbyU0K5x+i+CBRs64yX6QQ1snsDbG1T3Bhch4QOSF8lJdSmUN4SKtSgaOhx2iRfpnZpu1N+PNU4z5o7KLFb2RRuTapgXdl//SOI9JA0J9Kc6xJuPoTLQ==", "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=hmcNZpazN8P0Q14vgyZW5nNrOUPPzibmJFRTvwQs7ck=;\n b=UYgLI2wuvYyiiTbizFIgFHxFKT/yFcyceoCxI/9bHoj34THWmgFioUViAQQP9ha5JE+3np4vPUWVKI7BJ8nRDo8Tn/f/InU+oUHBcn46yqbm3JdgtL9nKs6KJEl0B3ewnmccx/bIyEUfNqaMHf8zzSl5HiOrta6h/uz5r6YcMdc=", "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 01/25] net/nfp: support IPv4 VXLAN flow item", "Date": "Sat, 22 Oct 2022 16:24:05 +0800", "Message-Id": "<1666427069-10553-2-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": "4d073eb7-6d67-47eb-01bf-08dab406e1f7", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n 5HvWmuWG3XLhXCGVo9Gg3lSeEhS04SMG811B3SSiUyNOkBD8mazr53q4io5c/Bb3NYmFC+IA74aL/fi3J3/c/N8qzpVc1yzsyZqDNGYcW56v7T6RIfCfpmWYaBGUI6RYIGheFQK5Xhjtwi2XfQJJSfydoBy57wS5Wsx2LitW0OhnZIIeyMJyS69P2fAenHPE5A5XRWB1xfBQIf+s990JLN75CXgGRfJ8598apZpdYtgKfpv1tx4ObRJ82vnij8hNPwjjG/08MDjH2Nw2X/zdCi0U0rZ/1lxaBKt9HEgR3PldjXoHMNWOxsTbrycF7aCm/MxekwuVk4Z6CHJgcEGU7M6gDjuZKI0aPuOYnZjk2zLkfoHSuom2bJJie6udhqxMEx/me+dgUxY9/ASmjp6sWAGpXBFjdWBI14aRa1303DcJg3uhW88YtnOkBG0kN7LPSQF6RHyDRwcv5OPdVtOiGDOBj3fub5fdcIO4EbQ7oL4IHIHOSw3Wl/NqNAvkgi2FCxXyHm0j0MqkjuQcwMV+wdTio97E0WeL7Vu+6+OFl8WrlhUkvKR1BRxhkEcB6V9Si0ZRiOWx/1n6/9FrUcQvC0LVWJaY/OPZe4qArpFfqjb9zlNJJMXr6eXxqh00BotFqm9PowItCSqddAzPyQcFm1k8NjPnKBF328qUcq7JpnIkojbmljx+GjB5EU9dRFul6CWWxhizcd9PMWNbWeSEpNVcEkUEvD5r8Djal4JoKoA2K4pE52sf0UEvX3gY4YLb3InJkBKGqkU6A0AorpFw+JVfZrrKYCbavnzZSBz4odWazXUZHIP09AQWCCEdZqvB", "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)(66574015)(83380400001)(2616005)(38350700002)(86362001)(44832011)(30864003)(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?7WVPfHhfFW1RxnBcmYzVWEIjRdWi?=\n\t=?utf-8?q?fG83IUGO2OOp3E//jp4b83+0OUr0ADr5TlfdKV31KHPZNxIucCl0Q4EFxX8HXh940?=\n\t=?utf-8?q?y5N42el6xEDfHoBsvnTFVOqVfPeLzCkx3WR7C/soWU7uVk4tMpn8FyOrXVPOTAfw6?=\n\t=?utf-8?q?WkxffGrJ5P0NbROb/90DDyXGq6HuwcdbS/fjQHclwckd8QiESnY2ExX5MTco5QWYy?=\n\t=?utf-8?q?w4inLSFjJcnFSk7sB5BNc2yyaC3hcqHtY2vy3Ea70Q5rWI8XkNPj1ZpR5ojAzS6kJ?=\n\t=?utf-8?q?eA07NQn/b7T9fzyhwAll4/RLkvFT7ahWJPuzmyeK2rzBWQw3sH+AKIarMR9elTRYz?=\n\t=?utf-8?q?ANSeF1vt1H1sAZYwyjoiM7NI7M4d6T4VGXL2KCuwZZNsAT6lEZaUVJV/pZ5FsyyZG?=\n\t=?utf-8?q?dtx1cPcYLsOp1Oddk/15bqqceZKPxQ0amYFnlQhEKhEorgI1O39mTkEro7xAJfdw9?=\n\t=?utf-8?q?ZRLdI+Bvpk/3tDyAUCVdzpMoTS9U405NEh2yahEg9JlLuS7o4NxPy1WnkRRTJwVtC?=\n\t=?utf-8?q?FiNje3mh8XHU3mboel7DJevWk9ztZq+rndXbwLfejmrVqufG9Z/HD9hCDKFha1c6b?=\n\t=?utf-8?q?xYVyJ037XAfi+RkY9M9HyqhfjxO70j6Lc2vqQgiH8plZ2UXRfLg8Nh0HkHojRcViz?=\n\t=?utf-8?q?zMUgCd5NjIq8YclLe7+8rXIFN9w1ReF47IUpbSgpHndPyKxlGEBk2Krf1fWPmxZxi?=\n\t=?utf-8?q?878bP8Ryt3x/vOhAaYHe2J9E6R1TuOLNgtsMR1Ov8O86lm2KNGcl0Tb6Qty8SK3Pk?=\n\t=?utf-8?q?gafdpWhmdK2b63AxtpNK1bEv+zdvQZ8ZDoy6lQfrErTahk/XIv6hylXCy49QbdjfY?=\n\t=?utf-8?q?pKXf82JuqRcYo3h7/hLxTNpstoIlKha+ewg8y1Atvbq7DHO2FsYudQFHCQEkSkCcn?=\n\t=?utf-8?q?zRkDKp+2NUFa3ji9mOsvEojqqvZ0Gusa0Tq8coW/0GznYe4iAh89J4LyOvLjiVMn5?=\n\t=?utf-8?q?MIPqroyrwvPbpzCnF/bbY3hF/ucCx6l/NdYuQc3OtheJgnb05L1ygJeXQkP7jIcOh?=\n\t=?utf-8?q?uXuZJTM9/0qv6xuM6FusyYR8k0mV3bRDjXevBXtn5Ia/LLJeTtZaMbtlwsnxmz92M?=\n\t=?utf-8?q?/NsDnQ3EFfIVw6PQaChcE2ly0kq6WDK5bymVIYpYwnYxoagxTR6YVRop98noKy6LE?=\n\t=?utf-8?q?2itECFocJDb0oHCtb31SJez6aBR4rZfriCYP3TzgYZ6QqRdZT0MqcyC4WybmUIlDS?=\n\t=?utf-8?q?X+Qpagj5KHYzNF269MDXMqPHAkUJJI+w7yVB7rWEWm4k+hpxFTjZaEtFSeTviRm//?=\n\t=?utf-8?q?ceSv++5kOYxZ3i8ffgtNOfmDBDOpEezJ2l99uV8lwrW4Gcb7rLw/eTjL2v9vhBiNn?=\n\t=?utf-8?q?qz24rigxtI8w2DuofEM7IcsjtXGTHpIBvwdmoA2TRzqOPrbe8biHfk+vMvWjeiaXi?=\n\t=?utf-8?q?A4Pxb0UEIMfKSqJnh2FmvY3fRxlNjIG7kecqVdkYGDtESqJSNhxFRJvUW4HlUG3/d?=\n\t=?utf-8?q?tp/gMs42cCez6Q3+2oYLDgFg3c88+NPrM273DisDLS09nTwcgPVoDgCQh4I5+UWSV?=\n\t=?utf-8?q?6KZF1trZvI+QzuvJkGAvs4z+4nv3IyKWHg=3D=3D?=", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 4d073eb7-6d67-47eb-01bf-08dab406e1f7", "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:48.3179 (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 pn+Y5LZPIE2QNILhvmJrw2tyfLmYFLw8M0aFMMITUGSSTkQF2/LADiv/6cpAcgo/+0yc+gYorKiVz0xKWzaZqztFMc4fijLjGBczfUaqR7A=", "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 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 0184980..faaa7da 100644\n--- a/doc/guides/nics/features/nfp.ini\n+++ b/doc/guides/nics/features/nfp.ini\n@@ -35,6 +35,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 69fc8be..0e1e5ea 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@@ -491,6 +492,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@@ -526,6 +528,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@@ -547,6 +551,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@@ -719,12 +738,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@@ -760,7 +792,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@@ -789,41 +822,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@@ -833,7 +883,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@@ -878,7 +929,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@@ -950,7 +1002,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@@ -964,6 +1017,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@@ -991,7 +1050,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@@ -1027,10 +1087,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@@ -1113,6 +1205,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@@ -1134,6 +1227,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@@ -1187,21 +1291,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@@ -1230,14 +1366,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@@ -1257,6 +1393,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@@ -1265,14 +1404,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@@ -2119,12 +2273,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": [ "v2", "01/25" ] }