From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 1A574A00C4;
Sat, 29 Jan 2022 04:10:37 +0100 (CET)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 4D066427EC;
Sat, 29 Jan 2022 04:10:05 +0100 (CET)
Received: from mga04.intel.com (mga04.intel.com [192.55.52.120])
by mails.dpdk.org (Postfix) with ESMTP id 887BC4287B
for <dev@dpdk.org>; Sat, 29 Jan 2022 04:10:03 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple;
d=intel.com; i=@intel.com; q=dns/txt; s=Intel;
t=1643425803; x=1674961803;
h=from:to:cc:subject:date:message-id:in-reply-to: references;
bh=i0R5Ub+qHnRWnY4rzHrKoJ24ilbJCUthpjNuYsiJHm0=;
b=cxg2tKswt1ZHAa8WOkJcmDJwSXxBevmKVX8Y5vjxWJjV4j8biPmqe0/B
iwzQBBtk+48D01FyyGHIcPqLFdXyBc95Y0PUu/Eu8ycMcvSD+bqzAPX3u
YDN6SjGumoMfjnyxZZ/ahyDVqpuRYstk3mKbPwVq5uJ7gP4TgM0Ut5sqX
atE7wbDpgqGRHeSGbAZxM90nED5anTlN1r9Om/QJZC6e+/vIIwMcHudcg
3oarWHJqrYsYKTbTOgCJviTH7tKTLZQdBei8XqeJoLTkJ3qKHzBM4gKFV
SWjXDXHkWeIEOj/ecqJDwxrUrQyXau2uCRqmagj7vz9oiaI21d3tLo7uj g==;
X-IronPort-AV: E=McAfee;i="6200,9189,10241"; a="246076643"
X-IronPort-AV: E=Sophos;i="5.88,325,1635231600"; d="scan'208";a="246076643"
Received: from fmsmga008.fm.intel.com ([10.253.24.58])
by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;
28 Jan 2022 19:10:03 -0800
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.88,325,1635231600"; d="scan'208";a="582047891"
Received: from dpdk-dipei.sh.intel.com ([10.67.111.91])
by fmsmga008.fm.intel.com with ESMTP; 28 Jan 2022 19:10:01 -0800
From: Andy Pei <andy.pei@intel.com>
To: dev@dpdk.org
Cc: chenbo.xia@intel.com, maxime.coquelin@redhat.com, gang.cao@intel.com,
changpeng.liu@intel.com
Subject: [PATCH v3 11/15] vdpa: add config space change interrupt register and
handle for virtio_blk
Date: Sat, 29 Jan 2022 11:03:33 +0800
Message-Id: <1643425417-215270-12-git-send-email-andy.pei@intel.com>
X-Mailer: git-send-email 1.8.3.1
In-Reply-To: <1643425417-215270-1-git-send-email-andy.pei@intel.com>
References: <1643093258-47258-2-git-send-email-andy.pei@intel.com>
<1643425417-215270-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>,
<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>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Create a thread to poll and relay config space change interrupt.
Use VHOST_USER_SLAVE_CONFIG_CHANGE_MSG to info qemu.
Signed-off-by: Andy Pei <andy.pei@intel.com>
---
drivers/vdpa/ifc/ifcvf_vdpa.c | 111 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 111 insertions(+)
diff --git a/drivers/vdpa/ifc/ifcvf_vdpa.c b/drivers/vdpa/ifc/ifcvf_vdpa.c
index 86dd1c6..37fa45e 100644
--- a/drivers/vdpa/ifc/ifcvf_vdpa.c
+++ b/drivers/vdpa/ifc/ifcvf_vdpa.c
@@ -53,7 +53,9 @@ struct ifcvf_internal {
int vfio_group_fd;
int vfio_dev_fd;
pthread_t tid; /* thread for notify relay */
+ pthread_t intr_tid; /* thread for intr relay */
int epfd;
+ int csc_fd;
int vid;
struct rte_vdpa_device *vdev;
uint16_t max_queues;
@@ -617,6 +619,106 @@ struct rte_vdpa_dev_info {
return 0;
}
+static void
+virtio_interrupt_handler(struct ifcvf_internal *internal)
+{
+ int vid = internal->vid;
+ int ret;
+
+ ret = rte_vhost_slave_config_change(vid, 1);
+ if (ret)
+ DRV_LOG(ERR, "failed to notify the guest about configuration space change.");
+}
+
+static void *
+intr_relay(void *arg)
+{
+ struct ifcvf_internal *internal = (struct ifcvf_internal *)arg;
+ struct epoll_event csc_event;
+ struct epoll_event ev;
+ uint64_t buf;
+ int nbytes;
+ int csc_fd, csc_val = 0;
+
+ csc_fd = epoll_create(1);
+ if (csc_fd < 0) {
+ DRV_LOG(ERR, "failed to create epoll for config space change.");
+ return NULL;
+ }
+
+ ev.events = EPOLLIN | EPOLLPRI | EPOLLRDHUP | EPOLLHUP;
+ ev.data.fd = rte_intr_fd_get(internal->pdev->intr_handle);
+ if (epoll_ctl(csc_fd, EPOLL_CTL_ADD,
+ rte_intr_fd_get(internal->pdev->intr_handle), &ev) < 0) {
+ DRV_LOG(ERR, "epoll add error: %s", strerror(errno));
+ return NULL;
+ }
+
+ internal->csc_fd = csc_fd;
+
+ for (;;) {
+ csc_val = epoll_wait(csc_fd, &csc_event, 1, -1);
+ if (csc_val < 0) {
+ if (errno == EINTR)
+ continue;
+ DRV_LOG(ERR, "epoll_wait return fail\n");
+ return NULL;
+ } else if (csc_val == 0) {
+ continue;
+ } else {
+ /* csc_val > 0 */
+ nbytes = read(csc_event.data.fd, &buf, 8);
+ if (nbytes < 0) {
+ if (errno == EINTR || errno == EWOULDBLOCK)
+ continue;
+ DRV_LOG(ERR, "Error reading from file descriptor %d: %s\n",
+ csc_event.data.fd,
+ strerror(errno));
+ return NULL;
+ } else if (nbytes == 0) {
+ DRV_LOG(ERR, "Read nothing from file descriptor %d\n",
+ csc_event.data.fd);
+ continue;
+ } else {
+ virtio_interrupt_handler(internal);
+ }
+ }
+ }
+ return NULL;
+}
+
+static int
+setup_intr_relay(struct ifcvf_internal *internal)
+{
+ int ret;
+
+ ret = pthread_create(&internal->intr_tid, NULL, intr_relay,
+ (void *)internal);
+ if (ret) {
+ DRV_LOG(ERR, "failed to create notify relay pthread.");
+ return -1;
+ }
+ return 0;
+}
+
+static int
+unset_intr_relay(struct ifcvf_internal *internal)
+{
+ void *status;
+
+ if (internal->intr_tid) {
+ pthread_cancel(internal->intr_tid);
+ pthread_join(internal->intr_tid, &status);
+ }
+ internal->intr_tid = 0;
+
+ if (internal->csc_fd >= 0)
+ close(internal->csc_fd);
+ internal->csc_fd = -1;
+
+ return 0;
+}
+
static int
update_datapath(struct ifcvf_internal *internal)
{
@@ -643,10 +745,16 @@ struct rte_vdpa_dev_info {
if (ret)
goto err;
+ ret = setup_intr_relay(internal);
+ if (ret)
+ goto err;
+
rte_atomic32_set(&internal->running, 1);
} else if (rte_atomic32_read(&internal->running) &&
(!rte_atomic32_read(&internal->started) ||
!rte_atomic32_read(&internal->dev_attached))) {
+ ret = unset_intr_relay(internal);
+
ret = unset_notify_relay(internal);
if (ret)
goto err;
@@ -963,6 +1071,9 @@ struct rte_vdpa_dev_info {
vdpa_ifcvf_stop(internal);
else if (internal->device_type == IFCVF_BLK)
vdpa_ifcvf_blk_pause(internal);
+
+ unset_intr_relay(internal);
+
vdpa_disable_vfio_intr(internal);
ret = rte_vhost_host_notifier_ctrl(vid, RTE_VHOST_QUEUE_ALL, false);
--
1.8.3.1