diff mbox series

[04/15] vdpa/ifc: add vdpa interrupt for blk device

Message ID	1643093258-47258-5-git-send-email-andy.pei@intel.com (mailing list archive)
State	Superseded, archived
Delegated to:	Maxime Coquelin
Headers	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 04/15] vdpa/ifc: add vdpa interrupt for blk device Date: Tue, 25 Jan 2022 14:47:27 +0800 Message-Id: <1643093258-47258-5-git-send-email-andy.pei@intel.com> In-Reply-To: <1643093258-47258-1-git-send-email-andy.pei@intel.com> References: <1643093258-47258-1-git-send-email-andy.pei@intel.com> Precedence: list Errors-To: dev-bounces@dpdk.org
Series	add virtio_blk device support to vdpa/ifc \| [00/15] add virtio_blk device support to vdpa/ifc [01/15] vdpa/ifc: add support for virtio blk device [02/15] vhost: add vdpa ops for blk device [03/15] vdpa/ifc: add blk ops for ifc device [04/15] vdpa/ifc: add vdpa interrupt for blk device [05/15] vdpa/ifc: add blk dev sw live migration [06/15] example/vdpa:add vdpa blk support in example [07/15] usertools: add support for virtio blk device [08/15] vdpa/ifc: set_vring_state op is mandatory, add set_vring_state for blk device [09/15] vdpa/ifc: add some log at VDPA lauch before qemu connect [10/15] vdpa/ifc: read virtio max_queues from hardware [11/15] vdpa: add config space change interrupt register and handle for virtio_blk [12/15] vdpa/ifc: add is_blk flag to ifcvf_hw, and init is_blk during probe [13/15] vdpa/ifc/base: for blk device, live migration register is different from net device [14/15] vdpa/ifc: make sure hardware last_avail_idx and last_used_idx is the same when blk device p… [15/15] vhost: make sure each queue callfd is configured

Checks

Context	Check	Description
ci/checkpatch	warning	coding style issues

Commit Message

Pei, Andy Jan. 25, 2022, 6:47 a.m. UTC

  For the blk we need to relay all the cmd of each queue.

Signed-off-by: Andy Pei <andy.pei@intel.com>
---
 drivers/vdpa/ifc/ifcvf_vdpa.c | 48 +++++++++++++++++++++++++++++++++----------
 1 file changed, 37 insertions(+), 11 deletions(-)

diff mbox series

Patch

diff --git a/drivers/vdpa/ifc/ifcvf_vdpa.c b/drivers/vdpa/ifc/ifcvf_vdpa.c
index 965baa2..9729490 100644
--- a/drivers/vdpa/ifc/ifcvf_vdpa.c
+++ b/drivers/vdpa/ifc/ifcvf_vdpa.c
@@ -374,24 +374,50 @@  struct rte_vdpa_dev_info {
 	irq_set->index = VFIO_PCI_MSIX_IRQ_INDEX;
 	irq_set->start = 0;
 	fd_ptr = (int *)&irq_set->data;
+	/* The first interrupt is for the configure space change notification */
 	fd_ptr[RTE_INTR_VEC_ZERO_OFFSET] =
 		rte_intr_fd_get(internal->pdev->intr_handle);
 
 	for (i = 0; i < nr_vring; i++)
 		internal->intr_fd[i] = -1;
 
-	for (i = 0; i < nr_vring; i++) {
-		rte_vhost_get_vhost_vring(internal->vid, i, &vring);
-		fd_ptr[RTE_INTR_VEC_RXTX_OFFSET + i] = vring.callfd;
-		if ((i & 1) == 0 && m_rx == true) {
-			fd = eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC);
-			if (fd < 0) {
-				DRV_LOG(ERR, "can't setup eventfd: %s",
-					strerror(errno));
-				return -1;
+	if (internal->device_type == IFCVF_NET) {
+		for (i = 0; i < nr_vring; i++) {
+			rte_vhost_get_vhost_vring(internal->vid, i, &vring);
+			fd_ptr[RTE_INTR_VEC_RXTX_OFFSET + i] = vring.callfd;
+			if ((i & 1) == 0 && m_rx == true) {
+				/**
+				** For the net we only need to relay rx queue,
+				** which will change the mem of VM.
+				**/
+				fd = eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC);
+				if (fd < 0) {
+					DRV_LOG(ERR, "can't setup eventfd: %s",
+						strerror(errno));
+					return -1;
+				}
+				internal->intr_fd[i] = fd;
+				fd_ptr[RTE_INTR_VEC_RXTX_OFFSET + i] = fd;
+			}
+		}
+	} else if (internal->device_type == IFCVF_BLK) {
+		for (i = 0; i < nr_vring; i++) {
+			rte_vhost_get_vhost_vring(internal->vid, i, &vring);
+			fd_ptr[RTE_INTR_VEC_RXTX_OFFSET + i] = vring.callfd;
+			if (m_rx == true) {
+				/**
+				** For the blk we need to relay all the read cmd
+				** of each queue
+				**/
+				fd = eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC);
+				if (fd < 0) {
+					DRV_LOG(ERR, "can't setup eventfd: %s",
+						strerror(errno));
+					return -1;
+				}
+				internal->intr_fd[i] = fd;
+				fd_ptr[RTE_INTR_VEC_RXTX_OFFSET + i] = fd;
 			}
-			internal->intr_fd[i] = fd;
-			fd_ptr[RTE_INTR_VEC_RXTX_OFFSET + i] = fd;
 		}
 	}