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 10/15] vhost: create descriptor mapping function
Date: Wed, 4 Jul 2018 23:54:33 +0200 [thread overview]
Message-ID: <20180704215438.5579-11-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 | 70 ++++++++++++++++++++++++-------------------
1 file changed, 40 insertions(+), 30 deletions(-)
diff --git a/lib/librte_vhost/virtio_net.c b/lib/librte_vhost/virtio_net.c
index da5a13aad..e3b73c951 100644
--- a/lib/librte_vhost/virtio_net.c
+++ b/lib/librte_vhost/virtio_net.c
@@ -291,6 +291,40 @@ virtio_enqueue_offload(struct rte_mbuf *m_buf, struct virtio_net_hdr *net_hdr)
}
}
+static __rte_always_inline int
+map_one_desc(struct virtio_net *dev, struct vhost_virtqueue *vq,
+ struct buf_vector *buf_vec, uint16_t *vec_idx,
+ uint64_t desc_iova, uint64_t desc_len, uint8_t perm)
+{
+ uint16_t vec_id = *vec_idx;
+
+ while (desc_len) {
+ uint64_t desc_addr;
+ uint64_t desc_chunck_len = desc_len;
+
+ if (unlikely(vec_id >= BUF_VECTOR_MAX))
+ return -1;
+
+ desc_addr = vhost_iova_to_vva(dev, vq,
+ desc_iova,
+ &desc_chunck_len,
+ perm);
+ if (unlikely(!desc_addr))
+ return -1;
+
+ buf_vec[vec_id].buf_iova = desc_iova;
+ buf_vec[vec_id].buf_addr = desc_addr;
+ buf_vec[vec_id].buf_len = desc_chunck_len;
+
+ desc_len -= desc_chunck_len;
+ desc_iova += desc_chunck_len;
+ vec_id++;
+ }
+ *vec_idx = vec_id;
+
+ return 0;
+}
+
static __rte_always_inline int
fill_vec_buf_split(struct virtio_net *dev, struct vhost_virtqueue *vq,
uint32_t avail_idx, uint16_t *vec_idx,
@@ -300,7 +334,7 @@ fill_vec_buf_split(struct virtio_net *dev, struct vhost_virtqueue *vq,
uint16_t idx = vq->avail->ring[avail_idx & (vq->size - 1)];
uint16_t vec_id = *vec_idx;
uint32_t len = 0;
- uint64_t dlen, desc_avail, desc_iova;
+ uint64_t dlen;
struct vring_desc *descs = vq->desc;
struct vring_desc *idesc = NULL;
@@ -337,37 +371,13 @@ fill_vec_buf_split(struct virtio_net *dev, struct vhost_virtqueue *vq,
return -1;
}
-
len += descs[idx].len;
- desc_avail = descs[idx].len;
- desc_iova = descs[idx].addr;
-
- while (desc_avail) {
- uint64_t desc_addr;
- uint64_t desc_chunck_len = desc_avail;
-
- if (unlikely(vec_id >= BUF_VECTOR_MAX)) {
- free_ind_table(idesc);
- return -1;
- }
- desc_addr = vhost_iova_to_vva(dev, vq,
- desc_iova,
- &desc_chunck_len,
- perm);
- if (unlikely(!desc_addr)) {
- free_ind_table(idesc);
- return -1;
- }
-
- buf_vec[vec_id].buf_iova = desc_iova;
- buf_vec[vec_id].buf_addr = desc_addr;
- buf_vec[vec_id].buf_len = desc_chunck_len;
- buf_vec[vec_id].desc_idx = idx;
-
- desc_avail -= desc_chunck_len;
- desc_iova += desc_chunck_len;
- vec_id++;
+ if (unlikely(map_one_desc(dev, vq, buf_vec, &vec_id,
+ descs[idx].addr, descs[idx].len,
+ perm))) {
+ free_ind_table(idesc);
+ return -1;
}
if ((descs[idx].flags & VRING_DESC_F_NEXT) == 0)
--
2.14.4
next prev 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 ` Maxime Coquelin [this message]
2018-07-04 21:54 ` [dpdk-dev] [PATCH v7 11/15] vhost: add vector filling support for packed ring Maxime Coquelin
2018-07-04 21:54 ` [dpdk-dev] [PATCH v7 12/15] vhost: add Rx " 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-11-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).