Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/132713/?format=api
{ "id": 132713, "url": "http://patchwork.dpdk.org/api/patches/132713/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20231017054545.1692509-24-chaoyong.he@corigine.com/", "project": { "id": 1, "url": "http://patchwork.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": "<20231017054545.1692509-24-chaoyong.he@corigine.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20231017054545.1692509-24-chaoyong.he@corigine.com", "date": "2023-10-17T05:45:43", "name": "[23/25] vdpa/nfp: add the notify related logic", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "82795bddcd73bf6adc27052328d978bb0fae3349", "submitter": { "id": 2554, "url": "http://patchwork.dpdk.org/api/people/2554/?format=api", "name": "Chaoyong He", "email": "chaoyong.he@corigine.com" }, "delegate": { "id": 319, "url": "http://patchwork.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20231017054545.1692509-24-chaoyong.he@corigine.com/mbox/", "series": [ { "id": 29865, "url": "http://patchwork.dpdk.org/api/series/29865/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=29865", "date": "2023-10-17T05:45:20", "name": "add the NFP vDPA PMD", "version": 1, "mbox": "http://patchwork.dpdk.org/series/29865/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/132713/comments/", "check": "warning", "checks": "http://patchwork.dpdk.org/api/patches/132713/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 600EA43186;\n\tTue, 17 Oct 2023 07:49:06 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id C05D142D8C;\n\tTue, 17 Oct 2023 07:47:25 +0200 (CEST)", "from NAM10-MW2-obe.outbound.protection.outlook.com\n (mail-mw2nam10on2116.outbound.protection.outlook.com [40.107.94.116])\n by mails.dpdk.org (Postfix) with ESMTP id 02BBF411F3\n for <dev@dpdk.org>; Tue, 17 Oct 2023 07:47:24 +0200 (CEST)", "from PH0PR13MB5568.namprd13.prod.outlook.com (2603:10b6:510:12b::16)\n by SJ0PR13MB5272.namprd13.prod.outlook.com (2603:10b6:a03:3e3::21)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.46; Tue, 17 Oct\n 2023 05:47:22 +0000", "from PH0PR13MB5568.namprd13.prod.outlook.com\n ([fe80::b070:92e1:931e:fee7]) by PH0PR13MB5568.namprd13.prod.outlook.com\n ([fe80::b070:92e1:931e:fee7%4]) with mapi id 15.20.6863.047; Tue, 17 Oct 2023\n 05:47:22 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=GcBtv7T+HHV4hOkukpbnyP16sHWuHUBBgmp57upfmcZO+R03nq29eFS9Zv6AXosy5p5cln7cpXcmeZP8ho1Qeb/Sn3teme4ppJDvBGQYZUeddWRuie3xmMOMUquwhdoFBKh2DWitZ52BC/2VwFS+zR6AZbKtdPD+eK4p/rmMi8wruiUPO6qtcjnF60sZex+8oRl4isWRM1PzRd7WS4wYzw6V3+LC+krg/HS1qlJ9tIjospesJXWR9gUZgfZUmOPSzaUFa+3rdM3o7YSZ+Q3d95UVamuDkEHg/Clhfv3CcNtnh9+uTW27xnZCeug4+osFmaukP5mGCd1K4Obw/YkTMQ==", "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=QHdqZRcwwr2EzMknT15RVkuNGoH9MZJHCg6KQHJJMcY=;\n b=jeDnIjshmqKCQroMuyciF5SeZw7R49AoB1dD8J1ThtDQSe1yqa5cylZ1hbJYWIzJ15TmeaebtfEL4Xp8/i8BNMFrl8y0Wfs29vFcHZzLLPNSwAODOIirUluHcwoyHavVuKaCuN0p6LDj6xepSS0OJ1pcoWeBlhjFzZQcggKjYQDT3QutPQ6CYNYh3AUFJ3RUtOoSgpuvpSyh/pzCHMhK4v89vrh57FZUwMMEnLaYmZ6Rf+xBTkSXLJFiNl+tY+cq+MMsJuDYJOw8h2S29Srq6ooDxxKGmpCiOhdBy7GQlo5sA1SxVdR5wIbxsEtkuyx9sOwBGHHDZ+OUqNh9aQXxZw==", "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=QHdqZRcwwr2EzMknT15RVkuNGoH9MZJHCg6KQHJJMcY=;\n b=saR7Ki9IR4GF4/a3+AASPrdZQ8Dt1+oUHFPUzscfdlarMBS+JngAqflzGQSvD0aSm1hyn0sjJWleAuKeCi9ydvJxeNwjCqNTLcvhxm00oG0WxnewzsMUui7wcI6Ma+J64cYApeFX1mPnowX1YthpEZQ5GJcyo+5JAfHnUHR6edc=", "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 23/25] vdpa/nfp: add the notify related logic", "Date": "Tue, 17 Oct 2023 13:45:43 +0800", "Message-Id": "<20231017054545.1692509-24-chaoyong.he@corigine.com>", "X-Mailer": "git-send-email 2.39.1", "In-Reply-To": "<20231017054545.1692509-1-chaoyong.he@corigine.com>", "References": "<20231017054545.1692509-1-chaoyong.he@corigine.com>", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-ClientProxiedBy": "PH7PR17CA0069.namprd17.prod.outlook.com\n (2603:10b6:510:325::29) To PH0PR13MB5568.namprd13.prod.outlook.com\n (2603:10b6:510:12b::16)", "MIME-Version": "1.0", "X-MS-PublicTrafficType": "Email", "X-MS-TrafficTypeDiagnostic": "PH0PR13MB5568:EE_|SJ0PR13MB5272:EE_", "X-MS-Office365-Filtering-Correlation-Id": "0ef1a567-1b49-4555-dea8-08dbced48822", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n /N2JzQvzP0jTRu15kaFZUo7Om8990WgJoIjrSEyyvlqc86DvxSBVBihxTtYCp5PVIGAianesFexmVAs7J9KBWxlZvgs3uE1XYx3szuEsH4Wu7PMkU3qcNR7m1cyoUyam/RDhILV/noWT6vvC65gVw7Vb3Nn511ag5yt6xTtxSSGR0a7aF+rjaUzs2IniDKnR8fQpqfz2vCWdzyRtv0cYlB48STUcKtH8U3h51BnjnqnoOey2E+jg3bMcZ7Yk/uGIl9QjtNTVALA0Kh5x33l1FxlyaBvau4PRcog3TbcYmV31Btl0JOoDVKM+Yb7SDBZ6r6F4GXMB19Vv0n10kcr06UZU07EDqDQNyJBBcRIpQkQlzkfVqyh7bCQN6yRj03+EF9Mvlwt7ZeMD49Z11NDB5vcKAnL5GPEO1ptzS5XhX3gUM+HqD81hxp+zD0Xq8bxpCpNJ0gVK1r7CMiYauXWqvLbqHXokObcTwfr40fYVaw1w44rgktJ81uJ2Q7rbZVp3DtnVmcq/AferwdRQFq4H7YAACX8sLlNM9Sd0JJzjXno2ZNiXGJ6cONM/abSlcJ8KXrY6/ySLJgPRxaQVHugIMyWW/fNhD6uMOHbDOLDFmJN2sdS93hTq4/Ayc2pJYfW/27/FbKiiIjll7sPJhfSb7cojrX3PxpUWK6yFmG5mEFo=", "X-Forefront-Antispam-Report": "CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:;\n IPV:NLI; SFV:NSPM; H:PH0PR13MB5568.namprd13.prod.outlook.com; PTR:; CAT:NONE;\n SFS:(13230031)(366004)(136003)(376002)(346002)(396003)(39830400003)(230922051799003)(451199024)(64100799003)(1800799009)(186009)(38350700005)(6916009)(66476007)(6666004)(66556008)(66946007)(6486002)(86362001)(54906003)(2616005)(83380400001)(478600001)(6512007)(38100700002)(316002)(1076003)(52116002)(26005)(107886003)(5660300002)(6506007)(2906002)(4326008)(8676002)(36756003)(44832011)(41300700001)(8936002);\n DIR:OUT; SFP:1102;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "\n eHseghuf3VFhpqh9IDoZ8+h4PPJFkiid5lELB8SyYJQ6xrQYxsZKefZbYPI1vYji6Q6RdLow2PctafSX69uh1ckzN6nRd1Zk/kJVXur+L1lHdU64opF5udLsAIqT0Lp4vKLXSxza5pRQXphQYXZGB1+G9qToK5XmkOWCWf4AdjTQrfr+V48OQgpTn55KEnr0TRckg8yYJmGtx7oXFxejc0L5tZ6IJ1Yqg45rA975hNwsXiyuRKOxuO4OV+LPv8tUHrd1zjVVNcVniWGj+uW0InbzO/OfGhk0/ZfVsNybsZEHPbZQiPLk1+oIZPVS3/PPWdJfYs5e2qNN8JLrXJN4+x/eI3Yekmq1uvyNH4kpghfNiFwt8ii9VUR6C6HUPPOikCbkTcDh9la34u8jNqcGj1gRxS2kJ6ME9UTv2hw7AVOXZVXhE65FrLnR8Cwzp1Spr8c0+IGGv9Qnom3xtFhqTUsxsy9d+kjXk89EwjlNFq8E1uaDbrMvk761NecXjzZVmB5Vk5nqxc9RVyqF0i6SagEivEjJucEZtOfF8WW4+pWa1vxj19fmqdUzP4uCE9z7ecsqmKwkoeKvNRAmR+u4ql16Hxw7il3haW8BPksNs1JlatNsrtnq3jSizOpu/QSt7kjdJ7G053J6CWmxnv5TyKwfI2bZJMnsoVziziLivXMdfuGsUADEcfQQnktN0P6gO9Mw6rlEaBHA3cpX1fcFgoGNqWrkTEwc5EAU/2+9GCS27GBmb3i0MuPyg8ns7s5ENnlEZbEpYRKf5m+wuJCAcuN4yBJ2H9Y52jky82pHXYWldigP4sOPwy7weXPTxqFLq8kKGuzeYUjiiVrO9rKbBp2GscF9K+btlWnXjUn1lhUMAoKQUI0nMDna8OEAaa8HbptgGqS3lXh10mjqB4W92c14pM7ABidhZSQ7dXQfvCj6RMepKfxxs/BPiGD7qNp9LLYZHhMk+H7thpy2sl27ilif/r9oAYA6DdKj1fVDLugAreCrtbT+wM+I3OOWJgAf19VoAfqAHHKPwu7NS/WN17njl7zlcmG8WPCe90gPxAzFc5Gn4bNkRsFDijxUKZbEnRKB+ObLUpZ0EtGt3Ve5npV6rasS9QL+EMeh9OOyCucXfCUxjJMy6xCly5Jg94VIl+VzD9finuBNyuffVYjf1c/1gnwp//2ULJ3gOjU5EVJKF7+Ho+9N/Uip7FyxZCNHMY39lo6fkTK75aiK4ZaZox3zgGvj710fLVy7LaC9oQEs94bFIQKFcLwNCZUWDk9xcTFebl18md0GsN+RsLd47gV/isFKWXqIuSktS21lIE282pdMQOckcGE+G0eTz4tM3wk1qwqfHslQkCYx+HTypKIDzS3cDDrPF0bP0m+NKk3LE3Ft6c4lk5J484nS9VPED89o5Xw5TIU/lpQJD2aepka/eMjAsjP0nl0jauvHQ+AjPPKKheaMEleYsKbGwBEnS8cENRuZ2jB+7kSML79/L+3ZpPpWS9dsZijSXUnZA0qJL+30BCjVPRTycJhLPP0WH4B6lRr3J6wWXikUwCdQrScL7Dt3M8pXwKXVL1w1xzFjUAD37ozR7iHbUsc/TMeAFacGU0YMV7zTgKLsBqv97A==", "X-OriginatorOrg": "corigine.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 0ef1a567-1b49-4555-dea8-08dbced48822", "X-MS-Exchange-CrossTenant-AuthSource": "PH0PR13MB5568.namprd13.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Internal", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "17 Oct 2023 05:47:22.2949 (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 myaW6YelV9JJ4ZnDKZUMEFtRAXBBNMF88NAAt1V6tY54VcPMqSJnLkXyXLN8iYqe81UjDYyMmeZWJ9A1P4DNrtnIqZWIFdPzaeijR1Ri3Kk=", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "SJ0PR13MB5272", "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 465ee4841d..01a59e2cfd 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+\tpthread_t tid; /**< Thread for notify relay */\n+\tint epoll_fd;\n+\n \tint vid;\n \tuint16_t max_queues;\n \tuint32_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 void *\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 NULL;\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 NULL;\n+}\n+\n+static int\n+nfp_vdpa_setup_notify_relay(struct nfp_vdpa_dev *device)\n+{\n+\tint ret;\n+\n+\tret = pthread_create(&device->tid, NULL, nfp_vdpa_notify_relay,\n+\t\t\t(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+\tvoid *status;\n+\n+\tif (device->tid != 0) {\n+\t\tpthread_cancel(device->tid);\n+\t\tpthread_join(device->tid, &status);\n+\t\tdevice->tid = 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@@ -390,11 +537,17 @@ 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\t__atomic_store_n(&device->running, 1, __ATOMIC_RELAXED);\n \t} else if ((__atomic_load_n(&device->running, __ATOMIC_RELAXED) != 0) &&\n \t\t\t((__atomic_load_n(&device->started, __ATOMIC_RELAXED) != 0) ||\n \t\t\t(__atomic_load_n(&device->dev_attached, __ATOMIC_RELAXED) != 0))) {\n \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@@ -411,6 +564,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": [ "23/25" ] }