DPDK patches and discussions
 help / color / mirror / Atom feed
From: Chenbo Xia <chenbo.xia@intel.com>
To: dev@dpdk.org
Cc: maxime.coquelin@redhat.com, ferruh.yigit@intel.com,
	xiao.w.wang@intel.com, rosen.xu@intel.com
Subject: [dpdk-dev] [PATCH v1] vdpa/ifc: fix vring update after device config
Date: Fri, 24 Jul 2020 17:09:06 +0000
Message-ID: <20200724170906.13843-1-chenbo.xia@intel.com> (raw)

The device ready state in vhost lib is now defined as the state
that first queue pair is ready. And kick/callfd may be updated
by QEMU when ifc device is configured.

Although now ifc driver only supports one queue pair, it still
has to update callfd when working with QEMU. This patch fixes
this vring update problem by implementing the set_vring_state
callback.

Fixes: a3f8150eac6d (net/ifcvf: add ifcvf vDPA driver)

Suggested-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Signed-off-by: Chenbo Xia <chenbo.xia@intel.com>
Acked-by: Wang Xiao W <xiao.w.wang@intel.com>
---
 drivers/vdpa/ifc/base/ifcvf.h |  1 +
 drivers/vdpa/ifc/ifcvf_vdpa.c | 54 ++++++++++++++++++++++++++++++++++-
 2 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/drivers/vdpa/ifc/base/ifcvf.h b/drivers/vdpa/ifc/base/ifcvf.h
index eb04a9406..a288ce57d 100644
--- a/drivers/vdpa/ifc/base/ifcvf.h
+++ b/drivers/vdpa/ifc/base/ifcvf.h
@@ -115,6 +115,7 @@ struct vring_info {
 	u16 size;
 	u16 last_avail_idx;
 	u16 last_used_idx;
+	bool enable;
 };
 
 struct ifcvf_hw {
diff --git a/drivers/vdpa/ifc/ifcvf_vdpa.c b/drivers/vdpa/ifc/ifcvf_vdpa.c
index a757d45ec..9da25f0c7 100644
--- a/drivers/vdpa/ifc/ifcvf_vdpa.c
+++ b/drivers/vdpa/ifc/ifcvf_vdpa.c
@@ -49,6 +49,7 @@ static const char * const ifcvf_valid_arguments[] = {
 struct ifcvf_internal {
 	struct rte_pci_device *pdev;
 	struct ifcvf_hw hw;
+	int configured;
 	int vfio_container_fd;
 	int vfio_group_fd;
 	int vfio_dev_fd;
@@ -897,6 +898,7 @@ ifcvf_dev_config(int vid)
 		DRV_LOG(NOTICE, "vDPA (%s): software relay is used.",
 				vdev->device->name);
 
+	internal->configured = 1;
 	return 0;
 }
 
@@ -935,6 +937,7 @@ ifcvf_dev_close(int vid)
 		update_datapath(internal);
 	}
 
+	internal->configured = 0;
 	return 0;
 }
 
@@ -1084,13 +1087,61 @@ ifcvf_get_protocol_features(struct rte_vdpa_device *vdev, uint64_t *features)
 	return 0;
 }
 
+static int
+ifcvf_set_vring_state(int vid, int vring, int state)
+{
+	struct rte_vdpa_device *vdev;
+	struct internal_list *list;
+	struct ifcvf_internal *internal;
+	struct ifcvf_hw *hw;
+	struct ifcvf_pci_common_cfg *cfg;
+	int ret = 0;
+
+	vdev = rte_vhost_get_vdpa_device(vid);
+	list = find_internal_resource_by_vdev(vdev);
+	if (list == NULL) {
+		DRV_LOG(ERR, "Invalid vDPA device: %p", vdev);
+		return -1;
+	}
+
+	internal = list->internal;
+	if (vring < 0 || vring >= internal->max_queues * 2) {
+		DRV_LOG(ERR, "Vring index %d not correct", vring);
+		return -1;
+	}
+
+	hw = &internal->hw;
+	if (!internal->configured)
+		goto exit;
+
+	cfg = hw->common_cfg;
+	IFCVF_WRITE_REG16(vring, &cfg->queue_select);
+	IFCVF_WRITE_REG16(state, &cfg->queue_enable);
+
+	if (!state && hw->vring[vring].enable) {
+		ret = vdpa_disable_vfio_intr(internal);
+		if (ret)
+			return ret;
+	}
+
+	if (state && !hw->vring[vring].enable) {
+		ret = vdpa_enable_vfio_intr(internal, 0);
+		if (ret)
+			return ret;
+	}
+
+exit:
+	hw->vring[vring].enable = !!state;
+	return 0;
+}
+
 static struct rte_vdpa_dev_ops ifcvf_ops = {
 	.get_queue_num = ifcvf_get_queue_num,
 	.get_features = ifcvf_get_vdpa_features,
 	.get_protocol_features = ifcvf_get_protocol_features,
 	.dev_conf = ifcvf_dev_config,
 	.dev_close = ifcvf_dev_close,
-	.set_vring_state = NULL,
+	.set_vring_state = ifcvf_set_vring_state,
 	.set_features = ifcvf_set_features,
 	.migration_done = NULL,
 	.get_vfio_group_fd = ifcvf_get_vfio_group_fd,
@@ -1170,6 +1221,7 @@ ifcvf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
 		goto error;
 	}
 
+	internal->configured = 0;
 	internal->max_queues = IFCVF_MAX_QUEUES;
 	features = ifcvf_get_features(&internal->hw);
 	internal->features = (features &
-- 
2.17.1


             reply	other threads:[~2020-07-24  8:19 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-24 17:09 Chenbo Xia [this message]
2020-07-26 13:27 ` Xu, Rosen
2020-07-28  2:35   ` Xia, Chenbo
2020-07-28  3:07     ` Xu, Rosen
2020-07-28 14:32 ` [dpdk-dev] [PATCH v2] " Chenbo Xia
2020-07-28  8:24   ` Wang, Xiao W
2020-07-28  9:05   ` Xu, Rosen
2020-07-28 14:38   ` Maxime Coquelin
2020-07-28 15:56   ` Maxime Coquelin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200724170906.13843-1-chenbo.xia@intel.com \
    --to=chenbo.xia@intel.com \
    --cc=dev@dpdk.org \
    --cc=ferruh.yigit@intel.com \
    --cc=maxime.coquelin@redhat.com \
    --cc=rosen.xu@intel.com \
    --cc=xiao.w.wang@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

DPDK patches and discussions

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://inbox.dpdk.org/dev/0 dev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 dev dev/ https://inbox.dpdk.org/dev \
		dev@dpdk.org
	public-inbox-index dev

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.dev


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git