DPDK patches and discussions
 help / color / mirror / Atom feed
From: Maxime Coquelin <maxime.coquelin@redhat.com>
To: tiwei.bie@intel.com, zhihong.wang@intel.com,
	jfreimann@redhat.com, dev@dpdk.org
Cc: mst@redhat.com, jasowang@redhat.com, wexu@redhat.com,
	Maxime Coquelin <maxime.coquelin@redhat.com>
Subject: [dpdk-dev] [PATCH v7 11/15] vhost: add vector filling support for packed ring
Date: Wed,  4 Jul 2018 23:54:34 +0200	[thread overview]
Message-ID: <20180704215438.5579-12-maxime.coquelin@redhat.com> (raw)
In-Reply-To: <20180704215438.5579-1-maxime.coquelin@redhat.com>

Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
 lib/librte_vhost/virtio_net.c | 111 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 111 insertions(+)

diff --git a/lib/librte_vhost/virtio_net.c b/lib/librte_vhost/virtio_net.c
index e3b73c951..1a04df807 100644
--- a/lib/librte_vhost/virtio_net.c
+++ b/lib/librte_vhost/virtio_net.c
@@ -450,6 +450,117 @@ reserve_avail_buf_split(struct virtio_net *dev, struct vhost_virtqueue *vq,
 	return 0;
 }
 
+static __rte_always_inline int
+fill_vec_buf_packed_indirect(struct virtio_net *dev,
+			struct vhost_virtqueue *vq,
+			struct vring_desc_packed *desc, uint16_t *vec_idx,
+			struct buf_vector *buf_vec, uint16_t *len, uint8_t perm)
+{
+	uint16_t i;
+	uint32_t nr_descs;
+	uint16_t vec_id = *vec_idx;
+	uint64_t dlen;
+	struct vring_desc_packed *descs, *idescs = NULL;
+
+	dlen = desc->len;
+	descs = (struct vring_desc_packed *)(uintptr_t)
+		vhost_iova_to_vva(dev, vq, desc->addr, &dlen, VHOST_ACCESS_RO);
+	if (unlikely(!descs))
+		return -1;
+
+	if (unlikely(dlen < desc->len)) {
+		/*
+		 * The indirect desc table is not contiguous
+		 * in process VA space, we have to copy it.
+		 */
+		idescs = alloc_copy_ind_table(dev, vq, desc->addr, desc->len);
+		if (unlikely(!idescs))
+			return -1;
+
+		descs = idescs;
+	}
+
+	nr_descs =  desc->len / sizeof(struct vring_desc_packed);
+	if (unlikely(nr_descs >= vq->size)) {
+		free_ind_table(idescs);
+		return -1;
+	}
+
+	for (i = 0; i < nr_descs; i++) {
+		if (unlikely(vec_id >= BUF_VECTOR_MAX)) {
+			free_ind_table(idescs);
+			return -1;
+		}
+
+		*len += descs[i].len;
+		if (unlikely(map_one_desc(dev, vq, buf_vec, &vec_id,
+						descs[i].addr, descs[i].len,
+						perm)))
+			return -1;
+	}
+	*vec_idx = vec_id;
+
+	if (unlikely(!!idescs))
+		free_ind_table(idescs);
+
+	return 0;
+}
+
+static inline int
+fill_vec_buf_packed(struct virtio_net *dev, struct vhost_virtqueue *vq,
+				uint16_t avail_idx, uint16_t *desc_count,
+				struct buf_vector *buf_vec, uint16_t *vec_idx,
+				uint16_t *buf_id, uint16_t *len, uint8_t perm)
+{
+	bool wrap_counter = vq->avail_wrap_counter;
+	struct vring_desc_packed *descs = vq->desc_packed;
+	uint16_t vec_id = *vec_idx;
+
+	if (avail_idx < vq->last_avail_idx)
+		wrap_counter ^= 1;
+
+	if (unlikely(!desc_is_avail(&descs[avail_idx], wrap_counter)))
+		return -1;
+
+	*desc_count = 0;
+
+	while (1) {
+		if (unlikely(vec_id >= BUF_VECTOR_MAX))
+			return -1;
+
+		*desc_count += 1;
+		*buf_id = descs[avail_idx].index;
+
+		if (descs[avail_idx].flags & VRING_DESC_F_INDIRECT) {
+			if (unlikely(fill_vec_buf_packed_indirect(dev, vq,
+							&descs[avail_idx],
+							&vec_id, buf_vec,
+							len, perm) < 0))
+				return -1;
+		} else {
+			*len += descs[avail_idx].len;
+
+			if (unlikely(map_one_desc(dev, vq, buf_vec, &vec_id,
+							descs[avail_idx].addr,
+							descs[avail_idx].len,
+							perm)))
+				return -1;
+		}
+
+		if ((descs[avail_idx].flags & VRING_DESC_F_NEXT) == 0)
+			break;
+
+		if (++avail_idx >= vq->size) {
+			avail_idx -= vq->size;
+			wrap_counter ^= 1;
+		}
+	}
+
+	*vec_idx = vec_id;
+
+	return 0;
+}
+
 static __rte_always_inline int
 copy_mbuf_to_desc(struct virtio_net *dev, struct vhost_virtqueue *vq,
 			    struct rte_mbuf *m, struct buf_vector *buf_vec,
-- 
2.14.4

  parent reply	other threads:[~2018-07-04 21:55 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-04 21:54 [dpdk-dev] [PATCH v7 00/15] Vhost: add support to packed ring layout Maxime Coquelin
2018-07-04 21:54 ` [dpdk-dev] [PATCH v7 01/15] vhost: add virtio packed virtqueue defines Maxime Coquelin
2018-07-04 21:54 ` [dpdk-dev] [PATCH v7 02/15] vhost: add helpers for packed virtqueues Maxime Coquelin
2018-07-04 21:54 ` [dpdk-dev] [PATCH v7 03/15] vhost: vring address setup for packed queues Maxime Coquelin
2018-07-04 21:54 ` [dpdk-dev] [PATCH v7 04/15] vhost: clear shadow used table index at flush time Maxime Coquelin
2018-07-04 21:54 ` [dpdk-dev] [PATCH v7 05/15] vhost: make indirect desc table copy desc type agnostic Maxime Coquelin
2018-07-04 21:54 ` [dpdk-dev] [PATCH v7 06/15] vhost: clear batch copy index at copy time Maxime Coquelin
2018-07-04 21:54 ` [dpdk-dev] [PATCH v7 07/15] vhost: extract split ring handling from Rx and Tx functions Maxime Coquelin
2018-07-04 21:54 ` [dpdk-dev] [PATCH v7 08/15] vhost: append shadow used ring function names with split Maxime Coquelin
2018-07-04 21:54 ` [dpdk-dev] [PATCH v7 09/15] vhost: add shadow used ring support for packed rings Maxime Coquelin
2018-07-05  7:15   ` Tiwei Bie
2018-07-05 12:49     ` Maxime Coquelin
2018-07-05 14:03       ` Tiwei Bie
2018-07-05 14:28         ` Maxime Coquelin
2018-07-05 14:36           ` Tiwei Bie
2018-07-04 21:54 ` [dpdk-dev] [PATCH v7 10/15] vhost: create descriptor mapping function Maxime Coquelin
2018-07-04 21:54 ` Maxime Coquelin [this message]
2018-07-04 21:54 ` [dpdk-dev] [PATCH v7 12/15] vhost: add Rx support for packed ring Maxime Coquelin
2018-07-04 21:54 ` [dpdk-dev] [PATCH v7 13/15] vhost: add Tx " Maxime Coquelin
2018-07-04 21:54 ` [dpdk-dev] [PATCH v7 14/15] vhost: add notification " Maxime Coquelin
2018-07-05  5:12   ` Tiwei Bie
2018-07-05  7:20     ` Maxime Coquelin
2018-07-04 21:54 ` [dpdk-dev] [PATCH v7 15/15] vhost: advertize packed ring layout support 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=20180704215438.5579-12-maxime.coquelin@redhat.com \
    --to=maxime.coquelin@redhat.com \
    --cc=dev@dpdk.org \
    --cc=jasowang@redhat.com \
    --cc=jfreimann@redhat.com \
    --cc=mst@redhat.com \
    --cc=tiwei.bie@intel.com \
    --cc=wexu@redhat.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).