Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/133466/?format=api
{ "id": 133466, "url": "http://patches.dpdk.org/api/patches/133466/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20231027030001.602639-24-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": "<20231027030001.602639-24-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20231027030001.602639-24-chaoyong.he@corigine.com", "date": "2023-10-27T03:00:00", "name": "[v4,23/24] vdpa/nfp: add notify related logic", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "004ad005d2eb8747c67e783f61f9d207ef6fe190", "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/20231027030001.602639-24-chaoyong.he@corigine.com/mbox/", "series": [ { "id": 30016, "url": "http://patches.dpdk.org/api/series/30016/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=30016", "date": "2023-10-27T02:59:37", "name": "add the NFP vDPA PMD", "version": 4, "mbox": "http://patches.dpdk.org/series/30016/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/133466/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/133466/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 084B74320F;\n\tFri, 27 Oct 2023 05:04:33 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 6722442DD5;\n\tFri, 27 Oct 2023 05:01:33 +0200 (CEST)", "from NAM04-DM6-obe.outbound.protection.outlook.com\n (mail-dm6nam04on2113.outbound.protection.outlook.com [40.107.102.113])\n by mails.dpdk.org (Postfix) with ESMTP id DDC7042E51\n for <dev@dpdk.org>; Fri, 27 Oct 2023 05:01:11 +0200 (CEST)", "from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5)\n by SA0PR13MB4048.namprd13.prod.outlook.com (2603:10b6:806:97::13)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.24; Fri, 27 Oct\n 2023 03:01:10 +0000", "from SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::45b3:d83c:cff2:4a1b]) by SJ0PR13MB5545.namprd13.prod.outlook.com\n ([fe80::45b3:d83c:cff2:4a1b%6]) with mapi id 15.20.6933.022; Fri, 27 Oct 2023\n 03:01:10 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=Y9KP9gQWcpw0SI5MaAovmxzBvF0ZZwKmP2Rsf0oGAlTW7ylSH1EGNV84rQo7otRXuTryDq3yS/QpLCpu4uDvHb5y/ZvM8n6he/qSzZpBSFUhATWBnUpVbQy/dn3LciHrbdFIjxO0R4bvY3IG/5fOxRXCU4bDQkF/XrAv0U84vxlDxdfRHSUPGEywXzuLaVmXpEuImJoDvyY00z/DCeuR55IVKofgUp+gYFO5tXPePa188RkjWd+rSXoxB08Q8SCmfEqrCbDxpKQkz8Soo5mtC7wsBMNswhHHtGptsIe4kH++XQgB9PRJHznJUOUzSFpneapNZZ2jGmH+LwGkHX8Xtw==", "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=ryKbXT0+zGsepovFoMDfP0PMZv9uiMyFPOahvyKtraI=;\n b=P+PqEBYNWWMetUvPhxgN9IWZspthAbGmnZqyDThbC194D8nFZ7DQAfZDe18NYjeorNFUdog+76j4aRGcflr5Z8FDHPYMF79Kc6OOOpgtpAc/Kt6BySXGr/b1sAJL5HxDcF2XG7kORRr6xGO8GLjomkmk7P0I4oZb0oKN1TkQDzzkOtRO31R8ObXj7iR1juU4tp5c97N4Wlna4meLuP2glazzVaCyZqbX/4Xx8zIbHRAK+xBFMdAGmNLb3Xgdspliw9Qci63nxLoFfqxy/rpG10btSBjHYHfro1BCFYIShfmUZR7ZZwPLBZXCsIwWUL0i4F2v5wP/d8KT9Tay/mSvTg==", "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=ryKbXT0+zGsepovFoMDfP0PMZv9uiMyFPOahvyKtraI=;\n b=FhBTOawZLjkb+MBYee07OvZHBWgIZT0HwKhBmm7X4VynbPY7gd9wdjoqiTm7YbDkS0ZxwTcpDT021uEKKb7Jr8w9jc7PvYxyXowFQNMw+fIQkp43QtzmL/uswqn57cb9JUdSpK0KyQGS/vU6YELIKClisZJy4K/zBU0rA2O0PL4=", "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, Chaoyong He <chaoyong.he@corigine.com>,\n Shujing Dong <shujing.dong@corigine.com>, Long Wu <long.wu@corigine.com>,\n Peng Zhang <peng.zhang@corigine.com>", "Subject": "[PATCH v4 23/24] vdpa/nfp: add notify related logic", "Date": "Fri, 27 Oct 2023 11:00:00 +0800", "Message-Id": "<20231027030001.602639-24-chaoyong.he@corigine.com>", "X-Mailer": "git-send-email 2.39.1", "In-Reply-To": "<20231027030001.602639-1-chaoyong.he@corigine.com>", "References": "<20231026064324.177531-1-chaoyong.he@corigine.com>\n <20231027030001.602639-1-chaoyong.he@corigine.com>", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-ClientProxiedBy": "BYAPR08CA0065.namprd08.prod.outlook.com\n (2603:10b6:a03:117::42) 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_|SA0PR13MB4048:EE_", "X-MS-Office365-Filtering-Correlation-Id": "7c9fa44a-ae8a-47a1-246b-08dbd698f8c3", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n 8K42t/uHTcItMWmKbgWoKm472wWEBUS3NW/Hy66rMU4cjH58Y7QqThRYfiJ6JWe4+4p9RX6boy00OGoS8om8TChu7kW+68OWv6ctg6J6+jmD5bsA3YpQgoLfYOgNuK9aIAUbivyYlkad7Dizgs7SbVEihEgLJNcj6oEscRhChGvS7FjXCVLyMpASSRPoO0NymysrAIeveIiguNKE/rr2EBVO8bxwGASj3heENuszPRqt4UamHsJ9LgBBqzOD7z8xw1k5B+WE3/29aD3elMz903M/F56USydS0RbA33OVNTWwWLXYfm8CAX8YTkq+DXD9uIwrzIdD2T/6YZxOtvqqlM8K1KA9cm93iEvpItVSmJogN7gY4wBy4oi50of+Klo9q2LihAwe2dQJQ1JnBI+1fxejrMIdR97fByrpfovWenB76pSTmtkXAf9DgX2FwyU5biK804CRJY/Ju2wGHMwOHaHRcRumvk020dUEc8qg9ReD2IzzSWJIHDkJdJuSpc+CeGFaAHk/R+ft66Mjb61KGqNgQ1ewJ5wwPatiXgQ3OdPiY3WsDIX/0h651JO9iVgjunWPZv15EjyTNp9oCdPm3SzKqjYyNnYouKxoAfmaB9DHj2MRjwvrm1gb4fBjQKsBGb346FXjpMbPezbFsnfTQjIdd6WhdcKbi6KNviznOyA=", "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:(13230031)(376002)(396003)(39840400004)(366004)(346002)(136003)(230922051799003)(64100799003)(186009)(1800799009)(451199024)(6512007)(6666004)(52116002)(6506007)(6486002)(86362001)(36756003)(478600001)(38100700002)(2906002)(6916009)(41300700001)(83380400001)(1076003)(107886003)(26005)(2616005)(38350700005)(66946007)(316002)(66556008)(66476007)(4326008)(8936002)(8676002)(44832011)(5660300002)(54906003);\n DIR:OUT; SFP:1102;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "\n 4WmGlN31H5qIjV8PU+XE57Xd+1qkUZ6E1+OLMch7oInD296o7jZ5YLF57mXGGFMPBm4ARIPJWfbCOKvVXiwbh248qenPdEId2vXaOgvF0Z1SzAe3ll6cCoARwFs4XcLZ+Z9UA/cWYMeNalKrIkCCzTSHDee63jdrOqiACXBCEGkWksRsp4TtU3ZOI/JGDsz5YWcSDhWIX+ug+n7qXnzsWzxBc73vqpcFbB7b7W5NnDdzearjXG7lrZBpYrLvlfxot9B3FXyUbbynanGYC7CbMOnKTYi4ZiOjeyY2rVGuX0tNba4NHfuf533t2Xqaf0GPqRN4+ScbIRW4jXxYZJjjhI4qx3D/IaMegj0KJuRzL7IpuA31DepSpUyuGdOhP5m7ctKd6PHa4CMth2ueRhxhjfuUiebknpdmtg4mPqt22M2jUf/JOw1a9NwzTHH6wngpmj0jlmuosjvR4k9wnyecJcwpk1F9pTOomp7vxpsqKCDcVKhOljdX3Vx/VdXMtyyOYr5xQxfCjzOoV2C4WV0kaWDwzpvSOS5IW7E7wyUpjfaEsNtKpkrZVugDSBNEPOZmykYKMhKHwUQcyRSzUV8inLPvru8ultmhJt7Cj7VQQSWidHxQLi8HuNcuXTVrL9tgoxJf/w/5dprD0DfhWXmd/a97fiWYXRWPD0ozhy4MFFSVJjx9qqtGYr1GMqSB1nHJphWiE3wtik0nJRkbl1muHn5vdy2SYxqsXJSA5CU7hRP6hm5TW6ysNvTcOJrDIyf4+npx2UUeKehCuXHGlfun6MztkiFB0n0yKIGJS5F3NqQY1PmcxpJr960AHY+/jSDPQptsn6ntH+W9PbgVswWBAzWxbH12FhRG8M7wzhM8spC12ird3BlPq+AZgIZ4/93txjp9m+1iERCRMjtn3hRYra70Vjqdsp3sxPbZChHdeSQ0K0HMoQa8woVCs5rRk7gqBqyAY5N86oJhEyJmQbzMD6orDBoUgqSqgJx4jpjUwzumOvTWkjNxnmjH+8aPCdBg1HsjGK6oaIXeUQRtb8MHP2x2czMZ/oOJfT036r99ZGNu8EiOP0JRRRh01rMudy6bpun3KjXkzLQP7Dws6vyban0czD2wvop2zgk4sLdh+pBIDOcCPOg58WDXCOYymE7y4B5bBgf7QD/NrLPHTJPR4nDtO3kcQQ0J5a2MtkAve+vmNkpmRyhJS4sdYVQPyVoOmMhKtZcY0FCv3HHLw0V0rTQRZDnrtmGHLoArmnp4Tndtoy5XYoZ4RzHBFKavQUf8G/PdGKExu0xx7IeU6a3nR9T7HMqewca8JIu4u2HxCclR9YT2DAhT+gn27zyc8YlZWIpuDM7qf/g4skWqqzZI4ReMk/FoGB89kIsolJnUitIrV4qMOriQvyu4RXZ3QeMgtguvR6E13eWCy0eELSVPh96kJwIC2/zaSeW990Q2aYU7ctlz8dsuorwvZL730B88perF8dpMo4d3fe651GWlMVuO6yV6vozvgYwsKWvcOhpalZC5C+zvyXBsc1Kq8nq+ftsSeJOD0TeLb0VyajDp4eUR1feALIU1aFq9OE4jZgqkwn0DaxhY3NTieHAmOPTAn85guKv5puzglIK4OdxNoA==", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 7c9fa44a-ae8a-47a1-246b-08dbd698f8c3", "X-MS-Exchange-CrossTenant-AuthSource": "SJ0PR13MB5545.namprd13.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Internal", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "27 Oct 2023 03:01:10.3535 (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 hfIDqAuBDAPHeWJbFyjeMj/EXe1CuWaKcmb44orzF3tKRjcVV1lsdBfWeWObFQbSpa8dogxMiUQrczTForsUrf1Ii22CBVTq4woP3uZdjoM=", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "SA0PR13MB4048", "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 logic to process vDPA notify relay.\n\nSigned-off-by: Chaoyong He <chaoyong.he@corigine.com>\nSigned-off-by: Shujing Dong <shujing.dong@corigine.com>\nReviewed-by: Long Wu <long.wu@corigine.com>\nReviewed-by: Peng Zhang <peng.zhang@corigine.com>\n---\n drivers/vdpa/nfp/nfp_vdpa.c | 155 +++++++++++++++++++++++++++++++\n drivers/vdpa/nfp/nfp_vdpa_core.c | 61 ++++++++++++\n drivers/vdpa/nfp/nfp_vdpa_core.h | 4 +\n 3 files changed, 220 insertions(+)", "diff": "diff --git a/drivers/vdpa/nfp/nfp_vdpa.c b/drivers/vdpa/nfp/nfp_vdpa.c\nindex 04dd29092b..c104588663 100644\n--- a/drivers/vdpa/nfp/nfp_vdpa.c\n+++ b/drivers/vdpa/nfp/nfp_vdpa.c\n@@ -4,7 +4,9 @@\n */\n \n #include <pthread.h>\n+#include <sys/epoll.h>\n #include <sys/ioctl.h>\n+#include <unistd.h>\n \n #include <nfp_common_pci.h>\n #include <nfp_dev.h>\n@@ -29,6 +31,9 @@ struct nfp_vdpa_dev {\n \tint vfio_dev_fd;\n \tint iommu_group;\n \n+\trte_thread_t tid; /**< Thread for notify relay */\n+\tint epoll_fd;\n+\n \tint vid;\n \tuint16_t max_queues;\n \tRTE_ATOMIC(uint32_t) started;\n@@ -368,6 +373,148 @@ nfp_vdpa_disable_vfio_intr(struct nfp_vdpa_dev *device)\n \treturn 0;\n }\n \n+static void\n+nfp_vdpa_read_kickfd(int kickfd)\n+{\n+\tint bytes;\n+\tuint64_t buf;\n+\n+\tfor (;;) {\n+\t\tbytes = read(kickfd, &buf, 8);\n+\t\tif (bytes >= 0)\n+\t\t\tbreak;\n+\n+\t\tif (errno != EINTR && errno != EWOULDBLOCK &&\n+\t\t\t\terrno != EAGAIN) {\n+\t\t\tDRV_VDPA_LOG(ERR, \"Error reading kickfd\");\n+\t\t\tbreak;\n+\t\t}\n+\t}\n+}\n+\n+static int\n+nfp_vdpa_notify_epoll_ctl(uint32_t queue_num,\n+\t\tstruct nfp_vdpa_dev *device)\n+{\n+\tint ret;\n+\tuint32_t qid;\n+\n+\tfor (qid = 0; qid < queue_num; qid++) {\n+\t\tstruct epoll_event ev;\n+\t\tstruct rte_vhost_vring vring;\n+\n+\t\tev.events = EPOLLIN | EPOLLPRI;\n+\t\trte_vhost_get_vhost_vring(device->vid, qid, &vring);\n+\t\tev.data.u64 = qid | (uint64_t)vring.kickfd << 32;\n+\t\tret = epoll_ctl(device->epoll_fd, EPOLL_CTL_ADD, vring.kickfd, &ev);\n+\t\tif (ret < 0) {\n+\t\t\tDRV_VDPA_LOG(ERR, \"Epoll add error for queue %d\", qid);\n+\t\t\treturn ret;\n+\t\t}\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static int\n+nfp_vdpa_notify_epoll_wait(uint32_t queue_num,\n+\t\tstruct nfp_vdpa_dev *device)\n+{\n+\tint i;\n+\tint fds;\n+\tint kickfd;\n+\tuint32_t qid;\n+\tstruct epoll_event events[NFP_VDPA_MAX_QUEUES * 2];\n+\n+\tfor (;;) {\n+\t\tfds = epoll_wait(device->epoll_fd, events, queue_num, -1);\n+\t\tif (fds < 0) {\n+\t\t\tif (errno == EINTR)\n+\t\t\t\tcontinue;\n+\n+\t\t\tDRV_VDPA_LOG(ERR, \"Epoll wait fail\");\n+\t\t\treturn -EACCES;\n+\t\t}\n+\n+\t\tfor (i = 0; i < fds; i++) {\n+\t\t\tqid = events[i].data.u32;\n+\t\t\tkickfd = (uint32_t)(events[i].data.u64 >> 32);\n+\n+\t\t\tnfp_vdpa_read_kickfd(kickfd);\n+\t\t\tnfp_vdpa_notify_queue(&device->hw, qid);\n+\t\t}\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static uint32_t\n+nfp_vdpa_notify_relay(void *arg)\n+{\n+\tint ret;\n+\tint epoll_fd;\n+\tuint32_t queue_num;\n+\tstruct nfp_vdpa_dev *device = arg;\n+\n+\tepoll_fd = epoll_create(NFP_VDPA_MAX_QUEUES * 2);\n+\tif (epoll_fd < 0) {\n+\t\tDRV_VDPA_LOG(ERR, \"failed to create epoll instance.\");\n+\t\treturn 1;\n+\t}\n+\n+\tdevice->epoll_fd = epoll_fd;\n+\n+\tqueue_num = rte_vhost_get_vring_num(device->vid);\n+\n+\tret = nfp_vdpa_notify_epoll_ctl(queue_num, device);\n+\tif (ret != 0)\n+\t\tgoto notify_exit;\n+\n+\tret = nfp_vdpa_notify_epoll_wait(queue_num, device);\n+\tif (ret != 0)\n+\t\tgoto notify_exit;\n+\n+\treturn 0;\n+\n+notify_exit:\n+\tclose(device->epoll_fd);\n+\tdevice->epoll_fd = -1;\n+\n+\treturn 1;\n+}\n+\n+static int\n+nfp_vdpa_setup_notify_relay(struct nfp_vdpa_dev *device)\n+{\n+\tint ret;\n+\tchar name[RTE_THREAD_INTERNAL_NAME_SIZE];\n+\n+\tsnprintf(name, sizeof(name), \"nfp-noti%d\", device->vid);\n+\tret = rte_thread_create_internal_control(&device->tid, name,\n+\t\t\tnfp_vdpa_notify_relay, (void *)device);\n+\tif (ret != 0) {\n+\t\tDRV_VDPA_LOG(ERR, \"Failed to create notify relay pthread.\");\n+\t\treturn -1;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static void\n+nfp_vdpa_unset_notify_relay(struct nfp_vdpa_dev *device)\n+{\n+\tif (device->tid.opaque_id != 0) {\n+\t\tpthread_cancel((pthread_t)device->tid.opaque_id);\n+\t\trte_thread_join(device->tid, NULL);\n+\t\tdevice->tid.opaque_id = 0;\n+\t}\n+\n+\tif (device->epoll_fd >= 0) {\n+\t\tclose(device->epoll_fd);\n+\t\tdevice->epoll_fd = -1;\n+\t}\n+}\n+\n static int\n update_datapath(struct nfp_vdpa_dev *device)\n {\n@@ -392,12 +539,18 @@ update_datapath(struct nfp_vdpa_dev *device)\n \t\tif (ret != 0)\n \t\t\tgoto disable_vfio_intr;\n \n+\t\tret = nfp_vdpa_setup_notify_relay(device);\n+\t\tif (ret != 0)\n+\t\t\tgoto vdpa_stop;\n+\n \t\trte_atomic_store_explicit(&device->running, 1, rte_memory_order_relaxed);\n \t} else if ((rte_atomic_load_explicit(&device->running, rte_memory_order_relaxed) != 0) &&\n \t\t\t((rte_atomic_load_explicit(&device->started,\n \t\t\t\t\trte_memory_order_relaxed) != 0) ||\n \t\t\t(rte_atomic_load_explicit(&device->dev_attached,\n \t\t\t\t\trte_memory_order_relaxed) != 0))) {\n+\t\tnfp_vdpa_unset_notify_relay(device);\n+\n \t\tnfp_vdpa_stop(device);\n \n \t\tret = nfp_vdpa_disable_vfio_intr(device);\n@@ -414,6 +567,8 @@ update_datapath(struct nfp_vdpa_dev *device)\n \trte_spinlock_unlock(&device->lock);\n \treturn 0;\n \n+vdpa_stop:\n+\tnfp_vdpa_stop(device);\n disable_vfio_intr:\n \tnfp_vdpa_disable_vfio_intr(device);\n dma_map_rollback:\ndiff --git a/drivers/vdpa/nfp/nfp_vdpa_core.c b/drivers/vdpa/nfp/nfp_vdpa_core.c\nindex db9b8462b4..e2a6253ae5 100644\n--- a/drivers/vdpa/nfp/nfp_vdpa_core.c\n+++ b/drivers/vdpa/nfp/nfp_vdpa_core.c\n@@ -15,6 +15,41 @@\n #define VIRTIO_F_IN_ORDER 35\n #endif\n \n+#define NFP_QCP_NOTIFY_MAX_ADD 0x7f\n+\n+enum nfp_qcp_notify_ptr {\n+\tNFP_QCP_NOTIFY_WRITE_PTR = 0,\n+\tNFP_QCP_NOTIFY_READ_PTR\n+};\n+\n+/**\n+ * Add the value to the selected pointer of a queue\n+ *\n+ * @param queue\n+ * Base address for queue structure\n+ * @param ptr\n+ * Add to the Read or Write pointer\n+ * @param val\n+ * Value to add to the queue pointer\n+ */\n+static inline void\n+nfp_qcp_notify_ptr_add(uint8_t *q,\n+\t\tenum nfp_qcp_notify_ptr ptr,\n+\t\tuint32_t val)\n+{\n+\tuint32_t off;\n+\n+\tif (ptr == NFP_QCP_NOTIFY_WRITE_PTR)\n+\t\toff = NFP_QCP_QUEUE_ADD_RPTR;\n+\telse\n+\t\toff = NFP_QCP_QUEUE_ADD_WPTR;\n+\n+\tfor (; val > NFP_QCP_NOTIFY_MAX_ADD; val -= NFP_QCP_NOTIFY_MAX_ADD)\n+\t\tnn_writel(rte_cpu_to_le_32(NFP_QCP_NOTIFY_MAX_ADD), q + off);\n+\n+\tnn_writel(rte_cpu_to_le_32(val), q + off);\n+}\n+\n int\n nfp_vdpa_hw_init(struct nfp_vdpa_hw *vdpa_hw,\n \t\tstruct rte_pci_device *pci_dev)\n@@ -130,3 +165,29 @@ nfp_vdpa_hw_stop(struct nfp_vdpa_hw *vdpa_hw)\n {\n \tnfp_disable_queues(&vdpa_hw->super);\n }\n+\n+/*\n+ * This offset is used for mmaping the notify area. It implies it needs\n+ * to be a multiple of PAGE_SIZE.\n+ * For debugging, using notify region 0 with an offset of 4K. This should\n+ * point to the conf bar.\n+ */\n+uint64_t\n+nfp_vdpa_get_queue_notify_offset(struct nfp_vdpa_hw *vdpa_hw __rte_unused,\n+\t\tint qid)\n+{\n+\treturn NFP_VDPA_NOTIFY_ADDR_BASE + (qid * NFP_VDPA_NOTIFY_ADDR_INTERVAL);\n+}\n+\n+/*\n+ * With just one queue the increment is 0, which does not\n+ * incremente the counter but will raise a queue event due\n+ * to queue configured for watermark events.\n+ */\n+void\n+nfp_vdpa_notify_queue(struct nfp_vdpa_hw *vdpa_hw,\n+\t\tuint16_t qid)\n+{\n+\tnfp_qcp_notify_ptr_add(vdpa_hw->notify_addr[qid],\n+\t\t\tNFP_QCP_NOTIFY_WRITE_PTR, qid);\n+}\ndiff --git a/drivers/vdpa/nfp/nfp_vdpa_core.h b/drivers/vdpa/nfp/nfp_vdpa_core.h\nindex a88de768dd..a8e0d6dd70 100644\n--- a/drivers/vdpa/nfp/nfp_vdpa_core.h\n+++ b/drivers/vdpa/nfp/nfp_vdpa_core.h\n@@ -44,4 +44,8 @@ int nfp_vdpa_hw_start(struct nfp_vdpa_hw *vdpa_hw, int vid);\n \n void nfp_vdpa_hw_stop(struct nfp_vdpa_hw *vdpa_hw);\n \n+void nfp_vdpa_notify_queue(struct nfp_vdpa_hw *vdpa_hw, uint16_t qid);\n+\n+uint64_t nfp_vdpa_get_queue_notify_offset(struct nfp_vdpa_hw *vdpa_hw, int qid);\n+\n #endif /* __NFP_VDPA_CORE_H__ */\n", "prefixes": [ "v4", "23/24" ] }