DPDK patches and discussions
 help / color / mirror / Atom feed
From: Jin Yu <jin.yu@intel.com>
To: dev@dpdk.org
Cc: changpeng.liu@intel.com, maxime.coquelin@redhat.com,
	tiwei.bie@intel.com, zhihong.wang@intel.com,
	Jin Yu <jin.yu@intel.com>, Lin Li <lilin24@baidu.com>,
	Xun Ni <nixun@baidu.com>, Yu Zhang <zhangyu31@baidu.com>
Subject: [dpdk-dev] [PATCH v10 8/9] vhost: add vring functions packed ring support
Date: Thu, 10 Oct 2019 04:37:45 +0800	[thread overview]
Message-ID: <20191009203746.64933-9-jin.yu@intel.com> (raw)
In-Reply-To: <20191009203746.64933-1-jin.yu@intel.com>

This patch add packed ring support in two APIs
so user can get the packed ring`.

Signed-off-by: Lin Li <lilin24@baidu.com>
Signed-off-by: Xun Ni <nixun@baidu.com>
Signed-off-by: Yu Zhang <zhangyu31@baidu.com>
Signed-off-by: Jin Yu <jin.yu@intel.com>
---
 lib/librte_vhost/vhost.c | 68 +++++++++++++++++++++++++++++-----------
 1 file changed, 49 insertions(+), 19 deletions(-)

diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c
index f7ed37261..fd3445207 100644
--- a/lib/librte_vhost/vhost.c
+++ b/lib/librte_vhost/vhost.c
@@ -771,9 +771,15 @@ rte_vhost_get_vhost_vring(int vid, uint16_t vring_idx,
 	if (!vq)
 		return -1;
 
-	vring->desc  = vq->desc;
-	vring->avail = vq->avail;
-	vring->used  = vq->used;
+	if (vq_is_packed(dev)) {
+		vring->desc_packed = vq->desc_packed;
+		vring->driver_event = vq->driver_event;
+		vring->device_event = vq->device_event;
+	} else {
+		vring->desc = vq->desc;
+		vring->avail = vq->avail;
+		vring->used = vq->used;
+	}
 	vring->log_guest_addr  = vq->log_guest_addr;
 
 	vring->callfd  = vq->callfd;
@@ -1274,13 +1280,51 @@ int rte_vhost_get_log_base(int vid, uint64_t *log_base,
 int rte_vhost_get_vring_base(int vid, uint16_t queue_id,
 		uint16_t *last_avail_idx, uint16_t *last_used_idx)
 {
+	struct vhost_virtqueue *vq;
 	struct virtio_net *dev = get_device(vid);
 
 	if (dev == NULL || last_avail_idx == NULL || last_used_idx == NULL)
 		return -1;
 
-	*last_avail_idx = dev->virtqueue[queue_id]->last_avail_idx;
-	*last_used_idx = dev->virtqueue[queue_id]->last_used_idx;
+	vq = dev->virtqueue[queue_id];
+	if (!vq)
+		return -1;
+
+	if (vq_is_packed(dev)) {
+		*last_avail_idx = (vq->avail_wrap_counter << 15) |
+				  vq->last_avail_idx;
+		*last_used_idx = (vq->used_wrap_counter << 15) |
+				 vq->last_used_idx;
+	} else {
+		*last_avail_idx = vq->last_avail_idx;
+		*last_used_idx = vq->last_used_idx;
+	}
+
+	return 0;
+}
+
+int rte_vhost_set_vring_base(int vid, uint16_t queue_id,
+		uint16_t last_avail_idx, uint16_t last_used_idx)
+{
+	struct vhost_virtqueue *vq;
+	struct virtio_net *dev = get_device(vid);
+
+	if (!dev)
+		return -1;
+
+	vq = dev->virtqueue[queue_id];
+	if (!vq)
+		return -1;
+
+	if (vq_is_packed(dev)) {
+		vq->last_avail_idx = last_avail_idx & 0x7fff;
+		vq->avail_wrap_counter = !!(last_avail_idx & (1 << 15));
+		vq->last_used_idx = last_used_idx & 0x7fff;
+		vq->used_wrap_counter = !!(last_used_idx & (1 << 15));
+	} else {
+		vq->last_avail_idx = last_avail_idx;
+		vq->last_used_idx = last_used_idx;
+	}
 
 	return 0;
 }
@@ -1311,20 +1355,6 @@ rte_vhost_get_vring_base_from_inflight(int vid,
 	return 0;
 }
 
-int rte_vhost_set_vring_base(int vid, uint16_t queue_id,
-		uint16_t last_avail_idx, uint16_t last_used_idx)
-{
-	struct virtio_net *dev = get_device(vid);
-
-	if (!dev)
-		return -1;
-
-	dev->virtqueue[queue_id]->last_avail_idx = last_avail_idx;
-	dev->virtqueue[queue_id]->last_used_idx = last_used_idx;
-
-	return 0;
-}
-
 int rte_vhost_extern_callback_register(int vid,
 		struct rte_vhost_user_extern_ops const * const ops, void *ctx)
 {
-- 
2.17.2


  parent reply	other threads:[~2019-10-09 12:56 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20191008153341.22228>
2019-10-09 15:25 ` [dpdk-dev] [PATCH v10 0/9] vhost: support inflight share memory protocol feature Jin Yu
2019-10-09 15:25   ` [dpdk-dev] [PATCH v10 1/9] vhost: add the inflight description Jin Yu
2019-10-09 15:25   ` [dpdk-dev] [PATCH v10 2/9] vhost: add packed ring Jin Yu
2019-10-09 15:25   ` [dpdk-dev] [PATCH v10 3/9] vhost: add the inflight structure Jin Yu
2019-10-09 15:25   ` [dpdk-dev] [PATCH v10 4/9] vhost: add two new messages to support a shared buffer Jin Yu
2019-10-09 15:25   ` [dpdk-dev] [PATCH v10 5/9] vhost: checkout the resubmit inflight information Jin Yu
2019-10-09 15:25   ` [dpdk-dev] [PATCH v10 6/9] vhost: add the APIs to operate inflight ring Jin Yu
2019-10-09 15:25   ` [dpdk-dev] [PATCH v10 7/9] vhost: add APIs for user getting " Jin Yu
2019-10-09 15:25   ` [dpdk-dev] [PATCH v10 8/9] vhost: add vring functions packed ring support Jin Yu
2019-10-09 15:25   ` [dpdk-dev] [PATCH v10 9/9] vhost: add vhost-user-blk example which support inflight Jin Yu
2019-10-09 20:37 ` [dpdk-dev] [PATCH v10 0/9] vhost: support inflight share memory protocol feature Jin Yu
2019-10-09 20:37   ` [dpdk-dev] [PATCH v10 1/9] vhost: add the inflight description Jin Yu
2019-10-09 20:37   ` [dpdk-dev] [PATCH v10 2/9] vhost: add packed ring Jin Yu
2019-10-09 20:37   ` [dpdk-dev] [PATCH v10 3/9] vhost: add the inflight structure Jin Yu
2019-10-09 20:37   ` [dpdk-dev] [PATCH v10 4/9] vhost: add two new messages to support a shared buffer Jin Yu
2019-10-09 20:37   ` [dpdk-dev] [PATCH v10 5/9] vhost: checkout the resubmit inflight information Jin Yu
2019-10-09 20:37   ` [dpdk-dev] [PATCH v10 6/9] vhost: add the APIs to operate inflight ring Jin Yu
2019-10-09 20:37   ` [dpdk-dev] [PATCH v10 7/9] vhost: add APIs for user getting " Jin Yu
2019-10-09 20:37   ` Jin Yu [this message]
2019-10-09 20:37   ` [dpdk-dev] [PATCH v10 9/9] vhost: add vhost-user-blk example which support inflight Jin Yu

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=20191009203746.64933-9-jin.yu@intel.com \
    --to=jin.yu@intel.com \
    --cc=changpeng.liu@intel.com \
    --cc=dev@dpdk.org \
    --cc=lilin24@baidu.com \
    --cc=maxime.coquelin@redhat.com \
    --cc=nixun@baidu.com \
    --cc=tiwei.bie@intel.com \
    --cc=zhangyu31@baidu.com \
    --cc=zhihong.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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).