Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/118905/?format=api
{ "id": 118905, "url": "https://patches.dpdk.org/api/patches/118905/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1666339323-24016-11-git-send-email-chaoyong.he@corigine.com/", "project": { "id": 1, "url": "https://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": "<1666339323-24016-11-git-send-email-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1666339323-24016-11-git-send-email-chaoyong.he@corigine.com", "date": "2022-10-21T08:01:46", "name": "[v6,10/27] net/nfp: support IPv4 flow item", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "13d364d1cb2e28f3f878b387ec652d11f60d7ff6", "submitter": { "id": 2554, "url": "https://patches.dpdk.org/api/people/2554/?format=api", "name": "Chaoyong He", "email": "chaoyong.he@corigine.com" }, "delegate": { "id": 319, "url": "https://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1666339323-24016-11-git-send-email-chaoyong.he@corigine.com/mbox/", "series": [ { "id": 25363, "url": "https://patches.dpdk.org/api/series/25363/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=25363", "date": "2022-10-21T08:01:36", "name": "add the basic rte_flow offload support of nfp PMD", "version": 6, "mbox": "https://patches.dpdk.org/series/25363/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/118905/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/118905/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 7ADABA0032;\n\tFri, 21 Oct 2022 10:03:41 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 02B7142BE5;\n\tFri, 21 Oct 2022 10:02:47 +0200 (CEST)", "from NAM11-BN8-obe.outbound.protection.outlook.com\n (mail-bn8nam11on2100.outbound.protection.outlook.com [40.107.236.100])\n by mails.dpdk.org (Postfix) with ESMTP id 7239342C08\n for <dev@dpdk.org>; Fri, 21 Oct 2022 10:02:43 +0200 (CEST)", "from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5)\n by BL3PR13MB5162.namprd13.prod.outlook.com (2603:10b6:208:339::8)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.17; Fri, 21 Oct\n 2022 08:02:41 +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; Fri, 21 Oct 2022\n 08:02:41 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=J7XtnQWYelXyDHCi8jsf8rRvF06c/wvIFE4AaWfBRhHXImEWH3N5je2TGuQVVQkmhztkCiIBg6kV/T1fM527quZN9zY72hiykrhkQQAijwCKDcjWV+17M/jsqYwOPSS4QTN/U94BR8iER5pQZoUWxvY3mBkOMWa/Y9RRWSKVfhG1QX0thftZY07mztpaDiokgbUf1lpmLrlsvjbeBMvwrL42yXYvAccEhRwFXN7ywWC4aDoarhg7jfLf5X6XEXxzfkl/Gh6uJ5MbLE6tNjGHpOlzNeUba48cJTtgZC/0yR9r00rzh/O/6QfFc2fXERznTHsV7xmytsTXNl4z0DaFCQ==", "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=EnraWQCnO/SlEhcNY5hrDMkh9EFDZif4t9RZi0t/D7s=;\n b=hvLLwQ7KcTHD747CqHOSPOyBKxih8HpWUHJ2h7ShH2Hph4lNDc266Da6Mau8OtlV0phi189wmN6kDu30WaaNbP8KlaP3VkWWspNaPLEek1rqdaGHzmJ5swbZOhQJKAMObGna1aE2WKiYfOnIrTXBkPmx7Tfho5C24OhOP2Fb8/xxIz/yMMtRZYzTb82FUhX4fabqQ1kvq2tQ4Vpn3coG86Xj3Z5sWZ72cl0nXm3n9Dw8L+OUvRSpDTUiNwyO7ODLwTOYcV9usJ0Ylbnuska/TzZQDHvZwTrdeYhpaS1sVZXN+yKR4iu9i8+C2V9+lNeY+7lBlVrRKAkK6Oio4rBzYg==", "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=EnraWQCnO/SlEhcNY5hrDMkh9EFDZif4t9RZi0t/D7s=;\n b=Pm+tyLV71lGiLxbPrjfev08JirG92rKtYchM37nmMN88xSzYhWJuk2RaO9goO86T4lrjeHjbMGxcOClEL6Ud/fhw4GMOEu8qeW6bLBoHEuUnsNklFE9Hev/YNdtBkkF3UPWULsaVl4tjLhr3DgPRiV00Dgp6JqDnWeyuqWezSZM=", "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 v6 10/27] net/nfp: support IPv4 flow item", "Date": "Fri, 21 Oct 2022 16:01:46 +0800", "Message-Id": "<1666339323-24016-11-git-send-email-chaoyong.he@corigine.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1666339323-24016-1-git-send-email-chaoyong.he@corigine.com>", "References": "<1666232391-29152-1-git-send-email-chaoyong.he@corigine.com>\n <1666339323-24016-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_|BL3PR13MB5162:EE_", "X-MS-Office365-Filtering-Correlation-Id": "b2fc4e6a-41df-49a2-1934-08dab33aa09e", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n 9SLGWgTVzHWp7uHqWOr5K0KPe2fpINwYLCjYatkzl3f6bQgjoRfFU5F5v2rkP5Dn17MaOdcIaJnESpidtANYINv6rqNiYCfHLzd/WhLATzKgyIHlwTzdfPdMNNxiIWNYtdeWuOUWV1Ccg8aM2KprHyr1ctqW4VWjqKfrXHxO23cJtCvramFMhZkFecXGoyH4cCUjD14xRHHR72NrvsBqyGDXnu/d4PmyYI3mv2M/aq/5cO1iB0HcuUbA54cVGqnWF5SguZ90M/3NBKczyL9wnwIAvLHycUDOr0AEwQUhToFbkcMMXPl+MH2ADk6jaTGoYE2n/iRn9gC2h63ZGgAswoedDk0Ty3AcADL0KaDLzvYBnVTwuiLJxQiDbcPZxGR7tMPpk3cD5Iptq493q8yoB7CYUduZTyFnXrBGR88ZOO7M0gYRFphTGiILsRujtEj641Z/urZ2nexT49BIVbW4aTbTqKhlZlTqMB/mQ/X2TwtteIgePJBF2q3fxx1W8zQPAcDnRC7ZJsnEShuUSAli6EhIBiku3dRKIQu/XwwS6FNhM6X3YRsGM0EUvYz9dmSTUypxzmCF3IsklrpugpcEb0ErQ3ydYzUdM06aE/Z6W3jj1LnYzkxRdCj9iwcRGlEz9RPIHeAFspp026bCrOgq/ABXmsOtOr6fBI2Q9pdmvPp8yuQHKqAbPcBu9314Bv+dhucCWOT99eFP36rD+n8bVTfxn83JxrMHCMOW+mIPgAH+HAzGz9573Ep7qwlD/+np", "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)(376002)(396003)(346002)(136003)(39840400004)(366004)(451199015)(2616005)(6916009)(38350700002)(6512007)(6506007)(52116002)(8936002)(66946007)(4326008)(186003)(107886003)(8676002)(41300700001)(2906002)(66556008)(316002)(66476007)(38100700002)(44832011)(26005)(5660300002)(83380400001)(478600001)(66574015)(6486002)(86362001)(36756003);\n DIR:OUT; SFP:1102;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "=?utf-8?q?bcbsZVodVV2TAH7Won08yGuElr7z?=\n\t=?utf-8?q?dgieHXtfUTgdaGYa4LkeEm4aVaUXpmduRmUAR82IMxVadvaw0AnUuHf1wxg/HmQU+?=\n\t=?utf-8?q?uo5LwPyU54r2/3r3G5a62F7vDeiXbsrIGJacw0thaQT+7D6yuQ5flkp2rKM9wW5ET?=\n\t=?utf-8?q?UK8NOaKEzXm+ais/ANV1R86bfK7k4Ytyq7yejcCNY1501NQsnvSIRPIq5OTbBMr7n?=\n\t=?utf-8?q?smDkvukC3rXIHAeCtUjWgmjdQ73uTMiwt9bObuXMF9W/073i1sGJHndG6o8wHpO3t?=\n\t=?utf-8?q?xg+M3EsbnvcgTnMGYdzoeeZntXrlJjPLW8nUL51LqTdneJIRbO+3D4oRCBIOXX7xv?=\n\t=?utf-8?q?wmY74lDoOngkF6VlhkXTW05mAOw2NEPAkZkALrcgVY8cSOQeDBlhxUDZdFrzhGPxH?=\n\t=?utf-8?q?GH3t2mruMMRdJ0/H/gf9brkozcZOxpYCwO8yVEQAFR6vEaH5Qn+bacF1ZH73DlpKN?=\n\t=?utf-8?q?8uo0eD2yymM8paXkNTolq8wUll78BSsD0gjyqW3cydZqTD2grLnKOExSiMmNd47Jb?=\n\t=?utf-8?q?98WgnDUGWGhKNG8K3ZoPmFLUY8xqVzIRbC9+dA/iU+W5N1itNhCjQTGBKRSD+4QVU?=\n\t=?utf-8?q?Ka/2KqXrq4sAsDZGPAuchvpW6KziogHtUkKJQOgaHHR9bvtnZsfTLUeIyE8GMv+kn?=\n\t=?utf-8?q?b7tmVYYiOGG5VvQsswSzCjHBIG7bbZ7CfFQL7sbhgghMhaQ9KuxmuR/t9wT1w3iIK?=\n\t=?utf-8?q?TNkhKNMiQVQ6jZJI/EWIVSVEO89edk9O59XN9P2SNDTtgrP3SxKzgJX8L15q2O9sg?=\n\t=?utf-8?q?LFno8SYDu3Ly/PPohux9rQDi82AxeIBqIddDokeC4G2T1QBlcgyscPidPwsGtp/LI?=\n\t=?utf-8?q?OX5ouC1Tpp86snpJ00rMQnOHg+FcH6/J3HAudjIRnMIDVSIdx0S+GGtKsWNGiQmPp?=\n\t=?utf-8?q?1VibG9+IvXsbfu+3P5ny3oiZwNFZNN1yX/QxjE7/vUfLH9VQ2mEaVgx6GLiv08L3m?=\n\t=?utf-8?q?q1SCa94oHkA2j61GL1HmiGN+VW23M1YCyGk3fZLShF8Ehn4xKoDfuHfGbCIT/ThAA?=\n\t=?utf-8?q?c9D7UxKXdK5inwz7g/CHMCURWRXNk4qu0jK3m92iBAvHyyGyFbrhmQT+3aiy+AG0+?=\n\t=?utf-8?q?F6/fUrfeGodupP10ttTBvuzOmbs7DVL67v5hGRebg/+5zCNFZ6Cb0ZFoB2xBgcx3E?=\n\t=?utf-8?q?Xsqb2F1ao5odFhnFstkbQITkXbwctfQM1Db1wO6GkwQfX/fyN6pUxTahT7/ifNlm8?=\n\t=?utf-8?q?o6wLLX26Bml60r/JDkCrQkaJA2n6llIVEb+jkVWFvA1NSlaC6B0S8+EJgRqmlYetv?=\n\t=?utf-8?q?5UjXUaMryEztjFfnkWz7stkT7enrP0Pfl0naEOmrJajHKEMFKAhu94qrtgegZZ83B?=\n\t=?utf-8?q?i7xvkRPT3Uyfi1XtB5YYVejAnzCht379XFsRVIF0Q9f/txn5pRwPwF57R2ow8v7z+?=\n\t=?utf-8?q?AYRy/HLxOlC+2BOXEfLz40lQkGOHbi8c2QE+YxDgRaN2DNfGItCkfCvsuHXydZk9N?=\n\t=?utf-8?q?KHxT0sVl54BuWTFx9F3pMtGF39ZUFTZ6gpW6w3O1b79qIH/pz7w+FNEnNpfK1SF69?=\n\t=?utf-8?q?vE5woM8y0XJFq9LTezEewG54nf3YYReDFA=3D=3D?=", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n b2fc4e6a-41df-49a2-1934-08dab33aa09e", "X-MS-Exchange-CrossTenant-AuthSource": "SJ0PR13MB5545.namprd13.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Internal", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "21 Oct 2022 08:02:41.3505 (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 9B+6niU7gThTdA9cov1qrI7dAy4Twh2hcFWUXiUeXBDR+p/HcSu60QwbRuO37mnty/GzX+SHkzr9aTAzAEQ9mz5smD0QTGo3kRCf7Mz4j4o=", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "BL3PR13MB5162", "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 802fa6a..7a7a873 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@@ -656,13 +661,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@@ -676,6 +726,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@@ -687,6 +738,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": [ "v6", "10/27" ] }