Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/111684/?format=api
http://patches.dpdk.org/api/patches/111684/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1653360497-18080-13-git-send-email-andy.pei@intel.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": "<1653360497-18080-13-git-send-email-andy.pei@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1653360497-18080-13-git-send-email-andy.pei@intel.com", "date": "2022-05-24T02:48:16", "name": "[v10,12/13] vdpa/ifc: add interrupt handling for config space", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "6688cbcbd807c1fae811653394a74c4c62629779", "submitter": { "id": 1185, "url": "http://patches.dpdk.org/api/people/1185/?format=api", "name": "Pei, Andy", "email": "andy.pei@intel.com" }, "delegate": { "id": 2642, "url": "http://patches.dpdk.org/api/users/2642/?format=api", "username": "mcoquelin", "first_name": "Maxime", "last_name": "Coquelin", "email": "maxime.coquelin@redhat.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1653360497-18080-13-git-send-email-andy.pei@intel.com/mbox/", "series": [ { "id": 23108, "url": "http://patches.dpdk.org/api/series/23108/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=23108", "date": "2022-05-24T02:48:04", "name": "add virtio_blk device support to vdpa/ifc", "version": 10, "mbox": "http://patches.dpdk.org/series/23108/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/111684/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/111684/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 1BBE8A04FF;\n\tTue, 24 May 2022 05:36:41 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 3026E42B91;\n\tTue, 24 May 2022 05:35:58 +0200 (CEST)", "from mga14.intel.com (mga14.intel.com [192.55.52.115])\n by mails.dpdk.org (Postfix) with ESMTP id B40ED42B8A\n for <dev@dpdk.org>; Tue, 24 May 2022 05:35:56 +0200 (CEST)", "from orsmga005.jf.intel.com ([10.7.209.41])\n by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 23 May 2022 20:35:51 -0700", "from dpdk-dipei.sh.intel.com ([10.67.110.238])\n by orsmga005.jf.intel.com with ESMTP; 23 May 2022 20:35:49 -0700" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1653363356; x=1684899356;\n h=from:to:cc:subject:date:message-id:in-reply-to: references;\n bh=xhs2FkaARdzH0xgEqtriMy2SFfvMPDlW1YlSl4KKR+k=;\n b=l9sWtwqr1TUG0VgQEFqNWpkRlFmGKPfsHI80n41u1Ea8UfGwKRhcunuh\n 5OgIOMvkdm9smr9RMuzTZNJtzZkUqNcsgJGLmgShbJL+Rg2UQ6Hjd1VZL\n lTQ5zobqPyZtv4kBmUCsAbog+02Y7T4fIXgHpWd+s2V7L2rV5vKaWg2bJ\n byMwcxhTh8FZW63ImJkXiP+U+D07MdKflDFnXrxihziMw5jRKVE15j3Ty\n wfl4nJO5oSj7YVh9f7pobC3yBzj4+cbrplfH25NsTp4nMrjrm0wLse5ul\n 8We+dk7kgOm1qHyYbuM6TF1yU7JCDLAQoPMWxszfKYjKTJAV3cKifFodO A==;", "X-IronPort-AV": [ "E=McAfee;i=\"6400,9594,10356\"; a=\"273533721\"", "E=Sophos;i=\"5.91,247,1647327600\"; d=\"scan'208\";a=\"273533721\"", "E=Sophos;i=\"5.91,247,1647327600\"; d=\"scan'208\";a=\"745047059\"" ], "X-ExtLoop1": "1", "From": "Andy Pei <andy.pei@intel.com>", "To": "dev@dpdk.org", "Cc": "chenbo.xia@intel.com, maxime.coquelin@redhat.com, gang.cao@intel.com,\n changpeng.liu@intel.com, rosen.xu@intel.com, qimaix.xiao@intel.com", "Subject": "[PATCH v10 12/13] vdpa/ifc: add interrupt handling for config space", "Date": "Tue, 24 May 2022 10:48:16 +0800", "Message-Id": "<1653360497-18080-13-git-send-email-andy.pei@intel.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1653360497-18080-1-git-send-email-andy.pei@intel.com>", "References": "<1643093258-47258-2-git-send-email-andy.pei@intel.com>\n <1653360497-18080-1-git-send-email-andy.pei@intel.com>", "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": "Create a thread to poll and relay config space change interrupt.\nUse VHOST_USER_SLAVE_CONFIG_CHANGE_MSG to inform QEMU.\n\nSigned-off-by: Andy Pei <andy.pei@intel.com>\nReviewed-by: Chenbo Xia <chenbo.xia@intel.com>\n---\n drivers/vdpa/ifc/ifcvf_vdpa.c | 121 +++++++++++++++++++++++++++++++++++++++++-\n 1 file changed, 120 insertions(+), 1 deletion(-)", "diff": "diff --git a/drivers/vdpa/ifc/ifcvf_vdpa.c b/drivers/vdpa/ifc/ifcvf_vdpa.c\nindex 30850b0..40a18b2 100644\n--- a/drivers/vdpa/ifc/ifcvf_vdpa.c\n+++ b/drivers/vdpa/ifc/ifcvf_vdpa.c\n@@ -53,7 +53,9 @@ struct ifcvf_internal {\n \tint vfio_group_fd;\n \tint vfio_dev_fd;\n \tpthread_t tid;\t/* thread for notify relay */\n+\tpthread_t intr_tid; /* thread for config space change interrupt relay */\n \tint epfd;\n+\tint csc_epfd;\n \tint vid;\n \tstruct rte_vdpa_device *vdev;\n \tuint16_t max_queues;\n@@ -566,6 +568,114 @@ struct rte_vdpa_dev_info {\n \treturn 0;\n }\n \n+static void\n+virtio_interrupt_handler(struct ifcvf_internal *internal)\n+{\n+\tint vid = internal->vid;\n+\tint ret;\n+\n+\tret = rte_vhost_slave_config_change(vid, 1);\n+\tif (ret)\n+\t\tDRV_LOG(ERR, \"failed to notify the guest about configuration space change.\");\n+}\n+\n+static void *\n+intr_relay(void *arg)\n+{\n+\tstruct ifcvf_internal *internal = (struct ifcvf_internal *)arg;\n+\tstruct epoll_event csc_event;\n+\tstruct epoll_event ev;\n+\tuint64_t buf;\n+\tint nbytes;\n+\tint csc_epfd, csc_val = 0;\n+\n+\tcsc_epfd = epoll_create(1);\n+\tif (csc_epfd < 0) {\n+\t\tDRV_LOG(ERR, \"failed to create epoll for config space change.\");\n+\t\treturn NULL;\n+\t}\n+\n+\tev.events = EPOLLIN | EPOLLPRI | EPOLLRDHUP | EPOLLHUP;\n+\tev.data.fd = rte_intr_fd_get(internal->pdev->intr_handle);\n+\tif (epoll_ctl(csc_epfd, EPOLL_CTL_ADD,\n+\t\trte_intr_fd_get(internal->pdev->intr_handle), &ev) < 0) {\n+\t\tDRV_LOG(ERR, \"epoll add error: %s\", strerror(errno));\n+\t\tgoto out;\n+\t}\n+\n+\tinternal->csc_epfd = csc_epfd;\n+\n+\tfor (;;) {\n+\t\tcsc_val = epoll_wait(csc_epfd, &csc_event, 1, -1);\n+\t\tif (csc_val < 0) {\n+\t\t\tif (errno == EINTR)\n+\t\t\t\tcontinue;\n+\t\t\tDRV_LOG(ERR, \"epoll_wait return fail.\");\n+\t\t\tgoto out;\n+\t\t} else if (csc_val == 0) {\n+\t\t\tcontinue;\n+\t\t} else {\n+\t\t\t/* csc_val > 0 */\n+\t\t\tnbytes = read(csc_event.data.fd, &buf, 8);\n+\t\t\tif (nbytes < 0) {\n+\t\t\t\tif (errno == EINTR ||\n+\t\t\t\t errno == EWOULDBLOCK ||\n+\t\t\t\t errno == EAGAIN)\n+\t\t\t\t\tcontinue;\n+\t\t\t\tDRV_LOG(ERR, \"Error reading from file descriptor %d: %s\\n\",\n+\t\t\t\t\tcsc_event.data.fd,\n+\t\t\t\t\tstrerror(errno));\n+\t\t\t\tgoto out;\n+\t\t\t} else if (nbytes == 0) {\n+\t\t\t\tDRV_LOG(ERR, \"Read nothing from file descriptor %d\\n\",\n+\t\t\t\t\tcsc_event.data.fd);\n+\t\t\t\tcontinue;\n+\t\t\t} else {\n+\t\t\t\tvirtio_interrupt_handler(internal);\n+\t\t\t}\n+\t\t}\n+\t}\n+\n+out:\n+\tif (csc_epfd >= 0)\n+\t\tclose(csc_epfd);\n+\tinternal->csc_epfd = -1;\n+\n+\treturn NULL;\n+}\n+\n+static int\n+setup_intr_relay(struct ifcvf_internal *internal)\n+{\n+\tchar name[THREAD_NAME_LEN];\n+\tint ret;\n+\n+\tsnprintf(name, sizeof(name), \"ifc-intr-%d\", internal->vid);\n+\tret = rte_ctrl_thread_create(&internal->intr_tid, name, NULL,\n+\t\t\t\t intr_relay, (void *)internal);\n+\tif (ret) {\n+\t\tDRV_LOG(ERR, \"failed to create notify relay pthread.\");\n+\t\treturn -1;\n+\t}\n+\treturn 0;\n+}\n+\n+static void\n+unset_intr_relay(struct ifcvf_internal *internal)\n+{\n+\tvoid *status;\n+\n+\tif (internal->intr_tid) {\n+\t\tpthread_cancel(internal->intr_tid);\n+\t\tpthread_join(internal->intr_tid, &status);\n+\t}\n+\tinternal->intr_tid = 0;\n+\n+\tif (internal->csc_epfd >= 0)\n+\t\tclose(internal->csc_epfd);\n+\tinternal->csc_epfd = -1;\n+}\n+\n static int\n update_datapath(struct ifcvf_internal *internal)\n {\n@@ -592,10 +702,16 @@ struct rte_vdpa_dev_info {\n \t\tif (ret)\n \t\t\tgoto err;\n \n+\t\tret = setup_intr_relay(internal);\n+\t\tif (ret)\n+\t\t\tgoto err;\n+\n \t\trte_atomic32_set(&internal->running, 1);\n \t} else if (rte_atomic32_read(&internal->running) &&\n \t\t (!rte_atomic32_read(&internal->started) ||\n \t\t !rte_atomic32_read(&internal->dev_attached))) {\n+\t\tunset_intr_relay(internal);\n+\n \t\tret = unset_notify_relay(internal);\n \t\tif (ret)\n \t\t\tgoto err;\n@@ -812,7 +928,7 @@ struct rte_vdpa_dev_info {\n \t\tif (nfds < 0) {\n \t\t\tif (errno == EINTR)\n \t\t\t\tcontinue;\n-\t\t\tDRV_LOG(ERR, \"epoll_wait return fail\\n\");\n+\t\t\tDRV_LOG(ERR, \"epoll_wait return fail.\");\n \t\t\treturn NULL;\n \t\t}\n \n@@ -888,6 +1004,9 @@ struct rte_vdpa_dev_info {\n \t/* stop the direct IO data path */\n \tunset_notify_relay(internal);\n \tvdpa_ifcvf_stop(internal);\n+\n+\tunset_intr_relay(internal);\n+\n \tvdpa_disable_vfio_intr(internal);\n \n \tret = rte_vhost_host_notifier_ctrl(vid, RTE_VHOST_QUEUE_ALL, false);\n", "prefixes": [ "v10", "12/13" ] }{ "id": 111684, "url": "