Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/117512/?format=api
{ "id": 117512, "url": "http://patches.dpdk.org/api/patches/117512/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1665109126-16201-8-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": "<1665109126-16201-8-git-send-email-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1665109126-16201-8-git-send-email-chaoyong.he@corigine.com", "date": "2022-10-07T02:18:29", "name": "[07/24] net/nfp: add the offload support of IPv4 item", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "d7239f4ef26e27d05ecb0bf9875a2875e89ed6e3", "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/1665109126-16201-8-git-send-email-chaoyong.he@corigine.com/mbox/", "series": [ { "id": 25023, "url": "http://patches.dpdk.org/api/series/25023/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=25023", "date": "2022-10-07T02:18:22", "name": "add the basic rte_flow offload support of nfp PMD", "version": 1, "mbox": "http://patches.dpdk.org/series/25023/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/117512/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/117512/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 7D72DA0093;\n\tFri, 7 Oct 2022 04:20:05 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 5640842B79;\n\tFri, 7 Oct 2022 04:19:26 +0200 (CEST)", "from NAM11-CO1-obe.outbound.protection.outlook.com\n (mail-co1nam11on2138.outbound.protection.outlook.com [40.107.220.138])\n by mails.dpdk.org (Postfix) with ESMTP id AA35042B81\n for <dev@dpdk.org>; Fri, 7 Oct 2022 04:19:24 +0200 (CEST)", "from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5)\n by SA1PR13MB5465.namprd13.prod.outlook.com (2603:10b6:806:230::12)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.10; Fri, 7 Oct\n 2022 02:19:23 +0000", "from SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::a192:2720:1ef8:2773]) by SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::a192:2720:1ef8:2773%4]) with mapi id 15.20.5723.010; Fri, 7 Oct 2022\n 02:19:22 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=lWqeCY4M1xIkESFAgPioMW5d5UoaxxbNALdBAZhq8Eg1GdBBplD2mdiVCzxzaIimfkPu0yKECaxYqjUHaE1/SQo81gbpW6TV0HwPRKSqBvj32grYs6ljjFaWN5x432PI29COAn+GZ+jzzYZyW7gyyU/I+fqzoAmcNue3/uFvdZq6BnEYJbFu31H2kPH3nw6NKfZF3Crz8Nb2eBy4iy3SKw1kXOm26rGlnXB90cT6Lk22MmDv2JzEzbHDpRvYO/2YJywSgt6QY/l/q9XMQBIDqg1L4Gcc5hoZ0jjjuU9S7XgeuBgRwwDbNiDgdQT2GKhSs/Zm9xEYKZK6qM6k1GuZEg==", "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=/WsqtYNYAoQ8U8j++uvFCtlY6RJG5vuJm6y7yMuKpUk=;\n b=M/afxNawm42l4L05mnO9iYIK+qOrddQ9HB/b3GvSPCApD7Jv8HmIR57/tN6qIYrc+o7sxKqtFhr4kd1qk681eKL9A+gGgzC6MqZzmyMzwi+9essusK9YPSuhMa/bLj8WzQEDohoo3J6tPsDky23HcPFT/QR8LqsMtOqN2WIstmwM6WyCgIVJLNcEfX6vqd7xe5uQ70zP+uPuZV56bZmO9iVXMCHRETiV9sY/S2UzclG/84vNfY2KiGZQKxXLhk/5Gaycmnh6RsWsyieHHX4rOhn80Su3PT/znulqxwcllcxgEmnBNtFsB+2NG9U6HQNJu6FiPIZLjXXLiBAlqKFWlQ==", "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=/WsqtYNYAoQ8U8j++uvFCtlY6RJG5vuJm6y7yMuKpUk=;\n b=f5eQEgMZ77ottGHAoB/a5sLOEZsvgrzhsWNV62n+tBoZApjavjdMeJbdupfSNj+BRRuixd86RFUxePhC778ws/3gjHKmW5bzy8nPcGY1tf27GDKjWQMyygZVFuf7bth1khmpddnA+4+sRu9NTWxRiC8xx5jDUhpi3wy76AzbCvs=", "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 07/24] net/nfp: add the offload support of IPv4 item", "Date": "Fri, 7 Oct 2022 10:18:29 +0800", "Message-Id": "<1665109126-16201-8-git-send-email-chaoyong.he@corigine.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1665109126-16201-1-git-send-email-chaoyong.he@corigine.com>", "References": "<1665109126-16201-1-git-send-email-chaoyong.he@corigine.com>", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "X-ClientProxiedBy": "SG2P153CA0043.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c6::12)\n 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_|SA1PR13MB5465:EE_", "X-MS-Office365-Filtering-Correlation-Id": "ed830205-40a3-4722-438a-08daa80a592e", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n sPWSOHm7H6PyOegWKhTN5r+QOx/xlKOzRiZ0q24yyI8RfJLoKxPr9q51Yt94ZvzXgmhta5xTLilVQbwFH8/QnqXYNbETLjAnDMlcBIp7KGB/xIoChk9HOaTUr+R7+EMYc+n/pAgP/krmDooxJg3M4IzwXW8UZOBqepg3qNrz0ePS8kQCVAEaw02tg+8a4tz68yMrfWEBHwW0uI0pYQPvf91VvYLAGMoImBZynrbN6sUu03xRrykC/L6vDZjjWO2/+39JoIIP7+sQVaPIbFgyS8Kl0Tz5ECy+L8YAJLk+GJ7TkFjw25cdYLwQOwgL6h9W2ZUbGJjby+TXR9Mv6bUY3iux+4LgGWIpMwR32HIJRzY9Z2lIFi656WDp6F0wjE/EZ+oBmwX17Psskz/T3AcDnVc88JNDX9SMjmFBHHOLpGm+nvG1qdaote4cw6BsOZtfEcrVDSdJcbisQ1jFmiW6LZ761SkuCNnKLmJ4c3zoykvq5eF0Zjfq3KpKSysH2f+tTbTn5V8adexd6mrfMMCdqK4AAa9m2JEirSjl580InogpCi4MS2CA+472+OGtbXpR3j7c2Y3mOLwKQfvDE+tRTb7+zeGp+pfI3j/SNuphx78Nyr2keN6/ieaL1VRmjHBvmZpEwCYte3MFoZE4aQjLiMZa8uE9iUggiLM0AcTgu2U36YRTmyVQMe6fow2NJliBTc/UwOOqCLWNgj4GBqlPEtbzwEuhDcSnaFzMgcG7SWqveKbhSkdreRuKEj8ra5tB", "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)(39830400003)(366004)(136003)(346002)(376002)(396003)(451199015)(36756003)(86362001)(66946007)(44832011)(38350700002)(38100700002)(8936002)(6486002)(6916009)(66574015)(83380400001)(52116002)(478600001)(41300700001)(6512007)(4326008)(107886003)(26005)(2616005)(6506007)(316002)(5660300002)(66476007)(66556008)(2906002)(186003)(8676002);\n DIR:OUT; SFP:1102;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "=?utf-8?q?Z+hJoYyRAycEv0D5GvBy52f0tCoT?=\n\t=?utf-8?q?hXQlO8CyRxuP1TknUDQUiYig9NpStOEqPVJSkIHhYLrOGgVxZk1FRvNLW756gY7au?=\n\t=?utf-8?q?vMj5ILwr1LnGcxSxkpFKHkNrXhFbiMtX2QgX8YvOvjsx1zxt30u1d+ItXBdDumTC4?=\n\t=?utf-8?q?Ahx7urzTbwvBe1OWXDLfIzatOkHxb0q2E8+o4Gicl4rAmljJz2xJVmhjZb66WPLiJ?=\n\t=?utf-8?q?VrE3bOhYbou7vngf49AYZYy9FuZy7iz4M7JPENe3xmxB1f1OJHECLAJLYh7XAp/Xu?=\n\t=?utf-8?q?5dYPYLMurFq3BL06cSSUr5WIKK4t1BLkZwTm7q8SFs/hR8VzuJY3+AjwcF2qsF7g4?=\n\t=?utf-8?q?SCcJpGmPbethMU3+82GeyowJ5rwwmbc2OFzTplDLEX8IR+YaXWqijSIB2zQTv7h+e?=\n\t=?utf-8?q?qhP947xDeVorUErqeZKE8qKmN2eZfHAF6/Y1t/zpaE2OpOqhwszEuDu+0GmeNSnn+?=\n\t=?utf-8?q?UnrIz+8e7SFkxXOJww1q1na39GyuXK/q+LL4hPwDGSea0BU6arhVpPcPj5ucl72u3?=\n\t=?utf-8?q?4J/KShWjYZrzpvpkegrGktxOm4ZZ7KPooG4y1A/P9TbA36wChCCxTHEn+UymaNfJc?=\n\t=?utf-8?q?wKt+pdeOUGivFX6QCriqlu51MthlzyRgYWdas7tULOwNQ1WjOxd0FF4J04+OxM39U?=\n\t=?utf-8?q?LQgqcMcSLcojuOlyAJk7wKNpqjG4k9nFvXIZ9rsLaSCzf5KLbvkJVeVQ1FoDuBS9b?=\n\t=?utf-8?q?SJYgtAh3S7c0MpnI4g/NfoIEugGZgnp/QvNfazHiZtK1G5+7kZBUnuQfHpyfhTRvM?=\n\t=?utf-8?q?MlxJJ6TLGZnIReF3b8CkvVWRdOaXv59Dd9iiII/YdOrXrzvJwNxffNzOqK5dxNyIT?=\n\t=?utf-8?q?0KIDJ3FKpjSWqsWQo4TdrQ4OQkOi3tuxZraQ5WQH/lX5+SkLTDkJk8Jk1SZaMJOqo?=\n\t=?utf-8?q?r44R2uPlnqdRPHJodIeoBaOSc9n6pfltvOdeda3jLXpU7DroukpajD6pF9GNQ7IaG?=\n\t=?utf-8?q?SIm8n0OnH48SKFuB3sM4KIJoOJP5du86tx9gLTbl6zMzKzRpLphjVrXVtjRWujYxf?=\n\t=?utf-8?q?5jLi8pRD5XpKvVmKzi0wGjhpJrhv2qKSBZHprgLiAVHMDNVI6uYB9qidhav4WcGBF?=\n\t=?utf-8?q?Ab3ZrYtGVz/SohOBJzWjNJfbp9/hmH3F4I8ea7erjJpWK23btJIaCmUdqqoJx7yQ1?=\n\t=?utf-8?q?nF6DofqgPDcBN4fTFT+s/L1fE44F0s4Doe8EDKTs1x6dWmrPOlGJJkRuft4HPKp1h?=\n\t=?utf-8?q?zlScAdL43y0xt5xzpbc2FThWoM2bPfKKmx7N8fWIxSUfGOLcTV68bQt5A71UvDp70?=\n\t=?utf-8?q?140XU9O334BXcZQvRAvW/1LZlr/ocTzTv6Jx5Hhm4Wf87mh6ndR7u4i0UR+mq3K9K?=\n\t=?utf-8?q?pE7pq/a26P0Lm5wI5hcB34wJAa8/vp8jrgdfeQAa3TzR/OHROuLQixwvZMIriOuq8?=\n\t=?utf-8?q?Bt967kvdmv4NcWWi3D1nAtW2icekH2x8g6wJEcHLNnFRuvKck0Ann6xkYJoKQddzQ?=\n\t=?utf-8?q?ElHrYeYf7MIK+2bVcC5h5YMghP1QOFywieDYcjuLLZ7Au1fkRzvx9gw4PbsZyUGlF?=\n\t=?utf-8?q?X2kUIAopLh/HQHWhpSnpUFICSNRpCxeawA=3D=3D?=", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n ed830205-40a3-4722-438a-08daa80a592e", "X-MS-Exchange-CrossTenant-AuthSource": "SJ0PR13MB5545.namprd13.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Internal", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "07 Oct 2022 02:19:22.8501 (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 Vkim/cPzrIAKhYGcHED1Ubi8DGsJF6Jff9VrAWcJeguEyNA7WL5vWL/0iRTHYvSHeSnXux9Z0H4EpOSqyE6zNbYz6odeXFjpluFZ94EOlNc=", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "SA1PR13MB5465", "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 doc/guides/rel_notes/release_22_11.rst | 1 +\n drivers/net/nfp/flower/nfp_flower_cmsg.h | 38 ++++++++++++++++++\n drivers/net/nfp/nfp_flow.c | 68 +++++++++++++++++++++++++++++++-\n 4 files changed, 107 insertions(+), 1 deletion(-)", "diff": "diff --git a/doc/guides/nics/features/nfp.ini b/doc/guides/nics/features/nfp.ini\nindex f0ecae2..d4ceae0 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/doc/guides/rel_notes/release_22_11.rst b/doc/guides/rel_notes/release_22_11.rst\nindex 5163264..5eb40df 100644\n--- a/doc/guides/rel_notes/release_22_11.rst\n+++ b/doc/guides/rel_notes/release_22_11.rst\n@@ -109,6 +109,7 @@ New Features\n \n * Ethernet\n * Single VLAN\n+ * IPv4\n \n Add the support of rte_flow actions as follow:\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 b063b96..810f2d7 100644\n--- a/drivers/net/nfp/nfp_flow.c\n+++ b/drivers/net/nfp/nfp_flow.c\n@@ -534,6 +534,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@@ -674,13 +679,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@@ -694,6 +744,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@@ -705,6 +756,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": [ "07/24" ] }