Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/117765/?format=api
{ "id": 117765, "url": "http://patches.dpdk.org/api/patches/117765/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1665382142-21684-4-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-4-git-send-email-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1665382142-21684-4-git-send-email-chaoyong.he@corigine.com", "date": "2022-10-10T06:08:41", "name": "[v2,03/24] net/nfp: add the flow APIs of nfp PMD", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "ed703a0c5f0634c3622eab4163031358fad93193", "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-4-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/117765/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/117765/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 38783A0544;\n\tMon, 10 Oct 2022 08:09:40 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 5C2F9427F3;\n\tMon, 10 Oct 2022 08:09:28 +0200 (CEST)", "from NAM04-BN8-obe.outbound.protection.outlook.com\n (mail-bn8nam04on2100.outbound.protection.outlook.com [40.107.100.100])\n by mails.dpdk.org (Postfix) with ESMTP id 58E29427EE\n for <dev@dpdk.org>; Mon, 10 Oct 2022 08:09:27 +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:25 +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:25 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=modYk1idKutD/FKZvvn1pg64rgP2aDzH35mxq+uqWyQDyBuE+P/BUxCpHRT8/vwwNEuvZgpZ2UueBIMs0MiKHdtT79HAyiwa/3CkvOPSyZSky6w6eZGu4M7zAE8GXpDbLzILn9en/bPN20Zwisplrr5bHAnKkYL7+ZoM1qf+pV8q950RhdJpoqtRggJMDI9cjv0xkrlCGbN9Q9FXr+QMeBrMa6TMJbu4upN/Gw6bKfAQmL0565e6RoVup2MvNLI2ddBdeyvoRodu8TU88A/wOv2Y0mPRxceC6bJESQobOvX86UQSo7Egh7dfQFdbgFmzcBm5CS/S1xVH5IcMfWwjLw==", "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=bgdx50mnZ8iMF60SUxKGuTR0FlsshNdksRgzV0pnGc8=;\n b=bxFnA3aBdcVdpDnE7gS7nU3z6j6jnKbyIuYUwCcd+PpO4XLmM2E5R1HKo6oQvbG2Qkq3aqSJTkCUEP05Tt48tGPAwGxregig5BMYDVJGfIW92XbLzOQnJebKXhjrF0F2pA9EEmk1USmSBMyxsffOYmCCl6gCwpmYYD0n4dVmaK0yqgCgsBjTGbwVuvdNKqwkQwQmRviqK0UapeMzx2SWB/L5J5mwAX+E3BodRzLqifNzaQBRslKLtN17T8QTELZRyspaZwX5vgnuus8Nh+L8UlYXG2fOZ49Qd8imwUssXs595941wzFGXz5Wzh6A7V26B/iYsFfquCCslG0NrMQqsQ==", "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=bgdx50mnZ8iMF60SUxKGuTR0FlsshNdksRgzV0pnGc8=;\n b=QGh+dMUCZe1U7SlYtyNoYPVUnH6VviBbO5u7NuqE5PqSy2jS5FRN07vLzU24ombQuTGpCvaQZBmbHAS4t3FrZX2sBOVsQRLc5glMoiq5caR9BgCieDyCD3lhNZ1SSAb6rPLAP3aRA8Xgi/CzXUpbinEfwG/GttUCut3t+KKZOqw=", "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 03/24] net/nfp: add the flow APIs of nfp PMD", "Date": "Mon, 10 Oct 2022 14:08:41 +0800", "Message-Id": "<1665382142-21684-4-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": "51933a57-1add-4208-ea58-08daaa85fb8f", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n TIvnDy/YPxZtIa3zAQIQq7ALZM3MXxcp18aXM9WmFfEXsfkegSN7ebLUEfzkuWoyPHGs0C2KuYIy4sKumJ+rpIMURIJW6AN4BXW1QYaxoLy0HxZtyvfkGv4OxLCqOtDu2xSlNONLzIv0QuuAJQtgaUEMlDLPFB1wOstqIHcbzT01SVoakiYEODU6QI9zSlsSICO4PcjhShCb+o6zDeoR/uQz1MuXmmdaaR1/h9HQ6VonuMgy+66rtF+/Gq3f8UnW31hr0s4C+NUnGFKzN30bp80xxZrNA2t6D8u3gsxF45E79PaIeedFXpYiM9T6SoFwWdiOH92g/57PwPrcsxjo2Sf1XvPgJoC96VhoPQbGzipFe9n21EMJnShhKVmwtiNXkQYmmaKEzmGon8o/f3SKuLAZ2mO2C3GGWPXNwMfyiT6A2R8dKTLxArPRLCj92dc5s1u4OdYeHA5b39Jc+WTbVCaVQhsIDsUH2khb9T0cPX87wOQt36DUNya2X0lwGxutqmKYJeYEyiERCs6jQVW7dvbXDG3dMPuYTDaw4OLQWAxdp6olWY9arMYWgr9OIExsqDDD68rfFbpkVUiTYKTJwWpoHz10sNSRyrNd6sQZL0JJeBmN33z26xdy2Kmrb1S+kJGTRAnzlgfLy8LJ4A+BHLRJiwp/xrN1qoSsesRKeLovgAYYnd+BYo6kFDrRXsTXigLBp6mlWLyFhDK/tDvOMnuRM0A85ntW/K/RJzqBMWgrqzm3qY2k1UOjvdgOBdKqFUVkJp3kaLGQpAp//xbBCAt/xtxz+pumxf/yLaeoycCyZ2ZfdVq9K9OyFwOses8f", "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)(30864003)(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?sEgFjkW7llwmNhdMhIdG0K6OyepE?=\n\t=?utf-8?q?+Z7awwkkRf0AjBvWFpiQ7uH/f4rRooHYeJ8VYl6Mk0BAMOx3gYKgJH++HcoA11yxL?=\n\t=?utf-8?q?YKzxqFarXG6Zx6zMchAMloJ120QJJ6HYozDJChYbnOze15R4aGa6MqNOyZTSk4oii?=\n\t=?utf-8?q?nxQu6T917XMcybyscz/kPo+DaFiE0KvHmGQ02mzvnE0t+4h1RDECPU+evlrIFP6dZ?=\n\t=?utf-8?q?6ajXMD8cHGIC55JZJplbU0mJnejX/CcfHN8iJdS4doJDDrXnOaGT4nUv35xVXS2nU?=\n\t=?utf-8?q?B9dFDdxtZD4CQr5ti4sDMIm/qZfLS/x6IRif8IteXOL0i5laXKuzgIUA4nI4HAYeb?=\n\t=?utf-8?q?xc0XG6m7kvMDlRHQeldl+neXHHQShHnAsPDdeMhc4U2aRscrQwdWtS2TybYjxm5ya?=\n\t=?utf-8?q?6V6ZyYb+3QQw0TrXaxFlMAgYBL7x+t3YHV+TUP6LZXlFtmP/VlrIfmkApGzpv8WSa?=\n\t=?utf-8?q?hIYdcEbuBsi/Fx9jJ3yyKu47MYCECruUrBmVEu6w8/Tm8QRqj2DG+KUgkBF/7gh06?=\n\t=?utf-8?q?PWUw8Mloil6zMeWYu5vw4o+h2ZwcU+fBx95S0vAqfmFKamqDydN52kn1egCymsdoF?=\n\t=?utf-8?q?t621NSMqXy1lrJH/rIHI2dAMN9c69E6snwr1a6z3mn7YYgzwa3t/mXVC4k0OOASvM?=\n\t=?utf-8?q?ChgYCIQiA0TNL6OX+pMVE8PWuVv/ni9/5msLhqDdmKWZlH2siaSyZWsu4E0ukZFS4?=\n\t=?utf-8?q?/s+wdoZLFGFcoogyimfJk9kuXwm18lXJVIAzxLVhZpr3qjZTMyctxGmGfjocJmTJy?=\n\t=?utf-8?q?QuSY2rcG83XmV1QB8n3yzR/PnlBntGO6JTjRJWRPvGXdZtWmd2IW1qz4Zhqzk7zs2?=\n\t=?utf-8?q?WZ/6FJs8vwF3kxpbwIptRz1IBiI0M15vxWZv+F+hGhAK8deXBX2SIUSgaDSbPLh4q?=\n\t=?utf-8?q?MPMzqjcd29GDywh/wHUYSCvujKEwnev4ee9qJE+7kLFmlILuEhqAtkgNBa+u1GGHw?=\n\t=?utf-8?q?6EFNnBJ9urKJY2gl6fIlN+aYIrDAR2xb4thfpvMroOv14ui8mtGv9EoJ6iV1yLCp7?=\n\t=?utf-8?q?4HZ4tJBeIvVcPbWxumyhoKanwu7+gdMZ2l3HpFrOFUT4rK6bQsHzdppcryRH2S9Rs?=\n\t=?utf-8?q?RZZapzZjrOm11CBYXwFF43ZQgdBl7m1KX2jVJiWWG4tJkmnKQKXcUUZXCk3wCDGqR?=\n\t=?utf-8?q?PVh0rzJzBEnz2+olhOs2Q7iDsR23AMx0liuwVGxk8YHtSLw+AeXPxpaR+2JoFqlY5?=\n\t=?utf-8?q?B/6FV3tM/IGc/igu3JDOuMpgwPaZcvwzgD0C8o9xRVD4Z2NzqGIDUjvpVMM5ypfur?=\n\t=?utf-8?q?725EOHl6LcEwrchsiv1ZZ9vD6v8YB+VBSYSnujl/baV2stYhshNzYZXbeSkrxLIsc?=\n\t=?utf-8?q?ak5wO1UNOVX46bQ6m66JFj3GYM3a+A5DjpWiFETaj4oOrXNTsEjY1p8NZiUTzYZym?=\n\t=?utf-8?q?uONJZWOKmWlwmIrrrj4mqtz3l2GlavT4rIFhcWsy+bj+c55m6DVFfWvt3zmFC0x3t?=\n\t=?utf-8?q?Ki2CvMsim5spXlDBr8XMg8h8lneh9UK8IwuWVTUrtHiyGOb1H+PzrXJ6WSaXI8MfP?=\n\t=?utf-8?q?H0JXRBJJ8BP14M8A2hyL8yT51VwSBY4YKA=3D=3D?=", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 51933a57-1add-4208-ea58-08daaa85fb8f", "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:25.6263 (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 NYyylJoCGE5VZrR/rh1q1YVwCzo/i6SpFdpoonZKdM7g+ocwBMuPDajafOIMfaFCXBd3Wl4guSdhwKUqg9W8VFENyARw4HZ4M7mktSTINVk=", "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 flow validate/create/query/destroy/flush API of nfp PMD.\n\nThe flow create API construct a control cmsg and send it to\nfirmware, then add this flow to the hash table.\n\nThe flow query API get flow stats from the flow_priv structure.\nNote there exist an rte_spin_lock to prevent the update and query\naction occur at the same time.\n\nThe flow destroy API construct a control cmsg and send it to\nfirmware, then adelete this flow from the hash table.\n\nThe flow flush API just iterate the flows in hash table and\ncall the flow destroy API.\n\nSigned-off-by: Chaoyong He <chaoyong.he@corigine.com>\nReviewed-by: Niklas Söderlund <niklas.soderlund@corigine.com>\n---\n drivers/net/nfp/flower/nfp_flower_cmsg.c | 69 +++\n drivers/net/nfp/flower/nfp_flower_cmsg.h | 48 ++\n drivers/net/nfp/flower/nfp_flower_representor.c | 3 +\n drivers/net/nfp/nfp_flow.c | 573 +++++++++++++++++++++++-\n drivers/net/nfp/nfp_flow.h | 28 ++\n 5 files changed, 712 insertions(+), 9 deletions(-)", "diff": "diff --git a/drivers/net/nfp/flower/nfp_flower_cmsg.c b/drivers/net/nfp/flower/nfp_flower_cmsg.c\nindex 750a629..15d8381 100644\n--- a/drivers/net/nfp/flower/nfp_flower_cmsg.c\n+++ b/drivers/net/nfp/flower/nfp_flower_cmsg.c\n@@ -6,6 +6,7 @@\n #include \"../nfpcore/nfp_nsp.h\"\n #include \"../nfp_logs.h\"\n #include \"../nfp_common.h\"\n+#include \"../nfp_flow.h\"\n #include \"nfp_flower.h\"\n #include \"nfp_flower_cmsg.h\"\n #include \"nfp_flower_ctrl.h\"\n@@ -177,3 +178,71 @@\n \n \treturn 0;\n }\n+\n+int\n+nfp_flower_cmsg_flow_delete(struct nfp_app_fw_flower *app_fw_flower,\n+\t\tstruct rte_flow *flow)\n+{\n+\tchar *msg;\n+\tuint16_t cnt;\n+\tuint32_t msg_len;\n+\tstruct rte_mbuf *mbuf;\n+\tstruct nfp_fl_rule_metadata *nfp_flow_meta;\n+\n+\tmbuf = rte_pktmbuf_alloc(app_fw_flower->ctrl_pktmbuf_pool);\n+\tif (mbuf == NULL) {\n+\t\tPMD_DRV_LOG(DEBUG, \"Failed to alloc mbuf for flow delete.\");\n+\t\treturn -ENOMEM;\n+\t}\n+\n+\t/* Copy the flow to mbuf */\n+\tnfp_flow_meta = flow->payload.meta;\n+\tmsg_len = (nfp_flow_meta->key_len + nfp_flow_meta->mask_len +\n+\t\t\tnfp_flow_meta->act_len) << NFP_FL_LW_SIZ;\n+\tmsg_len += sizeof(struct nfp_fl_rule_metadata);\n+\tmsg = nfp_flower_cmsg_init(mbuf, NFP_FLOWER_CMSG_TYPE_FLOW_DEL, msg_len);\n+\trte_memcpy(msg, flow->payload.meta, msg_len);\n+\n+\tcnt = nfp_flower_ctrl_vnic_xmit(app_fw_flower, mbuf);\n+\tif (cnt == 0) {\n+\t\tPMD_DRV_LOG(ERR, \"Send cmsg through ctrl vnic failed.\");\n+\t\trte_pktmbuf_free(mbuf);\n+\t\treturn -EIO;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+int\n+nfp_flower_cmsg_flow_add(struct nfp_app_fw_flower *app_fw_flower,\n+\t\tstruct rte_flow *flow)\n+{\n+\tchar *msg;\n+\tuint16_t cnt;\n+\tuint32_t msg_len;\n+\tstruct rte_mbuf *mbuf;\n+\tstruct nfp_fl_rule_metadata *nfp_flow_meta;\n+\n+\tmbuf = rte_pktmbuf_alloc(app_fw_flower->ctrl_pktmbuf_pool);\n+\tif (mbuf == NULL) {\n+\t\tPMD_DRV_LOG(DEBUG, \"Failed to alloc mbuf for flow add.\");\n+\t\treturn -ENOMEM;\n+\t}\n+\n+\t/* copy the flow to mbuf */\n+\tnfp_flow_meta = flow->payload.meta;\n+\tmsg_len = (nfp_flow_meta->key_len + nfp_flow_meta->mask_len +\n+\t\t\tnfp_flow_meta->act_len) << NFP_FL_LW_SIZ;\n+\tmsg_len += sizeof(struct nfp_fl_rule_metadata);\n+\tmsg = nfp_flower_cmsg_init(mbuf, NFP_FLOWER_CMSG_TYPE_FLOW_ADD, msg_len);\n+\trte_memcpy(msg, flow->payload.meta, msg_len);\n+\n+\tcnt = nfp_flower_ctrl_vnic_xmit(app_fw_flower, mbuf);\n+\tif (cnt == 0) {\n+\t\tPMD_DRV_LOG(ERR, \"Send cmsg through ctrl vnic failed.\");\n+\t\trte_pktmbuf_free(mbuf);\n+\t\treturn -EIO;\n+\t}\n+\n+\treturn 0;\n+}\ndiff --git a/drivers/net/nfp/flower/nfp_flower_cmsg.h b/drivers/net/nfp/flower/nfp_flower_cmsg.h\nindex 5c28363..6045bb0 100644\n--- a/drivers/net/nfp/flower/nfp_flower_cmsg.h\n+++ b/drivers/net/nfp/flower/nfp_flower_cmsg.h\n@@ -189,10 +189,58 @@ enum nfp_flower_cmsg_port_vnic_type {\n \treturn rte_pktmbuf_mtod(m, char *) + 4 + 4 + NFP_FLOWER_CMSG_HLEN;\n }\n \n+/*\n+ * Metadata with L2 (1W/4B)\n+ * ----------------------------------------------------------------\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+ * | key_type | mask_id | PCP |p| vlan outermost VID |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ * ^ ^\n+ * NOTE: | TCI |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ */\n+struct nfp_flower_meta_tci {\n+\tuint8_t nfp_flow_key_layer;\n+\tuint8_t mask_id;\n+\trte_be16_t tci;\n+};\n+\n+/*\n+ * Extended metadata for additional key_layers (1W/4B)\n+ * ----------------------------------------------------------------\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+ * | nfp_flow_key_layer2 |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ */\n+struct nfp_flower_ext_meta {\n+\trte_be32_t nfp_flow_key_layer2;\n+};\n+\n+/*\n+ * L1 Port details (1W/4B)\n+ * ----------------------------------------------------------------\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_ingress |\n+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n+ */\n+struct nfp_flower_in_port {\n+\trte_be32_t in_port;\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);\n int nfp_flower_cmsg_port_mod(struct nfp_app_fw_flower *app_fw_flower,\n \t\tuint32_t port_id, bool carrier_ok);\n+int nfp_flower_cmsg_flow_delete(struct nfp_app_fw_flower *app_fw_flower,\n+\t\tstruct rte_flow *flow);\n+int nfp_flower_cmsg_flow_add(struct nfp_app_fw_flower *app_fw_flower,\n+\t\tstruct rte_flow *flow);\n \n #endif /* _NFP_CMSG_H_ */\ndiff --git a/drivers/net/nfp/flower/nfp_flower_representor.c b/drivers/net/nfp/flower/nfp_flower_representor.c\nindex 0e60f50..f1cd298 100644\n--- a/drivers/net/nfp/flower/nfp_flower_representor.c\n+++ b/drivers/net/nfp/flower/nfp_flower_representor.c\n@@ -10,6 +10,7 @@\n #include \"../nfp_logs.h\"\n #include \"../nfp_ctrl.h\"\n #include \"../nfp_rxtx.h\"\n+#include \"../nfp_flow.h\"\n #include \"../nfpcore/nfp_mip.h\"\n #include \"../nfpcore/nfp_rtsym.h\"\n #include \"../nfpcore/nfp_nsp.h\"\n@@ -590,6 +591,8 @@\n \t.promiscuous_disable = nfp_flower_repr_promiscuous_disable,\n \n \t.mac_addr_set = nfp_flower_repr_mac_addr_set,\n+\n+\t.flow_ops_get = nfp_net_flow_ops_get,\n };\n \n static uint32_t\ndiff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c\nindex 97f5d1b..114686f 100644\n--- a/drivers/net/nfp/nfp_flow.c\n+++ b/drivers/net/nfp/nfp_flow.c\n@@ -7,11 +7,15 @@\n #include <rte_hash.h>\n #include <rte_jhash.h>\n #include <bus_pci_driver.h>\n+#include <rte_malloc.h>\n \n #include \"nfp_common.h\"\n #include \"nfp_flow.h\"\n #include \"nfp_logs.h\"\n #include \"flower/nfp_flower.h\"\n+#include \"flower/nfp_flower_cmsg.h\"\n+#include \"flower/nfp_flower_ctrl.h\"\n+#include \"flower/nfp_flower_representor.h\"\n #include \"nfpcore/nfp_mip.h\"\n #include \"nfpcore/nfp_rtsym.h\"\n \n@@ -21,6 +25,15 @@ struct nfp_mask_id_entry {\n \tuint8_t mask_id;\n };\n \n+static inline struct nfp_flow_priv *\n+nfp_flow_dev_to_priv(struct rte_eth_dev *dev)\n+{\n+\tstruct nfp_flower_representor *repr;\n+\n+\trepr = (struct nfp_flower_representor *)dev->data->dev_private;\n+\treturn repr->app_fw_flower->flow_priv;\n+}\n+\n static int\n nfp_mask_id_alloc(struct nfp_flow_priv *priv, uint8_t *mask_id)\n {\n@@ -160,7 +173,7 @@ struct nfp_mask_id_entry {\n \treturn entry;\n }\n \n-__rte_unused static bool\n+static bool\n nfp_check_mask_add(struct nfp_flow_priv *priv,\n \t\tchar *mask_data,\n \t\tuint32_t mask_len,\n@@ -187,7 +200,7 @@ struct nfp_mask_id_entry {\n \treturn true;\n }\n \n-__rte_unused static bool\n+static bool\n nfp_check_mask_remove(struct nfp_flow_priv *priv,\n \t\tchar *mask_data,\n \t\tuint32_t mask_len,\n@@ -215,7 +228,7 @@ struct nfp_mask_id_entry {\n \treturn true;\n }\n \n-__rte_unused static int\n+static int\n nfp_flow_table_add(struct nfp_flow_priv *priv,\n \t\tstruct rte_flow *nfp_flow)\n {\n@@ -234,7 +247,7 @@ struct nfp_mask_id_entry {\n \treturn 0;\n }\n \n-__rte_unused static int\n+static int\n nfp_flow_table_delete(struct nfp_flow_priv *priv,\n \t\tstruct rte_flow *nfp_flow)\n {\n@@ -253,7 +266,7 @@ struct nfp_mask_id_entry {\n \treturn 0;\n }\n \n-__rte_unused static struct rte_flow *\n+static struct rte_flow *\n nfp_flow_table_search(struct nfp_flow_priv *priv,\n \t\tstruct rte_flow *nfp_flow)\n {\n@@ -273,7 +286,7 @@ struct nfp_mask_id_entry {\n \treturn flow_find;\n }\n \n-__rte_unused static struct rte_flow *\n+static struct rte_flow *\n nfp_flow_alloc(struct nfp_fl_key_ls *key_layer)\n {\n \tchar *tmp;\n@@ -306,14 +319,14 @@ struct nfp_mask_id_entry {\n \treturn NULL;\n }\n \n-__rte_unused static void\n+static void\n nfp_flow_free(struct rte_flow *nfp_flow)\n {\n \trte_free(nfp_flow->payload.meta);\n \trte_free(nfp_flow);\n }\n \n-__rte_unused static int\n+static int\n nfp_stats_id_alloc(struct nfp_flow_priv *priv, uint32_t *ctx)\n {\n \tstruct circ_buf *ring;\n@@ -348,7 +361,7 @@ struct nfp_mask_id_entry {\n \treturn 0;\n }\n \n-__rte_unused static int\n+static int\n nfp_stats_id_free(struct nfp_flow_priv *priv, uint32_t ctx)\n {\n \tstruct circ_buf *ring;\n@@ -366,6 +379,548 @@ struct nfp_mask_id_entry {\n \treturn 0;\n }\n \n+static void\n+nfp_flower_compile_meta_tci(char *mbuf_off, struct nfp_fl_key_ls *key_layer)\n+{\n+\tstruct nfp_flower_meta_tci *tci_meta;\n+\n+\ttci_meta = (struct nfp_flower_meta_tci *)mbuf_off;\n+\ttci_meta->nfp_flow_key_layer = key_layer->key_layer;\n+\ttci_meta->mask_id = ~0;\n+\ttci_meta->tci = rte_cpu_to_be_16(key_layer->vlan);\n+}\n+\n+static void\n+nfp_flower_update_meta_tci(char *exact, uint8_t mask_id)\n+{\n+\tstruct nfp_flower_meta_tci *meta_tci;\n+\n+\tmeta_tci = (struct nfp_flower_meta_tci *)exact;\n+\tmeta_tci->mask_id = mask_id;\n+}\n+\n+static void\n+nfp_flower_compile_ext_meta(char *mbuf_off, struct nfp_fl_key_ls *key_layer)\n+{\n+\tstruct nfp_flower_ext_meta *ext_meta;\n+\n+\text_meta = (struct nfp_flower_ext_meta *)mbuf_off;\n+\text_meta->nfp_flow_key_layer2 = rte_cpu_to_be_32(key_layer->key_layer_two);\n+}\n+\n+static void\n+nfp_compile_meta_port(char *mbuf_off,\n+\t\tstruct nfp_fl_key_ls *key_layer,\n+\t\tbool is_mask)\n+{\n+\tstruct nfp_flower_in_port *port_meta;\n+\n+\tport_meta = (struct nfp_flower_in_port *)mbuf_off;\n+\n+\tif (is_mask)\n+\t\tport_meta->in_port = rte_cpu_to_be_32(~0);\n+\telse if (key_layer->tun_type)\n+\t\tport_meta->in_port = rte_cpu_to_be_32(NFP_FL_PORT_TYPE_TUN |\n+\t\t\t\tkey_layer->tun_type);\n+\telse\n+\t\tport_meta->in_port = rte_cpu_to_be_32(key_layer->port);\n+}\n+\n+static void\n+nfp_flow_compile_metadata(struct nfp_flow_priv *priv,\n+\t\tstruct rte_flow *nfp_flow,\n+\t\tstruct nfp_fl_key_ls *key_layer,\n+\t\tuint32_t stats_ctx)\n+{\n+\tstruct nfp_fl_rule_metadata *nfp_flow_meta;\n+\tchar *mbuf_off_exact;\n+\tchar *mbuf_off_mask;\n+\n+\t/*\n+\t * Convert to long words as firmware expects\n+\t * lengths in units of NFP_FL_LW_SIZ.\n+\t */\n+\tnfp_flow_meta = nfp_flow->payload.meta;\n+\tnfp_flow_meta->key_len = key_layer->key_size >> NFP_FL_LW_SIZ;\n+\tnfp_flow_meta->mask_len = key_layer->key_size >> NFP_FL_LW_SIZ;\n+\tnfp_flow_meta->act_len = key_layer->act_size >> NFP_FL_LW_SIZ;\n+\tnfp_flow_meta->flags = 0;\n+\tnfp_flow_meta->host_ctx_id = rte_cpu_to_be_32(stats_ctx);\n+\tnfp_flow_meta->host_cookie = rte_rand();\n+\tnfp_flow_meta->flow_version = rte_cpu_to_be_64(priv->flower_version);\n+\tpriv->flower_version++;\n+\n+\tmbuf_off_exact = nfp_flow->payload.unmasked_data;\n+\tmbuf_off_mask = nfp_flow->payload.mask_data;\n+\n+\t/* Populate Metadata */\n+\tnfp_flower_compile_meta_tci(mbuf_off_exact, key_layer);\n+\tnfp_flower_compile_meta_tci(mbuf_off_mask, key_layer);\n+\tmbuf_off_exact += sizeof(struct nfp_flower_meta_tci);\n+\tmbuf_off_mask += sizeof(struct nfp_flower_meta_tci);\n+\n+\t/* Populate Extended Metadata if required */\n+\tif (key_layer->key_layer & NFP_FLOWER_LAYER_EXT_META) {\n+\t\tnfp_flower_compile_ext_meta(mbuf_off_exact, key_layer);\n+\t\tnfp_flower_compile_ext_meta(mbuf_off_mask, key_layer);\n+\t\tmbuf_off_exact += sizeof(struct nfp_flower_ext_meta);\n+\t\tmbuf_off_mask += sizeof(struct nfp_flower_ext_meta);\n+\t}\n+\n+\t/* Populate Port Data */\n+\tnfp_compile_meta_port(mbuf_off_exact, key_layer, false);\n+\tnfp_compile_meta_port(mbuf_off_mask, key_layer, true);\n+\tmbuf_off_exact += sizeof(struct nfp_flower_in_port);\n+\tmbuf_off_mask += sizeof(struct nfp_flower_in_port);\n+}\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+{\n+\tconst struct rte_flow_item *item;\n+\n+\tfor (item = items; item->type != RTE_FLOW_ITEM_TYPE_END; ++item) {\n+\t\tswitch (item->type) {\n+\t\tdefault:\n+\t\t\tPMD_DRV_LOG(ERR, \"Item type %d not supported.\", item->type);\n+\t\t\treturn -ENOTSUP;\n+\t\t}\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static int\n+nfp_flow_key_layers_calculate_actions(const struct rte_flow_action actions[],\n+\t\tstruct nfp_fl_key_ls *key_ls)\n+{\n+\tint ret = 0;\n+\tconst struct rte_flow_action *action;\n+\n+\tfor (action = actions; action->type != RTE_FLOW_ACTION_TYPE_END; ++action) {\n+\t\t/* Make sure actions length no longer than NFP_FL_MAX_A_SIZ */\n+\t\tif (key_ls->act_size > NFP_FL_MAX_A_SIZ) {\n+\t\t\tPMD_DRV_LOG(ERR, \"The action list is too long.\");\n+\t\t\tret = -ERANGE;\n+\t\t\tbreak;\n+\t\t}\n+\n+\t\tswitch (action->type) {\n+\t\tcase RTE_FLOW_ACTION_TYPE_VOID:\n+\t\t\tPMD_DRV_LOG(DEBUG, \"RTE_FLOW_ACTION_TYPE_VOID detected\");\n+\t\t\tbreak;\n+\t\tdefault:\n+\t\t\tPMD_DRV_LOG(ERR, \"Action type %d not supported.\", action->type);\n+\t\t\treturn -ENOTSUP;\n+\t\t}\n+\t}\n+\n+\treturn ret;\n+}\n+\n+static int\n+nfp_flow_key_layers_calculate(const struct rte_flow_item items[],\n+\t\tconst struct rte_flow_action actions[],\n+\t\tstruct nfp_fl_key_ls *key_ls)\n+{\n+\tint ret = 0;\n+\n+\tkey_ls->key_layer_two = 0;\n+\tkey_ls->key_layer = NFP_FLOWER_LAYER_PORT;\n+\tkey_ls->key_size = sizeof(struct nfp_flower_meta_tci) +\n+\t\t\tsizeof(struct nfp_flower_in_port);\n+\tkey_ls->act_size = 0;\n+\tkey_ls->port = ~0;\n+\tkey_ls->vlan = 0;\n+\tkey_ls->tun_type = NFP_FL_TUN_NONE;\n+\n+\tret |= nfp_flow_key_layers_calculate_items(items, key_ls);\n+\tret |= nfp_flow_key_layers_calculate_actions(actions, key_ls);\n+\n+\treturn ret;\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+\t\tconst struct rte_flow_action actions[])\n+{\n+\tint ret;\n+\tchar *mask_data;\n+\tuint32_t mask_len;\n+\tuint32_t stats_ctx = 0;\n+\tuint8_t new_mask_id = 0;\n+\tstruct rte_flow *nfp_flow;\n+\tstruct rte_flow *flow_find;\n+\tstruct nfp_flow_priv *priv;\n+\tstruct nfp_fl_key_ls key_layer;\n+\tstruct nfp_fl_rule_metadata *nfp_flow_meta;\n+\n+\tret = nfp_flow_key_layers_calculate(items, actions, &key_layer);\n+\tif (ret != 0) {\n+\t\tPMD_DRV_LOG(ERR, \"Key layers calculate failed.\");\n+\t\treturn NULL;\n+\t}\n+\n+\tif (key_layer.port == (uint32_t)~0)\n+\t\tkey_layer.port = representor->port_id;\n+\n+\tpriv = representor->app_fw_flower->flow_priv;\n+\tret = nfp_stats_id_alloc(priv, &stats_ctx);\n+\tif (ret != 0) {\n+\t\tPMD_DRV_LOG(ERR, \"nfp stats id alloc failed.\");\n+\t\treturn NULL;\n+\t}\n+\n+\tnfp_flow = nfp_flow_alloc(&key_layer);\n+\tif (nfp_flow == NULL) {\n+\t\tPMD_DRV_LOG(ERR, \"Alloc nfp flow failed.\");\n+\t\tgoto free_stats;\n+\t}\n+\n+\tnfp_flow->install_flag = true;\n+\n+\tnfp_flow_compile_metadata(priv, nfp_flow, &key_layer, stats_ctx);\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+\tif (!nfp_check_mask_add(priv, mask_data, mask_len,\n+\t\t\t&nfp_flow_meta->flags, &new_mask_id)) {\n+\t\tPMD_DRV_LOG(ERR, \"nfp mask add check failed.\");\n+\t\tgoto free_flow;\n+\t}\n+\n+\t/* Once we have a mask_id, update the meta tci */\n+\tnfp_flower_update_meta_tci(nfp_flow->payload.unmasked_data, new_mask_id);\n+\n+\t/* Find the flow in hash table */\n+\tflow_find = nfp_flow_table_search(priv, nfp_flow);\n+\tif (flow_find != NULL) {\n+\t\tPMD_DRV_LOG(ERR, \"This flow is already exist.\");\n+\t\tif (!nfp_check_mask_remove(priv, mask_data, mask_len,\n+\t\t\t\t&nfp_flow_meta->flags)) {\n+\t\t\tPMD_DRV_LOG(ERR, \"nfp mask del check failed.\");\n+\t\t}\n+\t\tgoto free_flow;\n+\t}\n+\n+\treturn nfp_flow;\n+\n+free_flow:\n+\tnfp_flow_free(nfp_flow);\n+free_stats:\n+\tnfp_stats_id_free(priv, stats_ctx);\n+\n+\treturn NULL;\n+}\n+\n+static struct rte_flow *\n+nfp_flow_setup(struct nfp_flower_representor *representor,\n+\t\tconst struct rte_flow_attr *attr,\n+\t\tconst struct rte_flow_item items[],\n+\t\tconst struct rte_flow_action actions[],\n+\t\tstruct rte_flow_error *error)\n+{\n+\tif (attr->group != 0)\n+\t\tPMD_DRV_LOG(INFO, \"Pretend we support group attribute.\");\n+\n+\tif (attr->priority != 0)\n+\t\tPMD_DRV_LOG(INFO, \"Pretend we support priority attribute.\");\n+\n+\tif (attr->transfer != 0)\n+\t\tPMD_DRV_LOG(INFO, \"Pretend we support transfer attribute.\");\n+\n+\tif (attr->egress != 0) {\n+\t\trte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ATTR_EGRESS,\n+\t\t\t\tNULL, \"Egress is not supported.\");\n+\t\treturn NULL;\n+\t}\n+\n+\tif (attr->ingress == 0) {\n+\t\trte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ATTR_INGRESS,\n+\t\t\t\tNULL, \"Only ingress is supported.\");\n+\t\treturn NULL;\n+\t}\n+\n+\treturn nfp_flow_process(representor, items, actions);\n+}\n+\n+static int\n+nfp_flow_teardown(struct nfp_flow_priv *priv, struct rte_flow *nfp_flow)\n+{\n+\tchar *mask_data;\n+\tuint32_t mask_len;\n+\tuint32_t stats_ctx;\n+\tstruct nfp_fl_rule_metadata *nfp_flow_meta;\n+\n+\tnfp_flow_meta = nfp_flow->payload.meta;\n+\tmask_data = nfp_flow->payload.mask_data;\n+\tmask_len = nfp_flow_meta->mask_len << NFP_FL_LW_SIZ;\n+\tif (!nfp_check_mask_remove(priv, mask_data, mask_len,\n+\t\t\t&nfp_flow_meta->flags)) {\n+\t\tPMD_DRV_LOG(ERR, \"nfp mask del check failed.\");\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tnfp_flow_meta->flow_version = rte_cpu_to_be_64(priv->flower_version);\n+\tpriv->flower_version++;\n+\n+\tstats_ctx = rte_be_to_cpu_32(nfp_flow_meta->host_ctx_id);\n+\treturn nfp_stats_id_free(priv, stats_ctx);\n+}\n+\n+static int\n+nfp_flow_validate(struct rte_eth_dev *dev,\n+\t\tconst struct rte_flow_attr *attr,\n+\t\tconst struct rte_flow_item items[],\n+\t\tconst struct rte_flow_action actions[],\n+\t\tstruct rte_flow_error *error)\n+{\n+\tint ret;\n+\tstruct rte_flow *nfp_flow;\n+\tstruct nfp_flow_priv *priv;\n+\tstruct nfp_flower_representor *representor;\n+\n+\trepresentor = (struct nfp_flower_representor *)dev->data->dev_private;\n+\tpriv = representor->app_fw_flower->flow_priv;\n+\n+\tnfp_flow = nfp_flow_setup(representor, attr, items, actions, error);\n+\tif (nfp_flow == NULL) {\n+\t\treturn rte_flow_error_set(error, ENOTSUP,\n+\t\t\t\tRTE_FLOW_ERROR_TYPE_UNSPECIFIED,\n+\t\t\t\tNULL, \"This flow can not be offloaded.\");\n+\t}\n+\n+\tret = nfp_flow_teardown(priv, nfp_flow);\n+\tif (ret != 0) {\n+\t\treturn rte_flow_error_set(error, EINVAL,\n+\t\t\t\tRTE_FLOW_ERROR_TYPE_UNSPECIFIED,\n+\t\t\t\tNULL, \"Flow resource free failed.\");\n+\t}\n+\n+\tnfp_flow_free(nfp_flow);\n+\n+\treturn 0;\n+}\n+\n+static struct rte_flow *\n+nfp_flow_create(struct rte_eth_dev *dev,\n+\t\tconst struct rte_flow_attr *attr,\n+\t\tconst struct rte_flow_item items[],\n+\t\tconst struct rte_flow_action actions[],\n+\t\tstruct rte_flow_error *error)\n+{\n+\tint ret;\n+\tstruct rte_flow *nfp_flow;\n+\tstruct nfp_flow_priv *priv;\n+\tstruct nfp_app_fw_flower *app_fw_flower;\n+\tstruct nfp_flower_representor *representor;\n+\n+\trepresentor = (struct nfp_flower_representor *)dev->data->dev_private;\n+\tapp_fw_flower = representor->app_fw_flower;\n+\tpriv = app_fw_flower->flow_priv;\n+\n+\tnfp_flow = nfp_flow_setup(representor, attr, items, actions, error);\n+\tif (nfp_flow == NULL) {\n+\t\trte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_UNSPECIFIED,\n+\t\t\t\tNULL, \"This flow can not be offloaded.\");\n+\t\treturn NULL;\n+\t}\n+\n+\t/* Add the flow to hardware */\n+\tif (nfp_flow->install_flag) {\n+\t\tret = nfp_flower_cmsg_flow_add(app_fw_flower, nfp_flow);\n+\t\tif (ret != 0) {\n+\t\t\trte_flow_error_set(error, EINVAL,\n+\t\t\t\t\tRTE_FLOW_ERROR_TYPE_UNSPECIFIED,\n+\t\t\t\t\tNULL, \"Add flow to firmware failed.\");\n+\t\t\tgoto flow_teardown;\n+\t\t}\n+\t}\n+\n+\t/* Add the flow to flow hash table */\n+\tret = nfp_flow_table_add(priv, nfp_flow);\n+\tif (ret != 0) {\n+\t\trte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_UNSPECIFIED,\n+\t\t\t\tNULL, \"Add flow to the flow table failed.\");\n+\t\tgoto flow_teardown;\n+\t}\n+\n+\treturn nfp_flow;\n+\n+flow_teardown:\n+\tnfp_flow_teardown(priv, nfp_flow);\n+\tnfp_flow_free(nfp_flow);\n+\n+\treturn NULL;\n+}\n+\n+static int\n+nfp_flow_destroy(struct rte_eth_dev *dev,\n+\t\tstruct rte_flow *nfp_flow,\n+\t\tstruct rte_flow_error *error)\n+{\n+\tint ret;\n+\tstruct rte_flow *flow_find;\n+\tstruct nfp_flow_priv *priv;\n+\tstruct nfp_app_fw_flower *app_fw_flower;\n+\tstruct nfp_flower_representor *representor;\n+\n+\trepresentor = (struct nfp_flower_representor *)dev->data->dev_private;\n+\tapp_fw_flower = representor->app_fw_flower;\n+\tpriv = app_fw_flower->flow_priv;\n+\n+\t/* Find the flow in flow hash table */\n+\tflow_find = nfp_flow_table_search(priv, nfp_flow);\n+\tif (flow_find == NULL) {\n+\t\trte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_UNSPECIFIED,\n+\t\t\t\tNULL, \"Flow does not exist.\");\n+\t\tret = -EINVAL;\n+\t\tgoto exit;\n+\t}\n+\n+\t/* Update flow */\n+\tret = nfp_flow_teardown(priv, nfp_flow);\n+\tif (ret != 0) {\n+\t\trte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_UNSPECIFIED,\n+\t\t\t\tNULL, \"Flow teardown failed.\");\n+\t\tret = -EINVAL;\n+\t\tgoto exit;\n+\t}\n+\n+\t/* Delete the flow from hardware */\n+\tif (nfp_flow->install_flag) {\n+\t\tret = nfp_flower_cmsg_flow_delete(app_fw_flower, nfp_flow);\n+\t\tif (ret != 0) {\n+\t\t\trte_flow_error_set(error, EINVAL,\n+\t\t\t\t\tRTE_FLOW_ERROR_TYPE_UNSPECIFIED,\n+\t\t\t\t\tNULL, \"Delete flow from firmware failed.\");\n+\t\t\tret = -EINVAL;\n+\t\t\tgoto exit;\n+\t\t}\n+\t}\n+\n+\t/* Delete the flow from flow hash table */\n+\tret = nfp_flow_table_delete(priv, nfp_flow);\n+\tif (ret != 0) {\n+\t\trte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_UNSPECIFIED,\n+\t\t\t\tNULL, \"Delete flow from the flow table failed.\");\n+\t\tret = -EINVAL;\n+\t\tgoto exit;\n+\t}\n+\n+exit:\n+\tnfp_flow_free(nfp_flow);\n+\n+\treturn ret;\n+}\n+\n+static int\n+nfp_flow_flush(struct rte_eth_dev *dev,\n+\t\tstruct rte_flow_error *error)\n+{\n+\tint ret = 0;\n+\tvoid *next_data;\n+\tuint32_t iter = 0;\n+\tconst void *next_key;\n+\tstruct nfp_flow_priv *priv;\n+\n+\tpriv = nfp_flow_dev_to_priv(dev);\n+\n+\twhile (rte_hash_iterate(priv->flow_table, &next_key, &next_data, &iter) >= 0) {\n+\t\tret = nfp_flow_destroy(dev, (struct rte_flow *)next_data, error);\n+\t\tif (ret != 0)\n+\t\t\tbreak;\n+\t}\n+\n+\treturn ret;\n+}\n+\n+static void\n+nfp_flow_stats_get(struct rte_eth_dev *dev,\n+\t\tstruct rte_flow *nfp_flow,\n+\t\tvoid *data)\n+{\n+\tuint32_t ctx_id;\n+\tstruct rte_flow *flow;\n+\tstruct nfp_flow_priv *priv;\n+\tstruct nfp_fl_stats *stats;\n+\tstruct rte_flow_query_count *query;\n+\n+\tpriv = nfp_flow_dev_to_priv(dev);\n+\tflow = nfp_flow_table_search(priv, nfp_flow);\n+\tif (flow == NULL) {\n+\t\tPMD_DRV_LOG(ERR, \"Can not find statistics for this flow.\");\n+\t\treturn;\n+\t}\n+\n+\tquery = (struct rte_flow_query_count *)data;\n+\tctx_id = rte_be_to_cpu_32(nfp_flow->payload.meta->host_ctx_id);\n+\tstats = &priv->stats[ctx_id];\n+\n+\trte_spinlock_lock(&priv->stats_lock);\n+\tif (stats->pkts && stats->bytes) {\n+\t\tquery->hits = stats->pkts;\n+\t\tquery->bytes = stats->bytes;\n+\t\tquery->hits_set = 1;\n+\t\tquery->bytes_set = 1;\n+\t\tstats->pkts = 0;\n+\t\tstats->bytes = 0;\n+\t}\n+\trte_spinlock_unlock(&priv->stats_lock);\n+}\n+\n+static int\n+nfp_flow_query(struct rte_eth_dev *dev,\n+\t\tstruct rte_flow *nfp_flow,\n+\t\tconst struct rte_flow_action *actions,\n+\t\tvoid *data,\n+\t\tstruct rte_flow_error *error)\n+{\n+\tconst struct rte_flow_action *action;\n+\n+\tfor (action = actions; action->type != RTE_FLOW_ACTION_TYPE_END; ++action) {\n+\t\tswitch (action->type) {\n+\t\tcase RTE_FLOW_ACTION_TYPE_VOID:\n+\t\t\tbreak;\n+\t\tcase RTE_FLOW_ACTION_TYPE_COUNT:\n+\t\t\tnfp_flow_stats_get(dev, nfp_flow, data);\n+\t\t\tbreak;\n+\t\tdefault:\n+\t\t\trte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_UNSPECIFIED,\n+\t\t\t\t\tNULL, \"Unsupported action type for flow query.\");\n+\t\t\treturn -ENOTSUP;\n+\t\t}\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static const struct rte_flow_ops nfp_flow_ops = {\n+\t.validate = nfp_flow_validate,\n+\t.create = nfp_flow_create,\n+\t.destroy = nfp_flow_destroy,\n+\t.flush = nfp_flow_flush,\n+\t.query = nfp_flow_query,\n+};\n+\n+int\n+nfp_net_flow_ops_get(struct rte_eth_dev *dev,\n+\t\tconst struct rte_flow_ops **ops)\n+{\n+\tif ((dev->data->dev_flags & RTE_ETH_DEV_REPRESENTOR) == 0) {\n+\t\t*ops = NULL;\n+\t\tPMD_DRV_LOG(ERR, \"Port is not a representor.\");\n+\t\treturn -EINVAL;\n+\t}\n+\n+\t*ops = &nfp_flow_ops;\n+\n+\treturn 0;\n+}\n+\n int\n nfp_flow_priv_init(struct nfp_pf_dev *pf_dev)\n {\ndiff --git a/drivers/net/nfp/nfp_flow.h b/drivers/net/nfp/nfp_flow.h\nindex 142d7d5..83f9f29 100644\n--- a/drivers/net/nfp/nfp_flow.h\n+++ b/drivers/net/nfp/nfp_flow.h\n@@ -6,10 +6,36 @@\n #ifndef _NFP_FLOW_H_\n #define _NFP_FLOW_H_\n \n+#include <ethdev_driver.h>\n+\n+#define NFP_FLOWER_LAYER_EXT_META (1 << 0)\n+#define NFP_FLOWER_LAYER_PORT (1 << 1)\n+#define NFP_FLOWER_LAYER_MAC (1 << 2)\n+#define NFP_FLOWER_LAYER_TP (1 << 3)\n+#define NFP_FLOWER_LAYER_IPV4 (1 << 4)\n+#define NFP_FLOWER_LAYER_IPV6 (1 << 5)\n+#define NFP_FLOWER_LAYER_CT (1 << 6)\n+#define NFP_FLOWER_LAYER_VXLAN (1 << 7)\n+\n+#define NFP_FLOWER_LAYER2_GRE (1 << 0)\n+#define NFP_FLOWER_LAYER2_QINQ (1 << 4)\n+#define NFP_FLOWER_LAYER2_GENEVE (1 << 5)\n+#define NFP_FLOWER_LAYER2_GENEVE_OP (1 << 6)\n+#define NFP_FLOWER_LAYER2_TUN_IPV6 (1 << 7)\n+\n #define NFP_FL_META_FLAG_MANAGE_MASK (1 << 7)\n \n #define NFP_MASK_TABLE_ENTRIES 1024\n \n+/* The maximum action list size (in bytes) supported by the NFP. */\n+#define NFP_FL_MAX_A_SIZ 1216\n+\n+/* The firmware expects lengths in units of long words */\n+#define NFP_FL_LW_SIZ 2\n+\n+/* Tunnel ports */\n+#define NFP_FL_PORT_TYPE_TUN 0x50000000\n+\n enum nfp_flower_tun_type {\n \tNFP_FL_TUN_NONE = 0,\n \tNFP_FL_TUN_GRE = 1,\n@@ -75,6 +101,7 @@ struct nfp_fl_stats {\n \n struct nfp_flow_priv {\n \tuint32_t hash_seed; /**< Hash seed for hash tables in this structure. */\n+\tuint64_t flower_version; /**< Flow version, always increase. */\n \t/* mask hash table */\n \tstruct nfp_fl_mask_id mask_ids; /**< Entry for mask hash table */\n \tstruct rte_hash *mask_table; /**< Hash table to store mask ids. */\n@@ -97,5 +124,6 @@ struct rte_flow {\n \n int nfp_flow_priv_init(struct nfp_pf_dev *pf_dev);\n void nfp_flow_priv_uninit(struct nfp_pf_dev *pf_dev);\n+int nfp_net_flow_ops_get(struct rte_eth_dev *dev, const struct rte_flow_ops **ops);\n \n #endif /* _NFP_FLOW_H_ */\n", "prefixes": [ "v2", "03/24" ] }