Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/118682/?format=api
{ "id": 118682, "url": "http://patches.dpdk.org/api/patches/118682/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1666232391-29152-6-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-6-git-send-email-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1666232391-29152-6-git-send-email-chaoyong.he@corigine.com", "date": "2022-10-20T02:19:31", "name": "[v5,05/25] net/nfp: support basic flow items", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "3032a91503bdae254de3edfdbbba99d37cf090f2", "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-6-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/118682/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/118682/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 19C2FA0A02;\n\tThu, 20 Oct 2022 04:21:31 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 0D69D42C74;\n\tThu, 20 Oct 2022 04:21:09 +0200 (CEST)", "from NAM04-MW2-obe.outbound.protection.outlook.com\n (mail-mw2nam04on2113.outbound.protection.outlook.com [40.107.101.113])\n by mails.dpdk.org (Postfix) with ESMTP id 020FA42C60\n for <dev@dpdk.org>; Thu, 20 Oct 2022 04:21:06 +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:04 +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:04 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=MKoemq2yY7ZAzJtBNSNBTfjbao4J8qZrJkAYgeWIhVuFj05I1TjdbHmnbDtnE/emxhU2Nw56xYT+l3KkdsMceA+IJFsGUNJDWAL/wmn9SzFwFC5skXXnyDWFIRT0JVtPK9ObaTwGfPweksA9B7eERDpTwMTYJc6KBLybWo3fD6xjlY9qTwkE0ATxG9h++UYUMBATsE0cHytGlyP1oLMLWu84jnRarYAHnjPKTc0FK4PFaZzcsCAPiJ0+8QXCzaNTU/hcR2FHMOuEiJkCgiOn3o1t+d28/a95mEM2fOpRM3LJlmWpdZeZpyRFqjJ+yYEim6fb0tyPRChsbAWTMdnUtg==", "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=S5rzSMZ+C8QekkJ9Nv+toeoVmWT6eoBUR6pL6sAXqhI=;\n b=OjE4G8Mh8EQ22Ct6UU+xbqop7m7JXO8+9hnGATnWQ2XqnORHPLm3TITYwX53AEplB0oWqKO6pfOyglcpxfjnp9nATRGdXpgeofC9BOsddJDDSHdkkkOn7EWQchcNHz0lpvDXcX1GNYwE1UlSNRQ61UwKUitj5obbohzpHYXmHnd9SKVxJTnyp9v9ZtF7NsiklBiR+XGitWDba2RiZrJ0sWsjFkobzyD0fF3VNQVwp7RxlTVXZQyrz8seWT4bOM0/U6+cKvGeBNgfYpc+rtscaYdMaBzdz51in4Pu8AcY6fQTWeEx0dbLO/BSDsTYGcxPQYy6fwSbSrQkXQYja6tejQ==", "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=S5rzSMZ+C8QekkJ9Nv+toeoVmWT6eoBUR6pL6sAXqhI=;\n b=VIqeqs8AEZVHYUqJDf1x9pY7ZTIpIFo/O3OjYiZZaUVimuoeAKZ3tq27wsYQnhEUmLfUvsEr1Ve7h4n82DvxSVuGNknX6ZUVzlNjDlVRrVOR6eLUdkrEX0vsRTeVSNDKGhNDB1GHrMtOQu13eNJOB9ra4fZAuHmuMDWgNClSxd0=", "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 05/25] net/nfp: support basic flow items", "Date": "Thu, 20 Oct 2022 10:19:31 +0800", "Message-Id": "<1666232391-29152-6-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": "4ad8f2cb-daca-4e72-446d-08dab241bd13", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n g9FqpF/ji4a486HIBYzFq+LlYzquuG4pYJA1DN+d3yN7DqSMCBNz2l3fOBf+avRIY6OJlzcIrvr0GtcDruePW0fEzFe8vnTdh13vCwLtYKJp/bjtuXJ4LLnrQG3gu4tTk/gMIQbT/qT0Ga8/wTEnkF2XEYFImF/WhsOtZMw+2+w2Ld7Wl5MmfpFLVL0n9L9iZhkPkCnApDVfkd18VGduwPnGaXcUniCmYKeNbw/V/XEG9bwPY3yKwfsglNyY9XpV7nURDRQ7K+pP3davdo91l1BzDcIjgZCv24UBj6HCQAvmjcULbpNG8Cg5I1pCky3G/fjQgkebf1ZWJVV5O4zBlUDbbEHdilB9Qm1jQ91swmdgFUjlvXjmEfUnYJG55Hc2XSzB+S7ZxmMhK0uSz5f0vqeNrQ48XeAMWl8xqQS8b+7jYf3ejWKKeXxTMEokFffaQLTstirLBGdwnm+9cHRfHdg2XoYKHSebgsoIppo5EDsuYOKdFi01aJQ6wLtnMz7p3fbmnJ7NrxUg1S0XD8/NJFwwezgMx6N31Xyw/2gz+fOYQiPSx39XAYsoMFRScVl7fvmE80jOz3h6/48koA8wps5tuOsFgDreh+pVLBHhm1uf2VTsjnLIw0jXzvXkpxeClqFSR4qQCXkOrQYG+WRlF8bZKpaO35ZZ8/IyXAJdigOl9ZyMp5GyvIWTUIcbj6wkmKLKXlQVvixW/2ylMGaaZtaezXwICBRQCFKd/o3s6epkjB/rIJsVFez2XUejz8L8gd32HP6cobscghrjLXLVdq+zjjuHVCWhJ/dGWzK18PRcelwJ2ggr3SNowRyhBM3D", "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)(30864003)(83380400001)(6512007);\n DIR:OUT; SFP:1102;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "=?utf-8?q?+9MvVQGk60cmtA6wczC5Olr6oaY1?=\n\t=?utf-8?q?O7ynDLjqjqULIXi8kC7DGmDIaJS2mFRdUgKPCoc0WbKjkUJ5QrS7Yd6FnOVGmEmpV?=\n\t=?utf-8?q?upoKqdHGQCJ1B9QNspBB6bYJ3KUzDme5P5+AICjT0Yzye7QEQ/ctb7nxz23sFgRKE?=\n\t=?utf-8?q?uEemSg8xz6Ahe8fYU+TeuOZlwynF85WiUHWp4pR2Er1C0EO7cLYAyQy8ULMyQnHwQ?=\n\t=?utf-8?q?9tUrBpQBgN1x4ArImYL5ZqqBI1oLI8aBhzwKREzax1Kk81JC3WkYIwtPVexfP1TJL?=\n\t=?utf-8?q?EN3xh5LiD9MxVFwsn6WTfA5lOPrlz7yupNU76cNCLAfIffOyC8rwBG53CbYP1TypZ?=\n\t=?utf-8?q?iLTnP/fUHHXOizYNH+9t/nvmhnsUZ0K99Ja8Q+TwLAhzyo6TRYfSJSpGezSCFAksx?=\n\t=?utf-8?q?3bS8qUUXcHUpEqS8hbYD+q/oluT7OAD87Bm8hw1ySPdLxqODxx/YFVBHTMoZIaOQ5?=\n\t=?utf-8?q?KUq6D9w0bCwxnfoZ1iVYxD8Y76HyhhN1cxIRnMVmzIGlR2LQa3Z8GarsjilENvs/X?=\n\t=?utf-8?q?MDvCWJtNK4I5kSvj+lGwSdPTs1s4MkVXl6Z93yuwKF6Ssuc8ZJV38xXXAtt686wPx?=\n\t=?utf-8?q?JqWFSxnDncAoXOtzVo6JAXhRHsZngfbfATFEkgjAHfbz16Tc3T/7SVN/7IP/4NMBY?=\n\t=?utf-8?q?AA+PEZMYumI5a/oyQdlv/DzhdMl1O5TsRJkRMplChJcrHfhm8kQRcnpcUXS1zrlbc?=\n\t=?utf-8?q?YUcXJE+Q8IoyrMCpYCYvBHZhMHGMy3LRqRktqI2dtbSXzbMvzFkypfk/GFYjknlCL?=\n\t=?utf-8?q?3xx5rNT8KE8NV01VLO64lzZr/1MWC4Zfvfp0KsoEbHf+s0GJuqc50HWDi0AGlwDdc?=\n\t=?utf-8?q?v7l+k/xPsMwAwkQ6K5/hnBGX+q6odI0QvrPX1XtftIPJdjvdzYqyH/LGDmeBl8b9m?=\n\t=?utf-8?q?RN+GSfWXYskyjQ7lFUqH98KC74C4nXjk/U8BzFA6MV4PRqzItI2+59734QUEvHcVH?=\n\t=?utf-8?q?JYxCz77M+6lmg3rsgCI0mif7sbSOQVLtN3qAoGmdWl7yyJCdZjdZSLuHSZ4f9BCrK?=\n\t=?utf-8?q?Fe2e3k9yO/lP9aa3hSSMFCENDUfLWMWHZ0AmX8vGfOu2Vake51UEP+b72Vc+N0E+R?=\n\t=?utf-8?q?cJNozpL8HT2YRh0kCpCjhWd8IhFvPz8H7J6RAlixMHJXhs0sONZioRFgI9mJtMwJg?=\n\t=?utf-8?q?quOCBBg6Gg+BkNk4Sri94fRWmU5VCQjMeQabrGuhj/plOQoXU7FnWZMw/Fn/joXFK?=\n\t=?utf-8?q?6di6Z3IQde6wCC/zcJHyS+8aOahodVKTMORHNWcRjHNXe9L1XRAiU5vKEF4TtZMPO?=\n\t=?utf-8?q?zs0eRvhIN6wowMaoqAHqCnJMXzxLUOZ49cWEjc4mjMbiRNyT37I4jKBnqS/3mQpyL?=\n\t=?utf-8?q?2752ya/qnG0jUWldwT6PnJY5xSN8tBRgT95ZANzKd49/7HwW+aIk5aJIPYbpZZzdO?=\n\t=?utf-8?q?RX5vQA2GqzcuzWKz0yCiYahRq5iCfnUkgJmTzxhGd8l4Bly+tMLPJfL+s0L7D/YHi?=\n\t=?utf-8?q?sGhUgAUsfohwnGbJCswclQQJ1vvuXe/AB/5H79jTjiMvSnwLa/Hz/H6J2EPZ4+GbM?=\n\t=?utf-8?q?idyR0o6hRnpzdLxRfF3UGRPJ7zbXutbt7g=3D=3D?=", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 4ad8f2cb-daca-4e72-446d-08dab241bd13", "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:04.2683 (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 5Wc0SVj1/jAPlIH76p6s4S0ihA/8RqkEhu0lzXcwKw5HVC0BEo9NtGKDX3W2p0Arec0rR+mYu0tJDhpD8svj2KvnXPqS2/W2/ty/fbkfInQ=", "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 offload support of very basic items: ethernet and\nport id.\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 | 4 +\n doc/guides/rel_notes/release_22_11.rst | 2 +\n drivers/net/nfp/flower/nfp_flower_cmsg.h | 20 +++\n drivers/net/nfp/nfp_flow.c | 252 ++++++++++++++++++++++++++++++-\n 4 files changed, 277 insertions(+), 1 deletion(-)", "diff": "diff --git a/doc/guides/nics/features/nfp.ini b/doc/guides/nics/features/nfp.ini\nindex f7a0362..4460cf0 100644\n--- a/doc/guides/nics/features/nfp.ini\n+++ b/doc/guides/nics/features/nfp.ini\n@@ -25,3 +25,7 @@ Linux = Y\n Multiprocess aware = Y\n x86-64 = Y\n Usage doc = Y\n+\n+[rte_flow items]\n+eth = Y\n+port_id = Y\ndiff --git a/doc/guides/rel_notes/release_22_11.rst b/doc/guides/rel_notes/release_22_11.rst\nindex a3700bb..6d421a2 100644\n--- a/doc/guides/rel_notes/release_22_11.rst\n+++ b/doc/guides/rel_notes/release_22_11.rst\n@@ -163,6 +163,8 @@ New Features\n * Added the control message interactive channels between PMD and firmware.\n * Added the support of representor port.\n \n+ Add the support of rte_flow pattern items.\n+\n * **Updated NXP dpaa2 driver.**\n \n * Added support for flow action REPRESENTED_PORT.\ndiff --git a/drivers/net/nfp/flower/nfp_flower_cmsg.h b/drivers/net/nfp/flower/nfp_flower_cmsg.h\nindex 6045bb0..75a3b91 100644\n--- a/drivers/net/nfp/flower/nfp_flower_cmsg.h\n+++ b/drivers/net/nfp/flower/nfp_flower_cmsg.h\n@@ -233,6 +233,26 @@ struct nfp_flower_in_port {\n \trte_be32_t in_port;\n };\n \n+/*\n+ * L2 details (4W/16B)\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+ * | mac_addr_dst, 31 - 0 |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ * | mac_addr_dst, 47 - 32 | mac_addr_src, 15 - 0 |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ * | mac_addr_src, 47 - 16 |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ * | mpls outermost label | TC |B| reserved |q|\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ */\n+struct nfp_flower_mac_mpls {\n+\tuint8_t mac_dst[6];\n+\tuint8_t mac_src[6];\n+\trte_be32_t mpls_lse;\n+};\n+\n int nfp_flower_cmsg_mac_repr(struct nfp_app_fw_flower *app_fw_flower);\n int nfp_flower_cmsg_repr_reify(struct nfp_app_fw_flower *app_fw_flower,\n \t\tstruct nfp_flower_representor *repr);\ndiff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c\nindex eb1e42c..1af0acd 100644\n--- a/drivers/net/nfp/nfp_flow.c\n+++ b/drivers/net/nfp/nfp_flow.c\n@@ -19,6 +19,30 @@\n #include \"nfpcore/nfp_mip.h\"\n #include \"nfpcore/nfp_rtsym.h\"\n \n+/* Static initializer for a list of subsequent item types */\n+#define NEXT_ITEM(...) \\\n+\t((const enum rte_flow_item_type []){ \\\n+\t\t__VA_ARGS__, RTE_FLOW_ITEM_TYPE_END, \\\n+\t})\n+\n+/* Process structure associated with a flow item */\n+struct nfp_flow_item_proc {\n+\t/* Bit-mask for fields supported by this PMD. */\n+\tconst void *mask_support;\n+\t/* Bit-mask to use when @p item->mask is not provided. */\n+\tconst void *mask_default;\n+\t/* Size in bytes for @p mask_support and @p mask_default. */\n+\tconst unsigned int mask_sz;\n+\t/* Merge a pattern item into a flow rule handle. */\n+\tint (*merge)(struct rte_flow *nfp_flow,\n+\t\t\tchar **mbuf_off,\n+\t\t\tconst struct rte_flow_item *item,\n+\t\t\tconst struct nfp_flow_item_proc *proc,\n+\t\t\tbool is_mask);\n+\t/* List of possible subsequent items. */\n+\tconst enum rte_flow_item_type *const next_item;\n+};\n+\n struct nfp_mask_id_entry {\n \tuint32_t hash_key;\n \tuint32_t ref_cnt;\n@@ -464,12 +488,36 @@ struct nfp_mask_id_entry {\n \n static int\n nfp_flow_key_layers_calculate_items(const struct rte_flow_item items[],\n-\t\t__rte_unused struct nfp_fl_key_ls *key_ls)\n+\t\tstruct nfp_fl_key_ls *key_ls)\n {\n+\tstruct rte_eth_dev *ethdev;\n \tconst struct rte_flow_item *item;\n+\tstruct nfp_flower_representor *representor;\n+\tconst struct rte_flow_item_port_id *port_id;\n \n \tfor (item = items; item->type != RTE_FLOW_ITEM_TYPE_END; ++item) {\n \t\tswitch (item->type) {\n+\t\tcase RTE_FLOW_ITEM_TYPE_ETH:\n+\t\t\tPMD_DRV_LOG(DEBUG, \"RTE_FLOW_ITEM_TYPE_ETH detected\");\n+\t\t\t/*\n+\t\t\t * eth is set with no specific params.\n+\t\t\t * NFP does not need this.\n+\t\t\t */\n+\t\t\tif (item->spec == NULL)\n+\t\t\t\tcontinue;\n+\t\t\tkey_ls->key_layer |= NFP_FLOWER_LAYER_MAC;\n+\t\t\tkey_ls->key_size += sizeof(struct nfp_flower_mac_mpls);\n+\t\t\tbreak;\n+\t\tcase RTE_FLOW_ITEM_TYPE_PORT_ID:\n+\t\t\tPMD_DRV_LOG(DEBUG, \"RTE_FLOW_ITEM_TYPE_PORT_ID detected\");\n+\t\t\tport_id = item->spec;\n+\t\t\tif (port_id->id >= RTE_MAX_ETHPORTS)\n+\t\t\t\treturn -ERANGE;\n+\t\t\tethdev = &rte_eth_devices[port_id->id];\n+\t\t\trepresentor = (struct nfp_flower_representor *)\n+\t\t\t\t\tethdev->data->dev_private;\n+\t\t\tkey_ls->port = rte_cpu_to_be_32(representor->port_id);\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@@ -529,6 +577,202 @@ struct nfp_mask_id_entry {\n \treturn ret;\n }\n \n+static int\n+nfp_flow_merge_eth(__rte_unused 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_mac_mpls *eth;\n+\tconst struct rte_flow_item_eth *spec;\n+\tconst struct rte_flow_item_eth *mask;\n+\n+\tspec = item->spec;\n+\tif (spec == NULL) {\n+\t\tPMD_DRV_LOG(DEBUG, \"nfp flow merge eth: no item->spec!\");\n+\t\tgoto eth_end;\n+\t}\n+\n+\tmask = item->mask ? item->mask : proc->mask_default;\n+\teth = (void *)*mbuf_off;\n+\n+\tif (is_mask) {\n+\t\tmemcpy(eth->mac_src, mask->src.addr_bytes, RTE_ETHER_ADDR_LEN);\n+\t\tmemcpy(eth->mac_dst, mask->dst.addr_bytes, RTE_ETHER_ADDR_LEN);\n+\t} else {\n+\t\tmemcpy(eth->mac_src, spec->src.addr_bytes, RTE_ETHER_ADDR_LEN);\n+\t\tmemcpy(eth->mac_dst, spec->dst.addr_bytes, RTE_ETHER_ADDR_LEN);\n+\t}\n+\n+\teth->mpls_lse = 0;\n+\n+eth_end:\n+\t*mbuf_off += sizeof(struct nfp_flower_mac_mpls);\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.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+\t\t\t\t.src_addr.addr_bytes = \"\\xff\\xff\\xff\\xff\\xff\\xff\",\n+\t\t\t\t.ether_type = RTE_BE16(0xffff),\n+\t\t\t},\n+\t\t\t.has_vlan = 1,\n+\t\t},\n+\t\t.mask_default = &rte_flow_item_eth_mask,\n+\t\t.mask_sz = sizeof(struct rte_flow_item_eth),\n+\t\t.merge = nfp_flow_merge_eth,\n+\t},\n+};\n+\n+static int\n+nfp_flow_item_check(const struct rte_flow_item *item,\n+\t\tconst struct nfp_flow_item_proc *proc)\n+{\n+\tint ret = 0;\n+\tunsigned int i;\n+\tconst uint8_t *mask;\n+\n+\t/* item->last and item->mask cannot exist without item->spec. */\n+\tif (item->spec == NULL) {\n+\t\tif (item->mask || item->last) {\n+\t\t\tPMD_DRV_LOG(ERR, \"'mask' or 'last' field provided\"\n+\t\t\t\t\t\" without a corresponding 'spec'.\");\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\t\t/* No spec, no mask, no problem. */\n+\t\treturn 0;\n+\t}\n+\n+\tmask = item->mask ?\n+\t\t(const uint8_t *)item->mask :\n+\t\t(const uint8_t *)proc->mask_default;\n+\n+\t/*\n+\t * Single-pass check to make sure that:\n+\t * - Mask is supported, no bits are set outside proc->mask_support.\n+\t * - Both item->spec and item->last are included in mask.\n+\t */\n+\tfor (i = 0; i != proc->mask_sz; ++i) {\n+\t\tif (mask[i] == 0)\n+\t\t\tcontinue;\n+\n+\t\tif ((mask[i] | ((const uint8_t *)proc->mask_support)[i]) !=\n+\t\t\t\t((const uint8_t *)proc->mask_support)[i]) {\n+\t\t\tPMD_DRV_LOG(ERR, \"Unsupported field found in 'mask'.\");\n+\t\t\tret = -EINVAL;\n+\t\t\tbreak;\n+\t\t}\n+\n+\t\tif (item->last && (((const uint8_t *)item->spec)[i] & mask[i]) !=\n+\t\t\t\t(((const uint8_t *)item->last)[i] & mask[i])) {\n+\t\t\tPMD_DRV_LOG(ERR, \"Range between 'spec' and 'last'\"\n+\t\t\t\t\t\" is larger than 'mask'.\");\n+\t\t\tret = -ERANGE;\n+\t\t\tbreak;\n+\t\t}\n+\t}\n+\n+\treturn ret;\n+}\n+\n+static int\n+nfp_flow_compile_item_proc(const struct rte_flow_item items[],\n+\t\tstruct rte_flow *nfp_flow,\n+\t\tchar **mbuf_off_exact,\n+\t\tchar **mbuf_off_mask)\n+{\n+\tint i;\n+\tint ret = 0;\n+\tconst struct rte_flow_item *item;\n+\tconst struct nfp_flow_item_proc *proc_list;\n+\n+\tproc_list = nfp_flow_item_proc_list;\n+\tfor (item = items; item->type != RTE_FLOW_ITEM_TYPE_END; ++item) {\n+\t\tconst struct nfp_flow_item_proc *proc = NULL;\n+\n+\t\tfor (i = 0; proc_list->next_item && proc_list->next_item[i]; ++i) {\n+\t\t\tif (proc_list->next_item[i] == item->type) {\n+\t\t\t\tproc = &nfp_flow_item_proc_list[item->type];\n+\t\t\t\tbreak;\n+\t\t\t}\n+\t\t}\n+\n+\t\tif (proc == NULL) {\n+\t\t\tPMD_DRV_LOG(ERR, \"No next item provided for %d\", item->type);\n+\t\t\tret = -ENOTSUP;\n+\t\t\tbreak;\n+\t\t}\n+\n+\t\t/* Perform basic sanity checks */\n+\t\tret = nfp_flow_item_check(item, proc);\n+\t\tif (ret != 0) {\n+\t\t\tPMD_DRV_LOG(ERR, \"nfp flow item %d check failed\", item->type);\n+\t\t\tret = -EINVAL;\n+\t\t\tbreak;\n+\t\t}\n+\n+\t\tif (proc->merge == NULL) {\n+\t\t\tPMD_DRV_LOG(ERR, \"nfp flow item %d no proc function\", item->type);\n+\t\t\tret = -ENOTSUP;\n+\t\t\tbreak;\n+\t\t}\n+\n+\t\tret = proc->merge(nfp_flow, mbuf_off_exact, item,\n+\t\t\t\tproc, false);\n+\t\tif (ret != 0) {\n+\t\t\tPMD_DRV_LOG(ERR, \"nfp flow item %d exact merge failed\", item->type);\n+\t\t\tbreak;\n+\t\t}\n+\n+\t\tret = proc->merge(nfp_flow, mbuf_off_mask, item,\n+\t\t\t\tproc, true);\n+\t\tif (ret != 0) {\n+\t\t\tPMD_DRV_LOG(ERR, \"nfp flow item %d mask merge failed\", item->type);\n+\t\t\tbreak;\n+\t\t}\n+\n+\t\tproc_list = proc;\n+\t}\n+\n+\treturn ret;\n+}\n+\n+static int\n+nfp_flow_compile_items(__rte_unused struct nfp_flower_representor *representor,\n+\t\tconst struct rte_flow_item items[],\n+\t\tstruct rte_flow *nfp_flow)\n+{\n+\tint ret;\n+\tchar *mbuf_off_mask;\n+\tchar *mbuf_off_exact;\n+\n+\tmbuf_off_exact = nfp_flow->payload.unmasked_data +\n+\t\t\tsizeof(struct nfp_flower_meta_tci) +\n+\t\t\tsizeof(struct nfp_flower_in_port);\n+\tmbuf_off_mask = nfp_flow->payload.mask_data +\n+\t\t\tsizeof(struct nfp_flower_meta_tci) +\n+\t\t\tsizeof(struct nfp_flower_in_port);\n+\n+\t/* Go over items */\n+\tret = nfp_flow_compile_item_proc(items, nfp_flow,\n+\t\t\t&mbuf_off_exact, &mbuf_off_mask);\n+\tif (ret != 0) {\n+\t\tPMD_DRV_LOG(ERR, \"nfp flow item compile failed.\");\n+\t\treturn -EINVAL;\n+\t}\n+\n+\treturn 0;\n+}\n+\n static struct rte_flow *\n nfp_flow_process(struct nfp_flower_representor *representor,\n \t\tconst struct rte_flow_item items[],\n@@ -573,6 +817,12 @@ struct nfp_mask_id_entry {\n \n \tnfp_flow_compile_metadata(priv, nfp_flow, &key_layer, stats_ctx);\n \n+\tret = nfp_flow_compile_items(representor, items, nfp_flow);\n+\tif (ret != 0) {\n+\t\tPMD_DRV_LOG(ERR, \"nfp flow item process failed.\");\n+\t\tgoto free_flow;\n+\t}\n+\n \tnfp_flow_meta = nfp_flow->payload.meta;\n \tmask_data = nfp_flow->payload.mask_data;\n \tmask_len = key_layer.key_size;\n", "prefixes": [ "v5", "05/25" ] }