Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/113591/?format=api
{ "id": 113591, "url": "http://patches.dpdk.org/api/patches/113591/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1656642017-8992-10-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": "<1656642017-8992-10-git-send-email-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1656642017-8992-10-git-send-email-chaoyong.he@corigine.com", "date": "2022-07-01T02:20:14", "name": "[v4,09/12] net/nfp: add flower ctrl VNIC rxtx logic", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "2a7337da01f74c8fb1b0a9c88bb21f9f0a01e0e7", "submitter": { "id": 2554, "url": "http://patches.dpdk.org/api/people/2554/?format=api", "name": "Chaoyong He", "email": "chaoyong.he@corigine.com" }, "delegate": { "id": 3961, "url": "http://patches.dpdk.org/api/users/3961/?format=api", "username": "arybchenko", "first_name": "Andrew", "last_name": "Rybchenko", "email": "andrew.rybchenko@oktetlabs.ru" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1656642017-8992-10-git-send-email-chaoyong.he@corigine.com/mbox/", "series": [ { "id": 23850, "url": "http://patches.dpdk.org/api/series/23850/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=23850", "date": "2022-07-01T02:20:05", "name": "preparation for the rte_flow offload of nfp PMD", "version": 4, "mbox": "http://patches.dpdk.org/series/23850/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/113591/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/113591/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 591B6A0093;\n\tFri, 1 Jul 2022 04:22:11 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 2C7FD42B72;\n\tFri, 1 Jul 2022 04:21:27 +0200 (CEST)", "from NAM11-CO1-obe.outbound.protection.outlook.com\n (mail-co1nam11on2102.outbound.protection.outlook.com [40.107.220.102])\n by mails.dpdk.org (Postfix) with ESMTP id 9F8E242B7D\n for <dev@dpdk.org>; Fri, 1 Jul 2022 04:21:24 +0200 (CEST)", "from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5)\n by BL3PR13MB5107.namprd13.prod.outlook.com (2603:10b6:208:352::20)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.8; Fri, 1 Jul\n 2022 02:21:22 +0000", "from SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::5d9e:9ce5:51d1:2021]) by SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::5d9e:9ce5:51d1:2021%9]) with mapi id 15.20.5395.014; Fri, 1 Jul 2022\n 02:21:21 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=lU2WkDCt/IMFTMWQdQT69ZJNYZqQ3R6C1gzruksbfb0yiRaKRPD0TlwyaN6taS7zcsc+nyiJ213NCS/dQSUisetfo+GZd4jzp34v72Xl9mSGxyhwvUY+BpQYwHZmdPQN4lXr1+jTT6KYSEieefiJLg4RjVTowjpLY324NThfGcD810ZW0h1HKTaKA3SHl8JHsKmJVGK6NLOvlRov00bfoFDHW5y+foWoOF9zI+NWm7TXY1ZWxCvGMo3CTryrLRBTTwWOQsI+diDDcBmMBoJVwnNjzHQQdyULw+DIz5W/UWR0Cr8t1Mbsm3m7Z7oNHOo0bogLSxKMiCKfQauM216sHQ==", "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=dc+OB3u+oAIlKVE9MJQ+4zssHKMWo0Nx0Shds1ecQwk=;\n b=SuyTDvzxc4V6OREgL2xCmg0vhMv94fiBEwq7e0322sWCxjCdTBYBcQ0RbkeBi/kmCcuQZco6anIzsfTdpGxJ9saQzvDthoxVFyF8Ve3/gsVmxlw9AWTK5QH+ARNuNKziQSxoV2Crqwbphdfhe061pmyYLUAS9QnBy6B6SJuwNCEfiaSfr0hvXkrfJHZN8MvfgQf18CZavvc2YQibrOj51PTZwEbKp8MpvWOMi5iUKEBcT/AZX5S25M3mgnSoe4NeWzrlbYYM6bmK5VTjcXY0fKihbqnZRQHvIE/CQ40xUnSdaN7pJyoy0kXNSTo7sEzkOeTuIzgddoQrRAsiqoQevw==", "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=dc+OB3u+oAIlKVE9MJQ+4zssHKMWo0Nx0Shds1ecQwk=;\n b=tRPjji96pYLJokS/ksbSywJkjorecL9pxmjisUgpfpMvb7kPtzBDSwVhKIF1vS6mXgXhO3kc/HCt+Vb3LN2upqKvF4vGy/XDMkiVbmqQurWTzFJyt64qtzW23T8HnTjQvNOk2waumm7fpkwYB/BwlJoM8DwzEHgXfpBXNpXmS7k=", "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": "niklas.soderlund@corigine.com, Chaoyong He <chaoyong.he@corigine.com>,\n Heinrich Kuhn <heinrich.kuhn@corigine.com>", "Subject": "[PATCH v4 09/12] net/nfp: add flower ctrl VNIC rxtx logic", "Date": "Fri, 1 Jul 2022 10:20:14 +0800", "Message-Id": "<1656642017-8992-10-git-send-email-chaoyong.he@corigine.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1656642017-8992-1-git-send-email-chaoyong.he@corigine.com>", "References": "<1656642017-8992-1-git-send-email-chaoyong.he@corigine.com>", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "X-ClientProxiedBy": "SG2PR02CA0079.apcprd02.prod.outlook.com\n (2603:1096:4:90::19) To SJ0PR13MB5545.namprd13.prod.outlook.com\n (2603:10b6:a03:424::5)", "MIME-Version": "1.0", "X-MS-PublicTrafficType": "Email", "X-MS-Office365-Filtering-Correlation-Id": "3242b31b-c979-48d2-9407-08da5b0863a0", "X-MS-TrafficTypeDiagnostic": "BL3PR13MB5107:EE_", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n ajo5MxuCATYYbQvCYl/CRX4Z/PaoXXD7d7slm5MJ5fJ91LrVI9bMIR01Aq+eswdCMzkOxS3+G3ucTcEwfeI48Rr88JbA6Y7kzv+Tuv40E7GfiXRRYfIxvPONZSF9kkS4GmRnY73G0HYUir8zZx6lY22QRbYbo/KMbpUiBn8ND5mfX5Mn/KmSEktriqaxTDeaQd1d7tswVtl07FiNTuhW0Zp+FdZ/40bgoYDH/aYKJusPGtBDlO6iyrc/XaYEgZYbLj+xHgTNPZh03BbpbJpLHMFtt54/hljeaZsu8YpD93DerXxRNoU/vGkLwTz4sBLQkKsvi81SG725M4a7zVWAYcjxsANiwixOPbo9SouWEGL1C2tPcbAbOgcnT3dPA8LMocJUBQ11UHjlCv5UYDQ/0LN1IWx83pF0d5xt2E1RjrTMewrJbakU8RwEmO3uW0dlYZ7J9zD4dsBowyRo2lGJRvqxfph/utv+S6nJ/lXSEkGyLWC0he3JDlsfyG4mjptdIZtQOViD1e4e+HpNN324yLFzw2CqcfrkM3GaLn0XGHgyTQfSmP7EFt45CjChOKGwJwc+/jguQ5c7HQ2e6YspPRK0HPyBLpiRIjf1V3qRFNp8TE1VCDvR5rnDxYHVGv4Y+akzUHaXKWrtA9YgKubZBptHE5HkbPh9kNWOY4oer1v+EbEhxl1tEwu2lxvsBXmBAwlDKm8Woc4hVKk7JiN3ESQeXT0Zt/Y3bvQ3qF5nAZ+OqvWcWWLva+LjpRFPaLXKRLCwlh5XX16a3psqcbIuCfCQbQ7g13Mjf5r4/+hanlyMqkkx+whcOe41TeSz0Q68", "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:(13230016)(4636009)(396003)(366004)(136003)(346002)(376002)(39840400004)(38100700002)(6512007)(38350700002)(6916009)(83380400001)(6486002)(186003)(66574015)(36756003)(26005)(316002)(54906003)(66556008)(66946007)(4326008)(2906002)(8676002)(41300700001)(8936002)(6666004)(2616005)(44832011)(6506007)(478600001)(5660300002)(86362001)(52116002)(66476007)(107886003);\n DIR:OUT; SFP:1102;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "=?utf-8?q?ZkBIqcTNdeL8CukldXZh8T+MB7jQ?=\n\t=?utf-8?q?w5A8PY1gb6QTfHamhSoTCpRdWj2mi3TIs+hUntETAIsxJyGtcSqrp0W1YnFu0W2KT?=\n\t=?utf-8?q?w0yF5FgunIdaRrVhVARf7MdcLB3RBjCs5xgZhptG0XM7UP/MdrGVz/dEasF4WlD7L?=\n\t=?utf-8?q?e0/gsDisYqEnw5dBq+jlD+PxgDB7N4GN/wc3QlqQALlMMQzLAYgJIxWQa3yz37oV7?=\n\t=?utf-8?q?Yi1ESgnlKVLiSXrbSZGEU/qoMiN3LNQRMYUGNb/6c075sfzvguypTJEoWES56xUHl?=\n\t=?utf-8?q?sunqdvgYkyFUetap7ksbe7warpiF+rRHQAAZPuuqh8X/iWWyB6TwD9jHckLqKFvla?=\n\t=?utf-8?q?1Zh/Tyt8cjPCoJv/EG5lZb9me3eY70IeRHpWYGYPyA9nO7D5FyM2GUk2EXZTsy00b?=\n\t=?utf-8?q?02Q/oBegjjGQ1atZgp0O+H2uarmcvpFLcKL9jlhJWr6Woq9t1B93FdOlWZK6s7CYu?=\n\t=?utf-8?q?Aa5FPSPhHJejyZmdx0sTbcj19cPGqBTmJsAw77jAd5b/d0lONMZEnVmthx/FzSMdn?=\n\t=?utf-8?q?OUUizef8QDtAC06iRr2PFCy+rPLTgK4Z7OHa0Wv+25N4snbZHA1tzm0XrVapj6HSh?=\n\t=?utf-8?q?Y6+4t0FWKqa7BAq1LUIXevV4G2buSY1q911oHXUDOa3CVwa1yFLym8JWrx6y3ON9z?=\n\t=?utf-8?q?IPLHWW9dhzg8R4y/MnchsaUtFzIYawyH5Mpw0lh1hdpAfkldb9uJR6A1BC6KJ/dNO?=\n\t=?utf-8?q?mmJoFY0wysYCNDXckgz0OSe04canJsvauQ+xoNatCkTgEduKhSxTVj53eT1JNK8BD?=\n\t=?utf-8?q?WgS9RMT5EmBM/hSG35NY5pDq7mQHDBPKbIWOmmDXNO2ubVaoLDu2LCcPJLV0D1SR1?=\n\t=?utf-8?q?tFENHrODzv8NeYb59kuM8PoTRiPA9oruGJHV6U+4AJsZSdvITZ/RJnwY84N1kuUhx?=\n\t=?utf-8?q?i1MdYBriCSwzx/K79s37JAPSB1WW+pbRBuA+MzP+s+2EbAFStuPY1CUSVqSupbSvF?=\n\t=?utf-8?q?BGs1o3RMMDjSEw1R7EauSPcA3zOTj7b4VzFluLfB1r6tawCoMl7vSFmvWyfr/oLMl?=\n\t=?utf-8?q?RjUDdTakeqlvitra1HuMvTyxX2k2qimdgwI3o97l7HYkmEtUxELwYZ1zoEYZoAjkY?=\n\t=?utf-8?q?XSSrk3uwm1BLEDTRbWdHdt2myj00L47fY8GYilJVZ5Y7soZpbCSMZamk2xoMnXqae?=\n\t=?utf-8?q?3gwTr/hKGeThpOleGZ5AorrxRTVPL7FXyX+3pSO7MRvzHJ2iAaIWuw6i/ozm108Nf?=\n\t=?utf-8?q?TvpVjiI6aItmThPLnVdVtGHFakjthMYg+bwuY6oWzD4PCrBTD365JjnYZAqOU/yYl?=\n\t=?utf-8?q?9czPn+UHwF9M4EYnK1AgVYVBzC9wRnnN2mcgapVkp3hwBIFKK1u3zPEFZtj9Q5o6c?=\n\t=?utf-8?q?sX9jWYZlnKXST+6o1ri9yTIwdjfCvrfVLTY+Kl+OCS3EPbgID91MnCFrbagJPuGKg?=\n\t=?utf-8?q?NIfKohZ7eNtZewYLqXzOxffc8cl9rxPjHNgt3Zb5TwQxHEvCiXWF4+q1oNOvR4Q3G?=\n\t=?utf-8?q?tPLu+1Tdi793ZP8hvo9KyrS23L+ZK5mHVxcXTjo37LlRSu3p+wI21pXemJHGNxCEX?=\n\t=?utf-8?q?VXd8BgWdEZS3COsBpNuGbU7tB0PuAVKe7w=3D=3D?=", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 3242b31b-c979-48d2-9407-08da5b0863a0", "X-MS-Exchange-CrossTenant-AuthSource": "SJ0PR13MB5545.namprd13.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Internal", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "01 Jul 2022 02:21:21.6774 (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 KRtluFrKWRPL2kHFoyKoUmqKmVBziTm2vXg+MOsS9zy4J9fwGUjmslUMxhghD/9tEH7FQjqZGptKYIPjkxkQezH5rlltJqe9Gu1fRhLwsHQ=", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "BL3PR13MB5107", "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 a Rx and Tx function for the control vNIC. The logic is mostly\nidentical to the normal Rx and Tx functionality of the NFP PMD.\n\nThis commit also makes use of the ctrl vNIC service logic to\nservice the ctrl vNIC Rx path.\n\nSigned-off-by: Chaoyong He <chaoyong.he@corigine.com>\nSigned-off-by: Heinrich Kuhn <heinrich.kuhn@corigine.com>\nReviewed-by: Niklas Söderlund <niklas.soderlund@corigine.com>\n---\n drivers/net/nfp/flower/nfp_flower.c | 15 ++\n drivers/net/nfp/flower/nfp_flower.h | 15 ++\n drivers/net/nfp/flower/nfp_flower_ctrl.c | 248 +++++++++++++++++++++++++++++++\n drivers/net/nfp/flower/nfp_flower_ctrl.h | 13 ++\n drivers/net/nfp/meson.build | 1 +\n 5 files changed, 292 insertions(+)\n create mode 100644 drivers/net/nfp/flower/nfp_flower_ctrl.c\n create mode 100644 drivers/net/nfp/flower/nfp_flower_ctrl.h", "diff": "diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c\nindex 6cdec87..cdaa89a 100644\n--- a/drivers/net/nfp/flower/nfp_flower.c\n+++ b/drivers/net/nfp/flower/nfp_flower.c\n@@ -21,6 +21,7 @@\n #include \"../nfpcore/nfp_nsp.h\"\n #include \"nfp_flower.h\"\n #include \"nfp_flower_ovs_compat.h\"\n+#include \"nfp_flower_ctrl.h\"\n \n #define MAX_PKT_BURST 32\n #define MEMPOOL_CACHE_SIZE 512\n@@ -216,7 +217,21 @@\n \t.link_update = nfp_flower_pf_link_update,\n };\n \n+static int\n+nfp_flower_ctrl_vnic_service(void *arg)\n+{\n+\tstruct nfp_app_flower *app_flower = arg;\n+\n+\tnfp_flower_ctrl_vnic_poll(app_flower);\n+\n+\treturn 0;\n+}\n+\n static struct rte_service_spec flower_services[NFP_FLOWER_SERVICE_MAX] = {\n+\t[NFP_FLOWER_SERVICE_CTRL] = {\n+\t\t.name = \"flower_ctrl_vnic_service\",\n+\t\t.callback = nfp_flower_ctrl_vnic_service,\n+\t},\n };\n \n static int\ndiff --git a/drivers/net/nfp/flower/nfp_flower.h b/drivers/net/nfp/flower/nfp_flower.h\nindex f11ef6d..bdc64e3 100644\n--- a/drivers/net/nfp/flower/nfp_flower.h\n+++ b/drivers/net/nfp/flower/nfp_flower.h\n@@ -7,9 +7,18 @@\n #define _NFP_FLOWER_H_\n \n enum nfp_flower_service {\n+\tNFP_FLOWER_SERVICE_CTRL,\n \tNFP_FLOWER_SERVICE_MAX\n };\n \n+/*\n+ * Flower fallback and ctrl path always adds and removes\n+ * 8 bytes of prepended data. Tx descriptors must point\n+ * to the correct packet data offset after metadata has\n+ * been added\n+ */\n+#define FLOWER_PKT_DATA_OFFSET 8\n+\n /* The flower application's private structure */\n struct nfp_app_flower {\n \t/* List of rte_service ID's for the flower app */\n@@ -29,6 +38,12 @@ struct nfp_app_flower {\n \n \t/* the eth table as reported by firmware */\n \tstruct nfp_eth_table *nfp_eth_table;\n+\n+\t/* Ctrl vNIC Rx counter */\n+\tuint64_t ctrl_vnic_rx_count;\n+\n+\t/* Ctrl vNIC Tx counter */\n+\tuint64_t ctrl_vnic_tx_count;\n };\n \n int nfp_init_app_flower(struct nfp_pf_dev *pf_dev);\ndiff --git a/drivers/net/nfp/flower/nfp_flower_ctrl.c b/drivers/net/nfp/flower/nfp_flower_ctrl.c\nnew file mode 100644\nindex 0000000..100e808\n--- /dev/null\n+++ b/drivers/net/nfp/flower/nfp_flower_ctrl.c\n@@ -0,0 +1,248 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright (c) 2022 Corigine, Inc.\n+ * All rights reserved.\n+ */\n+\n+#include <rte_common.h>\n+#include <ethdev_pci.h>\n+\n+#include \"../nfp_common.h\"\n+#include \"../nfp_logs.h\"\n+#include \"../nfp_ctrl.h\"\n+#include \"../nfp_rxtx.h\"\n+#include \"nfp_flower.h\"\n+#include \"nfp_flower_ctrl.h\"\n+\n+#define MAX_PKT_BURST 32\n+\n+static uint16_t\n+nfp_flower_ctrl_vnic_recv(void *rx_queue,\n+\t\tstruct rte_mbuf **rx_pkts,\n+\t\tuint16_t nb_pkts)\n+{\n+\tstruct nfp_net_rxq *rxq;\n+\tstruct nfp_net_rx_desc *rxds;\n+\tstruct nfp_net_rx_buff *rxb;\n+\tstruct nfp_net_hw *hw;\n+\tstruct rte_mbuf *mb;\n+\tstruct rte_mbuf *new_mb;\n+\tuint64_t dma_addr;\n+\tuint16_t avail = 0;\n+\tuint16_t nb_hold = 0;\n+\n+\trxq = rx_queue;\n+\tif (unlikely(rxq == NULL)) {\n+\t\t/*\n+\t\t * DPDK just checks the queue is lower than max queues\n+\t\t * enabled. But the queue needs to be configured\n+\t\t */\n+\t\tPMD_RX_LOG(ERR, \"RX Bad queue\");\n+\t\treturn -EINVAL;\n+\t}\n+\n+\thw = rxq->hw;\n+\twhile (avail < nb_pkts) {\n+\t\trxb = &rxq->rxbufs[rxq->rd_p];\n+\t\tif (unlikely(rxb == NULL)) {\n+\t\t\tPMD_RX_LOG(ERR, \"rxb does not exist!\");\n+\t\t\tbreak;\n+\t\t}\n+\n+\t\trxds = &rxq->rxds[rxq->rd_p];\n+\t\tif ((rxds->rxd.meta_len_dd & PCIE_DESC_RX_DD) == 0)\n+\t\t\tbreak;\n+\n+\t\t/*\n+\t\t * Memory barrier to ensure that we won't do other\n+\t\t * reads before the DD bit.\n+\t\t */\n+\t\trte_rmb();\n+\n+\t\t/*\n+\t\t * We got a packet. Let's alloc a new mbuf for refilling the\n+\t\t * free descriptor ring as soon as possible\n+\t\t */\n+\t\tnew_mb = rte_pktmbuf_alloc(rxq->mem_pool);\n+\t\tif (unlikely(new_mb == NULL)) {\n+\t\t\tPMD_RX_LOG(ERR,\n+\t\t\t\"RX mbuf alloc failed port_id=%u queue_id=%u\",\n+\t\t\t\trxq->port_id, (unsigned int)rxq->qidx);\n+\t\t\tnfp_net_mbuf_alloc_failed(rxq);\n+\t\t\tbreak;\n+\t\t}\n+\n+\t\tnb_hold++;\n+\n+\t\t/*\n+\t\t * Grab the mbuf and refill the descriptor with the\n+\t\t * previously allocated mbuf\n+\t\t */\n+\t\tmb = rxb->mbuf;\n+\t\trxb->mbuf = new_mb;\n+\n+\t\t/* Size of this segment */\n+\t\tmb->data_len = rxds->rxd.data_len - NFP_DESC_META_LEN(rxds);\n+\t\t/* Size of the whole packet. We just support 1 segment */\n+\t\tmb->pkt_len = mb->data_len;\n+\n+\t\tif (unlikely((mb->data_len + hw->rx_offset) > rxq->mbuf_size)) {\n+\t\t\t/*\n+\t\t\t * This should not happen and the user has the\n+\t\t\t * responsibility of avoiding it. But we have\n+\t\t\t * to give some info about the error\n+\t\t\t */\n+\t\t\tRTE_LOG_DP(ERR, PMD,\n+\t\t\t\t\"mbuf overflow likely due to the RX offset.\\n\"\n+\t\t\t\t\"\\t\\tYour mbuf size should have extra space for\"\n+\t\t\t\t\" RX offset=%u bytes.\\n\"\n+\t\t\t\t\"\\t\\tCurrently you just have %u bytes available\"\n+\t\t\t\t\" but the received packet is %u bytes long\",\n+\t\t\t\thw->rx_offset,\n+\t\t\t\trxq->mbuf_size - hw->rx_offset,\n+\t\t\t\tmb->data_len);\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\n+\t\t/* Filling the received mbuf with packet info */\n+\t\tif (hw->rx_offset)\n+\t\t\tmb->data_off = RTE_PKTMBUF_HEADROOM + hw->rx_offset;\n+\t\telse\n+\t\t\tmb->data_off = RTE_PKTMBUF_HEADROOM + NFP_DESC_META_LEN(rxds);\n+\n+\t\t/* No scatter mode supported */\n+\t\tmb->nb_segs = 1;\n+\t\tmb->next = NULL;\n+\t\tmb->port = rxq->port_id;\n+\n+\t\trx_pkts[avail++] = mb;\n+\n+\t\t/* Now resetting and updating the descriptor */\n+\t\trxds->vals[0] = 0;\n+\t\trxds->vals[1] = 0;\n+\t\tdma_addr = rte_cpu_to_le_64(RTE_MBUF_DMA_ADDR_DEFAULT(new_mb));\n+\t\trxds->fld.dd = 0;\n+\t\trxds->fld.dma_addr_hi = (dma_addr >> 32) & 0xff;\n+\t\trxds->fld.dma_addr_lo = dma_addr & 0xffffffff;\n+\n+\t\trxq->rd_p++;\n+\t\tif (unlikely(rxq->rd_p == rxq->rx_count)) /* wrapping?*/\n+\t\t\trxq->rd_p = 0;\n+\t}\n+\n+\tif (nb_hold == 0)\n+\t\treturn 0;\n+\n+\tnb_hold += rxq->nb_rx_hold;\n+\n+\t/*\n+\t * FL descriptors needs to be written before incrementing the\n+\t * FL queue WR pointer\n+\t */\n+\trte_wmb();\n+\tif (nb_hold >= rxq->rx_free_thresh) {\n+\t\tPMD_RX_LOG(DEBUG, \"port=%hu queue=%d nb_hold=%hu avail=%hu\",\n+\t\t\trxq->port_id, rxq->qidx, nb_hold, avail);\n+\t\tnfp_qcp_ptr_add(rxq->qcp_fl, NFP_QCP_WRITE_PTR, nb_hold);\n+\t\tnb_hold = 0;\n+\t}\n+\n+\trxq->nb_rx_hold = nb_hold;\n+\n+\treturn avail;\n+}\n+\n+uint16_t\n+nfp_flower_ctrl_vnic_xmit(struct nfp_app_flower *app_flower,\n+\t\tstruct rte_mbuf *mbuf)\n+{\n+\tuint64_t dma_addr;\n+\tuint32_t free_descs;\n+\tstruct rte_mbuf **lmbuf;\n+\tstruct nfp_net_txq *txq;\n+\tstruct nfp_net_hw *ctrl_hw;\n+\tstruct rte_eth_dev *ctrl_dev;\n+\tstruct nfp_net_nfd3_tx_desc *txds;\n+\n+\tctrl_hw = app_flower->ctrl_hw;\n+\tctrl_dev = ctrl_hw->eth_dev;\n+\n+\t/* Flower ctrl vNIC only has a single tx queue */\n+\ttxq = ctrl_dev->data->tx_queues[0];\n+\tif (unlikely(txq == NULL)) {\n+\t\t/*\n+\t\t * DPDK just checks the queue is lower than max queues\n+\t\t * enabled. But the queue needs to be configured\n+\t\t */\n+\t\tPMD_TX_LOG(ERROR, \"ctrl dev TX Bad queue\");\n+\t\treturn -EINVAL;\n+\t}\n+\n+\ttxds = &txq->txds[txq->wr_p];\n+\ttxds->vals[0] = 0;\n+\ttxds->vals[1] = 0;\n+\ttxds->vals[2] = 0;\n+\ttxds->vals[3] = 0;\n+\n+\tif (nfp_net_nfd3_txq_full(txq))\n+\t\tnfp_net_tx_free_bufs(txq);\n+\n+\tfree_descs = nfp_net_nfd3_free_tx_desc(txq);\n+\tif (unlikely(free_descs == 0)) {\n+\t\tPMD_TX_LOG(ERROR, \"ctrl dev no free descs\");\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tlmbuf = &txq->txbufs[txq->wr_p].mbuf;\n+\tRTE_MBUF_PREFETCH_TO_FREE(*lmbuf);\n+\tif (*lmbuf)\n+\t\trte_pktmbuf_free_seg(*lmbuf);\n+\n+\t*lmbuf = mbuf;\n+\tdma_addr = rte_mbuf_data_iova(mbuf);\n+\n+\ttxds->data_len = mbuf->pkt_len;\n+\ttxds->dma_len = txds->data_len;\n+\ttxds->dma_addr_hi = (dma_addr >> 32) & 0xff;\n+\ttxds->dma_addr_lo = (dma_addr & 0xffffffff);\n+\ttxds->offset_eop = FLOWER_PKT_DATA_OFFSET | PCIE_DESC_TX_EOP;\n+\n+\ttxq->wr_p++;\n+\tif (unlikely(txq->wr_p == txq->tx_count)) /* wrapping?*/\n+\t\ttxq->wr_p = 0;\n+\n+\trte_wmb();\n+\tnfp_qcp_ptr_add(txq->qcp_q, NFP_QCP_WRITE_PTR, 1);\n+\n+\tapp_flower->ctrl_vnic_tx_count++;\n+\n+\treturn 0;\n+}\n+\n+void\n+nfp_flower_ctrl_vnic_poll(struct nfp_app_flower *app_flower)\n+{\n+\tuint16_t i;\n+\tuint16_t count;\n+\tstruct nfp_net_rxq *rxq;\n+\tstruct nfp_net_hw *ctrl_hw;\n+\tstruct rte_eth_dev *ctrl_eth_dev;\n+\tstruct rte_mbuf *pkts_burst[MAX_PKT_BURST];\n+\n+\tctrl_hw = app_flower->ctrl_hw;\n+\tctrl_eth_dev = ctrl_hw->eth_dev;\n+\n+\t/* ctrl vNIC only has a single Rx queue */\n+\trxq = ctrl_eth_dev->data->rx_queues[0];\n+\tcount = nfp_flower_ctrl_vnic_recv(rxq, pkts_burst, MAX_PKT_BURST);\n+\tif (count > MAX_PKT_BURST) {\n+\t\tPMD_RX_LOG(ERR, \"nfp_net_ctrl_vnic_recv failed!\");\n+\t\treturn;\n+\t}\n+\n+\tif (count) {\n+\t\tapp_flower->ctrl_vnic_rx_count += count;\n+\t\t/* Process cmsgs here, only free for now */\n+\t\tfor (i = 0; i < count; i++)\n+\t\t\trte_pktmbuf_free(pkts_burst[i]);\n+\t}\n+}\ndiff --git a/drivers/net/nfp/flower/nfp_flower_ctrl.h b/drivers/net/nfp/flower/nfp_flower_ctrl.h\nnew file mode 100644\nindex 0000000..74765c9\n--- /dev/null\n+++ b/drivers/net/nfp/flower/nfp_flower_ctrl.h\n@@ -0,0 +1,13 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright (c) 2022 Corigine, Inc.\n+ * All rights reserved.\n+ */\n+\n+#ifndef _NFP_FLOWER_CTRL_H_\n+#define _NFP_FLOWER_CTRL_H_\n+\n+void nfp_flower_ctrl_vnic_poll(struct nfp_app_flower *app_flower);\n+uint16_t nfp_flower_ctrl_vnic_xmit(struct nfp_app_flower *app_flower,\n+\t\tstruct rte_mbuf *mbuf);\n+\n+#endif /* _NFP_FLOWER_CTRL_H_ */\ndiff --git a/drivers/net/nfp/meson.build b/drivers/net/nfp/meson.build\nindex 7ae3115..8710213 100644\n--- a/drivers/net/nfp/meson.build\n+++ b/drivers/net/nfp/meson.build\n@@ -7,6 +7,7 @@ if not is_linux or not dpdk_conf.get('RTE_ARCH_64')\n endif\n sources = files(\n 'flower/nfp_flower.c',\n+ 'flower/nfp_flower_ctrl.c',\n 'nfpcore/nfp_cpp_pcie_ops.c',\n 'nfpcore/nfp_nsp.c',\n 'nfpcore/nfp_cppcore.c',\n", "prefixes": [ "v4", "09/12" ] }