Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/118293/?format=api
{ "id": 118293, "url": "http://patches.dpdk.org/api/patches/118293/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1666062752-33689-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": "<1666062752-33689-9-git-send-email-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1666062752-33689-9-git-send-email-chaoyong.he@corigine.com", "date": "2022-10-18T03:12:15", "name": "[v3,08/25] net/nfp: add the offload support of IPv4 item", "commit_ref": null, "pull_url": null, "state": "changes-requested", "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/1666062752-33689-9-git-send-email-chaoyong.he@corigine.com/mbox/", "series": [ { "id": 25268, "url": "http://patches.dpdk.org/api/series/25268/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=25268", "date": "2022-10-18T03:12:07", "name": "add the basic rte_flow offload support of nfp PMD", "version": 3, "mbox": "http://patches.dpdk.org/series/25268/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/118293/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/118293/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 587E5A0560;\n\tTue, 18 Oct 2022 05:13:47 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 5CDD9427F9;\n\tTue, 18 Oct 2022 05:13:08 +0200 (CEST)", "from NAM11-CO1-obe.outbound.protection.outlook.com\n (mail-co1nam11on2106.outbound.protection.outlook.com [40.107.220.106])\n by mails.dpdk.org (Postfix) with ESMTP id 8BFF642B6D\n for <dev@dpdk.org>; Tue, 18 Oct 2022 05:13:06 +0200 (CEST)", "from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5)\n by DM6PR13MB3788.namprd13.prod.outlook.com (2603:10b6:5:242::12) with\n 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:13:05 +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:13:05 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=PRBGaib/VpRCabR4Ew9bHC7O28LTfBa4jPx86JIxjQ1V7TTbNi0/eEfYt9/ESVpTyCbjmdXHFzujgxnLRHD3WVq97IxPJw01bJ0j3EcmtWFxn5My0MYDZAoSeaJiSne5Uia+lhW/fZADb8pw5gAHuNzzzuxPcMmjDd2x4wENeg0u+kM9bvRTwlctZxzxSZlRGMFZfS1uYkHOB/sKYR/kjrHCbylZuOeVpWOb7xhmj6arRTJXAhq/ejeccCiUib+WhvkRpjauyZvOKoCVXHiBVX2DxN82SMZ3A+Q3PKshvCUJ1/2jaL9FcfM6BaNw1h8r8KUJpUuOCbLgO49XLrZ0sA==", "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=bLSAjAQxC9IrN1wV7U99iFr0JMrnkAUB00RGenloIpQ=;\n b=O+BERljA739DutahRJ5mi17pXLvkpVg6IIrIw8a0nbKW7bP++NTuyOyUanpPnh7JDeFGkIj5R0miJs18JpC3Qru4+C4Z6jDVYXpHmATWRF3SZ+J91/I05eSUVI6XupZHcD4lcdb370yAs9uYc5jfk20vxDR6XgVMoWl1/oejS3p6VYkgvdZEW64+hd/kqx//BGIa6LdCbg/iM/mbJUTo57V8mZxAHQXcvSO+fESvUcQ93xN+WUihjzkK+iMQ8ZKw/t9pgTa2omkv/CVqjnV1P2RVFoE8tgSr7re3Ece3rsKFdDHzfHPV3XuCrSxAE6YVr3bm/5aYIaDqAsbFAdixuQ==", "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=bLSAjAQxC9IrN1wV7U99iFr0JMrnkAUB00RGenloIpQ=;\n b=PkIKKTRETTKqY3Y7g2GH8M5x+ibFft8wbIry/HTOrCDzdAJadXQdk2O8HZkn6Wp6XAIZB1eKVul3XPKsb9isCwTuyu2FCh6FKkdh273NdvUAjzPWvZBrn6OfF2xc1JwBT+aIxB3GuVceQEkYkYcRuMR67/mKK+tHE5VOmejtSMo=", "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 v3 08/25] net/nfp: add the offload support of IPv4 item", "Date": "Tue, 18 Oct 2022 11:12:15 +0800", "Message-Id": "<1666062752-33689-9-git-send-email-chaoyong.he@corigine.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1666062752-33689-1-git-send-email-chaoyong.he@corigine.com>", "References": "<1666062752-33689-1-git-send-email-chaoyong.he@corigine.com>", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "X-ClientProxiedBy": "SI1PR02CA0010.apcprd02.prod.outlook.com\n (2603:1096:4:1f7::17) 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_|DM6PR13MB3788:EE_", "X-MS-Office365-Filtering-Correlation-Id": "4fe16a58-67f3-4c53-d66d-08dab0b6ac49", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n aEXSFObsdpjDf7myBg24a6uLqf9OpTXg07rsGHxlStN6CJxF8eO446IXEm8ibduQH5SOuYntZabSr0tYeLfEhRxCgCEHe8P8ilGj2R2GHMtQGL3Uo40VhtxI69DZIpqQR4vxA5GN25SwHToZnU/BO3D/r0QgJPnC4yCKtoZ4ZiUJUoYf92Mps2uya3kRJNQhK0vetcU3dDo4J8OdawqU6hulv+Qh1+ABp7HSbr05mdOFQDrWwhW2khKGHjEp62xk9RK1Pr7x3k51UkVxg6TBy42Y1iDxgtoxgnohwwg3esWty/n6wdDRm6SDm7mpV4nDYHAbJcwPFAxhdA1TRElS6hgsnzAQvOogVKMyUNPkVGvtaaJiTF0+vKABI7bXI586KEdMK1WHbkaNONoUGdbFEWj3FmdmGaTXPWOGmybNvV2jizCGkly9f3KhGDeG8PutfDWTaAMgEXHyqFye+TK6cIYfZX22e2PfCJr0CqPZVzzZxCkq2LAwdK9s1oK7y4ZkJNf2laFQqKZnpQaa7hHEp4GgutqlqrvbC8GGIcu6UgC4rYARPSQLCKkOfNGzspOYZSVUt+jEPxGwMdTyHeZoBDSl6pBrSAairhzxNrvCedUgPqf89x0In8gJghvmNfe9sTXgSIRzMAx21a3dBDmThG3ei5W/ikmi14ygre8eNlejnQ2BZ4tZ+0NIv46UTGkb3SuFGPrJnkcyJ5zcf7IzGM0OsAaaPVeOiIdaY0gSpHzNkccP1SXG7aV+iC3E/GpW", "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)(39830400003)(136003)(366004)(376002)(396003)(451199015)(2616005)(41300700001)(6666004)(26005)(6512007)(107886003)(186003)(316002)(52116002)(83380400001)(66574015)(5660300002)(6506007)(8676002)(44832011)(2906002)(6916009)(8936002)(66476007)(66946007)(478600001)(6486002)(4326008)(66556008)(86362001)(36756003)(38350700002)(38100700002);\n DIR:OUT; SFP:1102;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "=?utf-8?q?p/CS989iwSIWmSqxkaAj9DR7CD6r?=\n\t=?utf-8?q?rHSNN7id3Q6IBH8ku9uEunFUV2fmF6h/BEiR3Mg/SFUi/B/PY2XZBRwgk8s1k8Jj6?=\n\t=?utf-8?q?9YnvhYWnt5+ArRIJsLVUzeUmSz5eG6A6YXhlyg2eTQLwEdmYn4ASbTmxeyytssI5y?=\n\t=?utf-8?q?hgwn8glVqqQH/jCZGgCMnQZs8XarVp/KmMIy1PvR32dOW6UqU52+h8d3eQxBpvr4i?=\n\t=?utf-8?q?rOqCrMVJoIejzxVUtxPydJnlnFTksCz60qY6hTt/m9wOE1s2J04WHWHdleCYs2Kbi?=\n\t=?utf-8?q?z38ivX7sbRaYq4mJvPncgiasxMpLFtRX0W5A+dQQ4T8hs8ySs5OgGw0Knj6yvFpwt?=\n\t=?utf-8?q?gaqdW3nAjEcD5eHHgw3cqo14zrGWoMvTMXQGSarE2Lj+w3jij0Gz0RvKuonfwc+CV?=\n\t=?utf-8?q?SypfxFwJuL0XmhhStvyNG6GTralU3uSONpRdnzWsO69ftBHZcK8WeX5Z13q0tfSo9?=\n\t=?utf-8?q?8jb6HAw7zXxYxFnwzHGRVFubqvN7WsTL21H9sArgU+U7BJLaYP96JCRHyaAZsFZmo?=\n\t=?utf-8?q?5hEEYBuro/ZOrhgCKz2hr+wyEuBEXmBIRBPjuhX3IgMtwmqTcYSumjW6E2u1gp0yh?=\n\t=?utf-8?q?RW6uAms2TW+ucXCXz6zEK0WaD6nnH3xDIKUcIETJJC77aAAEv9mVaOjdP2HLBKfV0?=\n\t=?utf-8?q?s38HyPAyHzww/R2QzzvGI+Gqib9XQavTn/xLa2iOuBgW6D72EfY63lGfv8DqWGc8t?=\n\t=?utf-8?q?MtkUrKnGv39MAjp1SkmKoUSlzi81JOUC/TvZzgs+V0YhZpHuTrpvV2vm4zP3y0bTf?=\n\t=?utf-8?q?TPtV6lZSqg4QPH/qB0N+HqpKrShILRUepPrDZhGtvsF06WbBJFhEdP2zSkHrBXpdA?=\n\t=?utf-8?q?5uSV5ZASJo6LCL9tRtYuZDSBS93/kqcVTqX6rIu6mJIPvStGfn5J4ZVivGLuO2LSL?=\n\t=?utf-8?q?7QyMcRiJgkusLyQu9lDtbXWsW+oWpznhAmqvUjdii5lghgsweEPT2gFVSp4pisK0r?=\n\t=?utf-8?q?ToVScC4+jGcACLHGSEnNfrEP3wz7JBij/BL3o0RnmDqJyU/KHVz9qU62eDSBHBVgM?=\n\t=?utf-8?q?L5oKIdREN3WQpaIL6SbXOZ1YigtQt0zB1eQfIFWZsJgSrskX6PqbMZd8EngVX4JQq?=\n\t=?utf-8?q?OxNbsS+8S3KN7Yr5ZHpQeSQ6Y5C6aszZuPFd8+bijsxAAicgzM5fgzFPLH9aqHHTZ?=\n\t=?utf-8?q?NYgcUq24DS3Iqpwod3ptsn5ENy87x8I71xkJxtSYysHy/HgNTn8NPnDMVpSD3rPbO?=\n\t=?utf-8?q?t8QipZ5nJpPVi/rNpOxSdHzXJIPuO0f/GM11ZBDhhXlYicFBfbWDWXX2jI23E52vq?=\n\t=?utf-8?q?gjpOdnWiTGZ6YscXStDFiqHI6fqBiAYR22UJxtcBWB6YRPMwX7jEhNzQGBeDiR8q/?=\n\t=?utf-8?q?3EYgJGqOdXhZYUvC94eqLev53QwevPE2c0Vnpa9vQQ8DHJ20Rg+pnPhOktykbtXtw?=\n\t=?utf-8?q?Tng+SP0tBPQFGjMSd8ItQ59ji5+DGUxityMnP+eQTVHUaZBozZlCSHKwaTt87bVRY?=\n\t=?utf-8?q?MDFqAMnr/XBz5kUDX1wwzHstX1WR4lfzZlFeRJq12bxxYuFyMCVh4yts9793zY6py?=\n\t=?utf-8?q?Ri+9M0aRHvY1XXzfBJN5blzMAzPYCoYomA=3D=3D?=", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 4fe16a58-67f3-4c53-d66d-08dab0b6ac49", "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:13:05.0527 (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 I14UvjJJKqleywglXBx0StR/NXOUVCJFL24ZiEm+QGsS0PfzTws8ERXkxMUghPGnOE0qUDrANVFaiaahE7DHCEFGg+UjYiYwZD8nU8cuIk4=", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "DM6PR13MB3788", "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 fe6cf11..f6c0414 100644\n--- a/doc/guides/rel_notes/release_22_11.rst\n+++ b/doc/guides/rel_notes/release_22_11.rst\n@@ -167,6 +167,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 361fee2..b8280a6 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": [ "v3", "08/25" ] }