Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/118685/?format=api
{ "id": 118685, "url": "http://patches.dpdk.org/api/patches/118685/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1666232391-29152-9-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": "<1666232391-29152-9-git-send-email-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1666232391-29152-9-git-send-email-chaoyong.he@corigine.com", "date": "2022-10-20T02:19:34", "name": "[v5,08/25] net/nfp: support IPv4 flow item", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "13d364d1cb2e28f3f878b387ec652d11f60d7ff6", "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/1666232391-29152-9-git-send-email-chaoyong.he@corigine.com/mbox/", "series": [ { "id": 25325, "url": "http://patches.dpdk.org/api/series/25325/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=25325", "date": "2022-10-20T02:19:26", "name": "add the basic rte_flow offload support of nfp PMD", "version": 5, "mbox": "http://patches.dpdk.org/series/25325/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/118685/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/118685/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 86BEAA0A02;\n\tThu, 20 Oct 2022 04:21:53 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 3FF3D42C7B;\n\tThu, 20 Oct 2022 04:21:15 +0200 (CEST)", "from NAM04-MW2-obe.outbound.protection.outlook.com\n (mail-mw2nam04on2092.outbound.protection.outlook.com [40.107.101.92])\n by mails.dpdk.org (Postfix) with ESMTP id 280FF42C62\n for <dev@dpdk.org>; Thu, 20 Oct 2022 04:21:12 +0200 (CEST)", "from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5)\n by DM4PR13MB5906.namprd13.prod.outlook.com (2603:10b6:8:4c::10) with\n Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.16; Thu, 20 Oct\n 2022 02:21:10 +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; Thu, 20 Oct 2022\n 02:21:10 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=nndP8Zf3UKMoLEv4fCbA9C4A3dvgEzc35ec4RbcnL74YM/HnPWBEWSQKYnj6sLoPpJtWgpkp6wUrOcwV2zYMspsaT1bfvGHPrzYMcyWyF+stmDS8qLmFZADX+xKxXRLwtMjSryR1WIcOk7a+Qv+U6y5xO9JWaQgNeY6kLcY3xH/VKAVny2D93qftPF1u7CknR901hMDNkeJahXOnQzC3qAZLDqVr9xKa1Ep4udDgysUF0zKiiFL/EJSXTSY+0BeayM82eh4bpNb5NlRQdy2v+tXhLkHczPcGRQivM9pkUvT2GZ+uQ0Tk8knsmtPerqg6PbvrPGbl9vygScGtgy54zg==", "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=W3IEvErI/BEPl4bMonRFZMe0FmQw+hU6WcDjT/Fnzsk=;\n b=QcUUxNDIbQsMpOgslB0QkMBJAH/9l4+1Dmgb6zJ9Wmr0fn1mye2H9OvypyPWd7ST84BkTsHBrXr6R8k2lThwLna7MQbiG8QDfYnb4MV94ghAb+50FezKCXWIPoFN4LofA8QEqx6rGiu9ICsd0LsrFPd2tr4hQkryRKvWou8M7916kNW3iuKEs7tisL2IVf5awTBrT5iyaaT35M4KoPSwO1TifTLVFszGmskwRZ6ES5OJTwebL2HxL3X1/j3KkEL4vBDVLLdONf47eD5GWGdD0Ag1vU/E6ycmkz+5wJWgSS2Y6UIQZPk2zy2NoLLbCRPO6/rp6WU1VZDXoSEMpdhuXA==", "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=W3IEvErI/BEPl4bMonRFZMe0FmQw+hU6WcDjT/Fnzsk=;\n b=kYyde+Ut9qR7giO7gczRi8IC17E6TEjVI1GyoDLcwTAJXBMNqoTnEpcpmuI+ajj1apXH2oeTo/nNgUG3/8i7D4VIsQTlAaCkIe6tLpQNYTdsjgoih2uXrxloJDAFXO8thwJOu/RJXDGHVxXboDpa5rHf2q8YezAa4YfLk7U0xCA=", "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 v5 08/25] net/nfp: support IPv4 flow item", "Date": "Thu, 20 Oct 2022 10:19:34 +0800", "Message-Id": "<1666232391-29152-9-git-send-email-chaoyong.he@corigine.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1666232391-29152-1-git-send-email-chaoyong.he@corigine.com>", "References": "<1666092434-10357-1-git-send-email-chaoyong.he@corigine.com>\n <1666232391-29152-1-git-send-email-chaoyong.he@corigine.com>", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "X-ClientProxiedBy": "SI2PR02CA0048.apcprd02.prod.outlook.com\n (2603:1096:4:196::23) 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_|DM4PR13MB5906:EE_", "X-MS-Office365-Filtering-Correlation-Id": "56108169-4b3a-44ea-fe65-08dab241c09f", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n EFSdZOE2UlCAXCFMWrGfrlnKXv5pM0Fll4DYXI/PxH6eWBX/SKCMKJD/OvwkyyDYw3egbsJnXA7RIR5+HDfwNFtPR91nb3P7S7PQVhVwkixtYnPvWIFu4FwnKeU/pd3k1qUgs7yNwsX6WLqqBIVO/o/GFo5wXCCkYBWpn5zX8eHf0yU8DBxw/o4+ZEUPO5O96xZ5QAomYBf9AC0xI9NIbR+uJTxKCwtHQzVnbtKLHwhfeF9c2EnX7yqOggbWbkTjZv4B0Sj6rPkz+Vs6nhMFUfBbPCYgQvXShWnFAqOJfyXtcdXXzpKB5byTf1cdmeG7qCSFcgCiohB9qqNFuD1fVYvv4GykC0uaUw09ixS40XN03DIK28utvjP3iSMTItXxorD8n9+zhKL0iMoaCysVlR+ttF29PifseySh984mWYsu9CAKGLMb9F3rE6wUaJlFgsUjawy4p9L4SaUJRDGQRSr3ZJKHsstICR426l+ZL4fb2PK4w2/0AQqORZI4yzG/W3LovD8LBiZ5t8iJymG/pq9InBXxRejaZU+zgl1z4KMY9JW+H0Nc/rUuvT5NNDuO/EwLCZkmE118xc776f9p1IU8GCB3dwFu9FbDBUOQIlMcHkiWOxUfZKAd1i4rdAMkYNXYUbcXTPxWo34AN6hV9dxiejNLCf4SewmOxvnphO0Sac1lKNViSHz25v+gJ6/75y0om5tGvbGxoCFSNpLGLPR54JuFjKjunhHwqZALRcKNwNs04HprGVF2LdIbC+5n8Im/wcdk39Ds/8jmtJt47nGrkjOA79sTAbE7V3TxQEJqBfMyMxCwjhcYQqKW5/NE", "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)(376002)(39840400004)(346002)(396003)(366004)(451199015)(38100700002)(478600001)(38350700002)(316002)(6916009)(2906002)(186003)(66476007)(52116002)(66556008)(6666004)(66946007)(107886003)(4326008)(6506007)(2616005)(41300700001)(5660300002)(36756003)(8676002)(6486002)(8936002)(26005)(66574015)(44832011)(86362001)(83380400001)(6512007);\n DIR:OUT; SFP:1102;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "=?utf-8?q?mfjM9fwiJqYF4UeG4CnEfQw9M91+?=\n\t=?utf-8?q?KfFRVFwM/QgbxJSld/PYA3jD6cNeRZyozWd+khfPwzhPg3jh3f9eZMxW7kxUZutWB?=\n\t=?utf-8?q?z3W88IFB/J9UUEdCRpxub1hKpUtkgKxVKiahQ8xltsKD0B7xVkHTnwNAi9iB9zgZ1?=\n\t=?utf-8?q?PFzDCFjFdfviCRwZ8lxGAdkNVa/eaotsP/V7wzozWw0Qd2K0HDr8Ofx7HURVtF2rw?=\n\t=?utf-8?q?FghEbtykkbQ7HD3FVq2RGO10uz3drne6ts7NkFCegGyhNcreIfSoFpIDub9CqpBVR?=\n\t=?utf-8?q?mKpF8QmLhSiy9wAsa8iZmIWenqWbx0jhuMr/d+XnV1jGNn1wHEbvDi7ecVuW1YY+P?=\n\t=?utf-8?q?7cU4I9AeMlj8PCVxrL66q73lnugKzKT/loYgj5XFmLBCCemB+byugkk8GOotkeHS9?=\n\t=?utf-8?q?eookavS8z4rAUjrVORQGdbBkNrue8gTS1nCiZ0myt7dxKQ4cnAQP/T4v0vXARae2f?=\n\t=?utf-8?q?iYtYzu5GgA5zbOkwuts/9gcAo6I2cfK5FOinbSjChqGcTGaL5PrIVhTO5bY+ucd2e?=\n\t=?utf-8?q?rr57fg+CZIAebGDu3BoQDS2aQ3BZa6p40IdMIVvuUwHb1EqnbDrT3f5UVxMltp328?=\n\t=?utf-8?q?7ejbT1ARBuFEFU0my+sIlw/D2KCKrlbdRdI74s2a4w7RpXZEvCburzdVdKBcEOvcq?=\n\t=?utf-8?q?sf0GBlnS1rcguG4kEI/wGHiaGAwwhObSGBjZ1r09DWqgVecRvcasfekrxJAB6tl7g?=\n\t=?utf-8?q?5QAbPIGQv6uNjgYWwPxR7gmqHg5gwt+su97g68bEVhD6cyRTIhQ+1KLZt+QlgCs06?=\n\t=?utf-8?q?gTDVA7NszmAoyOJtHj26paZ6ixrAzMfqnRI5vMROclgSvgczkFzmQgURLSnmYKmwA?=\n\t=?utf-8?q?lna6l40VsT5dmR5jEUpY9SnN7irHAeK0VeRwAGXjEM/Q2n23pDPwomvpKh6g141eG?=\n\t=?utf-8?q?9Ik82OauU98/bfKdm0UT/K0NJb1KBF7scJoXGaqbOD4HCHqIcPG+gaNRZUFeZkHaj?=\n\t=?utf-8?q?/GSj9Xp4vrwQG+EYDwE+xfE5/GcsM60dUEqpcLf0Qe/3STfzZuL+WjC4mj0dB+Kwl?=\n\t=?utf-8?q?Gh/NFp6aKP6sw/vGu1x7OhPalTJElaxfKgLhvbeHls2wPIQ6CPETIDGAoU4fPdgWs?=\n\t=?utf-8?q?BFSuYxj7zGAQhIe56Fu1RTRvE4+Qq7SlCV6crnlKIDYR80ko3VAz0d1fSoGZG5+HW?=\n\t=?utf-8?q?vy2fabhDeYf/8yUuXoQPnIxY5XdEeSR3wR4XF+1/A74Vxh5HJIcnanm/MkUet1PIO?=\n\t=?utf-8?q?4jnZL0Azq/jZusLMmegLvEQKBA631Y5fMC2sY7zsiSfsWjxvfplPWc4nZv6oCwmWG?=\n\t=?utf-8?q?uH1+9sLFO0SgUnUgZGRxhoydzBUWBExviCM/IGLO0RORPTSMxzeOT+o6ykBO9CDzs?=\n\t=?utf-8?q?uKey5zc2J77BceBVW25rslJEm7oXS5iRj3W3RNbSTsxQTxSKF14S2tRmrNx6tOEJi?=\n\t=?utf-8?q?semq28CKG3AKZ+dmvvltF6tifYMgXvTaaSpTQCkiGKwuJfmIhBD2M4YVTOOiRzpol?=\n\t=?utf-8?q?OGRgA4OeyXKXW3lVYh6g/55PB83/4zHRa3J0GTOWtKxQJcc8dv89jIY8/84bsBWX+?=\n\t=?utf-8?q?6H6gpnCt9GhNkkyy78RcAx2b0/QlNJ00bA=3D=3D?=", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 56108169-4b3a-44ea-fe65-08dab241c09f", "X-MS-Exchange-CrossTenant-AuthSource": "SJ0PR13MB5545.namprd13.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Internal", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "20 Oct 2022 02:21:10.3643 (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 w//b7eBgIf8q+PayRLt1IPXaSyYTmyfCzXfB9eLgtpnO6gp3Pg6BwYYcTaC0Rr+DQIZTWPjMqgWZg6Ty/d1kbwg30BSMrJ7rUwYv87NJGrc=", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "DM4PR13MB5906", "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 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 | 38 ++++++++++++++++++\n drivers/net/nfp/nfp_flow.c | 68 +++++++++++++++++++++++++++++++-\n 3 files changed, 106 insertions(+), 1 deletion(-)", "diff": "diff --git a/doc/guides/nics/features/nfp.ini b/doc/guides/nics/features/nfp.ini\nindex b0af2a0..bf59123 100644\n--- a/doc/guides/nics/features/nfp.ini\n+++ b/doc/guides/nics/features/nfp.ini\n@@ -28,6 +28,7 @@ Usage doc = Y\n \n [rte_flow items]\n eth = Y\n+ipv4 = Y\n port_id = Y\n vlan = Y\n \ndiff --git a/drivers/net/nfp/flower/nfp_flower_cmsg.h b/drivers/net/nfp/flower/nfp_flower_cmsg.h\nindex d776e37..5964ecf 100644\n--- a/drivers/net/nfp/flower/nfp_flower_cmsg.h\n+++ b/drivers/net/nfp/flower/nfp_flower_cmsg.h\n@@ -253,6 +253,44 @@ struct nfp_flower_mac_mpls {\n \trte_be32_t mpls_lse;\n };\n \n+/*\n+ * L4 ports (for UDP, TCP, SCTP) (1W/4B)\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+ * | port_src | port_dst |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ */\n+struct nfp_flower_tp_ports {\n+\trte_be16_t port_src;\n+\trte_be16_t port_dst;\n+};\n+\n+struct nfp_flower_ip_ext {\n+\tuint8_t tos;\n+\tuint8_t proto;\n+\tuint8_t ttl;\n+\tuint8_t flags;\n+};\n+\n+/*\n+ * L3 IPv4 details (3W/12B)\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+ * | DSCP |ECN| protocol | ttl | flags |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ * | ipv4_addr_src |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ * | ipv4_addr_dst |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ */\n+struct nfp_flower_ipv4 {\n+\tstruct nfp_flower_ip_ext ip_ext;\n+\trte_be32_t ipv4_src;\n+\trte_be32_t ipv4_dst;\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 107cd5b..928f149 100644\n--- a/drivers/net/nfp/nfp_flow.c\n+++ b/drivers/net/nfp/nfp_flow.c\n@@ -522,6 +522,11 @@ struct nfp_mask_id_entry {\n \t\t\tPMD_DRV_LOG(DEBUG, \"RTE_FLOW_ITEM_TYPE_VLAN detected\");\n \t\t\tkey_ls->vlan = NFP_FLOWER_MASK_VLAN_CFI;\n \t\t\tbreak;\n+\t\tcase RTE_FLOW_ITEM_TYPE_IPV4:\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\tbreak;\n \t\tdefault:\n \t\t\tPMD_DRV_LOG(ERR, \"Item type %d not supported.\", item->type);\n \t\t\treturn -ENOTSUP;\n@@ -662,13 +667,58 @@ struct nfp_mask_id_entry {\n \treturn 0;\n }\n \n+static int\n+nfp_flow_merge_ipv4(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+{\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+\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+\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+\n+\thdr = is_mask ? &mask->hdr : &spec->hdr;\n+\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+\n+ipv4_end:\n+\t*mbuf_off += sizeof(struct nfp_flower_ipv4);\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},\n \t[RTE_FLOW_ITEM_TYPE_ETH] = {\n-\t\t.next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_VLAN),\n+\t\t.next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_VLAN,\n+\t\t\tRTE_FLOW_ITEM_TYPE_IPV4),\n \t\t.mask_support = &(const struct rte_flow_item_eth){\n \t\t\t.hdr = {\n \t\t\t\t.dst_addr.addr_bytes = \"\\xff\\xff\\xff\\xff\\xff\\xff\",\n@@ -682,6 +732,7 @@ struct nfp_mask_id_entry {\n \t\t.merge = nfp_flow_merge_eth,\n \t},\n \t[RTE_FLOW_ITEM_TYPE_VLAN] = {\n+\t\t.next_item = NEXT_ITEM(RTE_FLOW_ITEM_TYPE_IPV4),\n \t\t.mask_support = &(const struct rte_flow_item_vlan){\n \t\t\t.hdr = {\n \t\t\t\t.vlan_tci = RTE_BE16(0xefff),\n@@ -693,6 +744,21 @@ struct nfp_mask_id_entry {\n \t\t.mask_sz = sizeof(struct rte_flow_item_vlan),\n \t\t.merge = nfp_flow_merge_vlan,\n \t},\n+\t[RTE_FLOW_ITEM_TYPE_IPV4] = {\n+\t\t.mask_support = &(const struct rte_flow_item_ipv4){\n+\t\t\t.hdr = {\n+\t\t\t\t.type_of_service = 0xff,\n+\t\t\t\t.fragment_offset = RTE_BE16(0xffff),\n+\t\t\t\t.time_to_live = 0xff,\n+\t\t\t\t.next_proto_id = 0xff,\n+\t\t\t\t.src_addr = RTE_BE32(0xffffffff),\n+\t\t\t\t.dst_addr = RTE_BE32(0xffffffff),\n+\t\t\t},\n+\t\t},\n+\t\t.mask_default = &rte_flow_item_ipv4_mask,\n+\t\t.mask_sz = sizeof(struct rte_flow_item_ipv4),\n+\t\t.merge = nfp_flow_merge_ipv4,\n+\t},\n };\n \n static int\n", "prefixes": [ "v5", "08/25" ] }