Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/117769/?format=api
{ "id": 117769, "url": "http://patches.dpdk.org/api/patches/117769/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1665382142-21684-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": "<1665382142-21684-8-git-send-email-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1665382142-21684-8-git-send-email-chaoyong.he@corigine.com", "date": "2022-10-10T06:08:45", "name": "[v2,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/1665382142-21684-8-git-send-email-chaoyong.he@corigine.com/mbox/", "series": [ { "id": 25072, "url": "http://patches.dpdk.org/api/series/25072/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=25072", "date": "2022-10-10T06:08:38", "name": "add the basic rte_flow offload support of nfp PMD", "version": 2, "mbox": "http://patches.dpdk.org/series/25072/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/117769/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/117769/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 72255A0544;\n\tMon, 10 Oct 2022 08:10:16 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 0573E42B80;\n\tMon, 10 Oct 2022 08:09:36 +0200 (CEST)", "from NAM02-SN1-obe.outbound.protection.outlook.com\n (mail-sn1anam02on2099.outbound.protection.outlook.com [40.107.96.99])\n by mails.dpdk.org (Postfix) with ESMTP id B73C942802\n for <dev@dpdk.org>; Mon, 10 Oct 2022 08:09:34 +0200 (CEST)", "from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5)\n by SN4PR13MB5296.namprd13.prod.outlook.com (2603:10b6:806:207::14)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.14; Mon, 10 Oct\n 2022 06:09:33 +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; Mon, 10 Oct 2022\n 06:09:33 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=hA0k0crTFnUxPJw8UDNpDtu+QcY6WkSI/d3hJxom21UqjBe9wzMzpztdP5bmkLbZ5mmwM/Ngh9RQ8hRbuXThA8W+uwExel68x0AEAxi+uOTR6QSBL63V3/C/WZI3WFsrXwfUfwQnFpKXCVMtlaeDfXv/Qur+ZTMhhN3Fav90MkwMJ+UluDDcZhI2x6ZSbGCTZyhCx9KFTbKdl1vcmsCrkhL3hXvOwMUziH251jH0AL3zBE+wbIUGBOnMle9+yOIdARiwlpMKfO4yGuOfXUMZDPTLUsyzPxZOi4/ADJLpBrOaHjaXvfcsSZFpxlJNqYf3SY5hT0U9NdHXLF4YQ7GKvg==", "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=zvSGEEBUB0CNMeVkJgjEg5IZa/TXlir4TymKhRTIYto=;\n b=YJzSH2bvFgSKf+JQuFs6fJR+0+w9vDyWcqev+IlOTOH1W0+TDXQt35NhieP/bj4TVacvyqQr5KNHAUslWxC0Mzmka0ZNNPghOswAdpjPDR4tHsZvAqbeT/Wvn3k2PtKYkSDlhwuS0TBaHA1kplpToY1nDXR00+eMQDtR5+mt/fZ7s9JhsiQczFSfnGv4M4/FHbvkbmXmurYFK12HLBnW2fVWfrPIbBMWywHJpJTmOFgk3Netpi+2I2d4wi3zu7F20TCPaYvLs0wX72N6X10uYnHxMLcBxB3CKsN6IpZhn3PryocRPh4il9MP+NCSaZhlNPunchxN7ipSZ2jRejWA+w==", "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=zvSGEEBUB0CNMeVkJgjEg5IZa/TXlir4TymKhRTIYto=;\n b=Gb7CKz5xjhu7oxpV4Dn6u4fksMhJ0obLhVzClPd1bJc+02eEmqzM6uKl2YvQQkEz8aFPA9Ftj/raKxmjqZ2uw+cyxxkE8ivUlX0xsj8W3YoMCrnDBllE9Ev+UmZYBuxVkMQCP41ByzxImgmT1j370RIEdZ1LTh5JPsgUNlwma60=", "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 07/24] net/nfp: add the offload support of IPv4 item", "Date": "Mon, 10 Oct 2022 14:08:45 +0800", "Message-Id": "<1665382142-21684-8-git-send-email-chaoyong.he@corigine.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1665382142-21684-1-git-send-email-chaoyong.he@corigine.com>", "References": "<1665382142-21684-1-git-send-email-chaoyong.he@corigine.com>", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "X-ClientProxiedBy": "SI2PR01CA0051.apcprd01.prod.exchangelabs.com\n (2603:1096:4:193::6) 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_|SN4PR13MB5296:EE_", "X-MS-Office365-Filtering-Correlation-Id": "8dcf2f2e-ce46-435a-3b74-08daaa86003a", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n BUnO2SnGFWhk07CK2wMpf55okyH8QP4SprscGzxtabO81yESTnI2Ps+KQS9EtfSL7q+WhkR0utllqukcTdekpsyC7NSSuIK1fjDxcpA642thXmJ1fRTvEEQf8XYJaVsXix4ZJ3p50/b/ZaoULLHEYw3G7kZF4IUuosd6BCtoJvehuXIrurD/BGtLdYWLcdfCi4B6ipb3ag+WcEsxsTKsh73W24EME1nykCmswJ1P7iJ0maGVfMFX42dTW4j95F/3rmwKpbuBR/3DpUS8Xyyhj+Y4AqFSmAOUvixKszWpY0qu7MzJtYgYHZ0PxM85103dSablmah1We9W8R5AP4nk01C3bbioUUu3PDvQI0wf6Jl6ej0aZ9qwPV4ebQMhUhRBkTE626Z9jBLtvEBSsW44WpPEDSIXPxOUgW1UpkF3y9Tuhm4WWW3Xbw+mGZbYSR17LGxAK40ZAiEALro8goFjy1GA6OjBDXvglm0AcBlZJ5PP5pmzW+z4VzENZToioTqCmYq9yZU7gOpnIvArDQYQpzTaLF4Om8kpqvKHM2eXrqhe/ZsIaGFeF8mf+2DDHrzkAfQ6UvInZYLM+6lUawkc6F0Y1mdjLxXc99ZPoTQDBbQ1CaEfZl9n4zrfTPCi9OpFADFuEotxtpSt3xpqYeOD3Y+OgMIlKYa56HdDC0NY0KCXx5emrYBm8xlBYLjBXXksshnpTJ+JqGCIxxOoqGe3jMB4SQPeRIbLcVeONqeltZKiFPHJOXSGCjHcYw6mLb3phoECou7orRJj5uk5u/0Rqz71GnT2we6wJQ75Ogv1HkE=", "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)(366004)(396003)(346002)(376002)(136003)(39830400003)(451199015)(6916009)(316002)(2906002)(186003)(6486002)(2616005)(66476007)(6666004)(107886003)(66556008)(41300700001)(66946007)(83380400001)(8936002)(8676002)(4326008)(5660300002)(66574015)(44832011)(26005)(6506007)(6512007)(52116002)(86362001)(478600001)(36756003)(38350700002)(38100700002);\n DIR:OUT; SFP:1102;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "=?utf-8?q?9zzIo56YwxnEk32XsgbCRl42unbO?=\n\t=?utf-8?q?XgUtZwlTZd90tgFeNjvMY11dtrIfubzGnb3/HTWhvWaU9qjZGG+Ncmduw1L1rnWM2?=\n\t=?utf-8?q?/4TPBH+7MASIt6cRcsBvZfb7lb7pZe2ggddzx0Cz4+kmernMj98X4h28wYRBqRQN5?=\n\t=?utf-8?q?Xj8Ll/GRZOCeH/sA4/X1iVeqI2oF858mCVqQIL2R/Yun2LVaMUQHeKPsuKheJLQ5c?=\n\t=?utf-8?q?VGqE7Jkjpi/gFaZR1gg9zq8kv50i/pALztpOiEe0g4E1DQSA9dCzvf0lIKux7WDib?=\n\t=?utf-8?q?QMqO44fg+pQZq+bl64oy51NWPbF5Oif7xTtc+lRkdxbT3VBeN6UaI6WWBQvd1GzYU?=\n\t=?utf-8?q?3IidNWCFxgoHfDV9Ugd1cIJgLJHuI1BxWrW/70g0cGS7sAjQawcRLYls7OOT8r9sx?=\n\t=?utf-8?q?nxC+UkptUTf0ub2Sqm7NbCU1FPQQV7Sm1WaiXWmIhlURdiPNZH+3poWFGudVCRdfG?=\n\t=?utf-8?q?MsfWbx9oia68oGi4hiG4l98JVFHBnEWV/k9BdASe0W7r225Jk3lK/4mp/eNeOiWkN?=\n\t=?utf-8?q?5G15hOgZ5sJuNjwk7gvHCPFDKorJVNsmdbzK9jgBZ5hI3y6JTQTdfzQQ7czuwrF4C?=\n\t=?utf-8?q?ua3uLzjxuD5p2Hz56jC8kejiLIqgTRgeMcP2KmKKjtZkFv1ckHay/OdRzpARWA/OH?=\n\t=?utf-8?q?0wcjdeVILknWrdmf8mHP0K5xe45ICkYP7vTAX3lHKHDt971AXBpLXHBJhJaznQPnv?=\n\t=?utf-8?q?p/qnxXTy5zUJAhpMi3+pUgxMuGA1qnTsYole4kOp2DyI2HoqMKWXCES9+zzclLxov?=\n\t=?utf-8?q?8DRRRGBpzjuF/agGBA8inkOtpVlhesfILceR9Cjs7edCr9LjhF7c3JO4IwvvWfS5p?=\n\t=?utf-8?q?BAzOqOJvPyMwzSl9WoduTS3GOvVgMmGktNrRVnmQqzoJdzVKR0Qd/WgQ+UmcD6821?=\n\t=?utf-8?q?osMfybW8M6YwbQauGNIsYBesJns8nV046VuMtcfBBiUGU/iyD1Sp0yYODD5dm7gCA?=\n\t=?utf-8?q?DpLoMrR2CuDASxB6QzTB7/5v6ZXcHatWjWHnGrXMP56e/S4j7snqfvMluTFhfsxBz?=\n\t=?utf-8?q?NsqBrRqTTWYa1ep5v/PELSJq2gzIkg/X+dYi4fKluEwIKYkhmbgme5F9TWlk8iaFi?=\n\t=?utf-8?q?ADqxVAxuWv5KwaJapxVb8SZuZiSfk2hJVD+MMtR6e143ESsK7sqNuRX3F51sNBoO4?=\n\t=?utf-8?q?6Pv9zA1J9pY/PGX594rSgGHOO3iM+i2UpTRAfMTMJBnna6aDe6K8e4BVjw2YvzdD4?=\n\t=?utf-8?q?/yrU/gZGFqGDd69DQEBWSDCgsC3kt3w6Jw90nuVp6gzVTb2e8h2n/B/oWoYPI63yF?=\n\t=?utf-8?q?aQN8aXHvQ+gHhJCfATz70N9tYUfsNhQfLuh1E9PGpJ53VMiXn6noJ/auZR8O2ddmf?=\n\t=?utf-8?q?3jhOhMj66W3tP2+biCUvSFa8m8RcyoikSNVgDHKOCqMYNKgpJ1VmG5MtMzEeSyCdx?=\n\t=?utf-8?q?aoX/hiTQLZI21pnejA4xHEA2fEO+hNe4aJUxK9/zuyIXsTyHp36mNvB0J2LxwvWSl?=\n\t=?utf-8?q?XPm10HUVFj5RKf9wY81UCVgfwLv3Y93D+mzDrtRjFoAUeVMRuGlCum1ESO3W422Mi?=\n\t=?utf-8?q?Aq8ataXbQADhjQWaLRustnHVqHoEqrtjaQ=3D=3D?=", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 8dcf2f2e-ce46-435a-3b74-08daaa86003a", "X-MS-Exchange-CrossTenant-AuthSource": "SJ0PR13MB5545.namprd13.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Internal", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "10 Oct 2022 06:09:33.5471 (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 JFHMrxz/T3xjPRg5ewXwyCeZpB9pRZpbRmRU1OIG6Cq7Gppis5QsLROpS3GW+IEgYl2f/g422ONROp2KztGNlYsUHYRfXs+ypb1dcOjzONw=", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "SN4PR13MB5296", "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 9160cc6..8de49df 100644\n--- a/doc/guides/rel_notes/release_22_11.rst\n+++ b/doc/guides/rel_notes/release_22_11.rst\n@@ -155,6 +155,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": [ "v2", "07/24" ] }