From: xuan.ding@intel.com
To: maxime.coquelin@redhat.com, chenbo.xia@intel.com
Cc: dev@dpdk.org, jiayu.hu@intel.com, cheng1.jiang@intel.com,
sunil.pai.g@intel.com, liangma@liangbit.com,
Xuan Ding <xuan.ding@intel.com>
Subject: [PATCH v2 2/5] vhost: prepare async for descriptor to mbuf refactoring
Date: Mon, 11 Apr 2022 10:00:29 +0000 [thread overview]
Message-ID: <20220411100032.114434-3-xuan.ding@intel.com> (raw)
In-Reply-To: <20220411100032.114434-1-xuan.ding@intel.com>
From: Xuan Ding <xuan.ding@intel.com>
This patch refactors vhost async enqueue path and dequeue path to use
the same function async_fill_seg() for preparing batch elements,
which simplifies the code without performance degradation.
Signed-off-by: Xuan Ding <xuan.ding@intel.com>
---
lib/vhost/virtio_net.c | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/lib/vhost/virtio_net.c b/lib/vhost/virtio_net.c
index a2d04a1f60..709ff483a3 100644
--- a/lib/vhost/virtio_net.c
+++ b/lib/vhost/virtio_net.c
@@ -997,13 +997,14 @@ async_iter_reset(struct vhost_async *async)
}
static __rte_always_inline int
-async_mbuf_to_desc_seg(struct virtio_net *dev, struct vhost_virtqueue *vq,
+async_fill_seg(struct virtio_net *dev, struct vhost_virtqueue *vq,
struct rte_mbuf *m, uint32_t mbuf_offset,
- uint64_t buf_iova, uint32_t cpy_len)
+ uint64_t buf_iova, uint32_t cpy_len, bool to_desc)
{
struct vhost_async *async = vq->async;
uint64_t mapped_len;
uint32_t buf_offset = 0;
+ void *src, *dst;
void *host_iova;
while (cpy_len) {
@@ -1015,10 +1016,16 @@ async_mbuf_to_desc_seg(struct virtio_net *dev, struct vhost_virtqueue *vq,
return -1;
}
- if (unlikely(async_iter_add_iovec(dev, async,
- (void *)(uintptr_t)rte_pktmbuf_iova_offset(m,
- mbuf_offset),
- host_iova, (size_t)mapped_len)))
+ if (to_desc) {
+ src = (void *)(uintptr_t)rte_pktmbuf_iova_offset(m, mbuf_offset);
+ dst = host_iova;
+ } else {
+ src = host_iova;
+ dst = (void *)(uintptr_t)rte_pktmbuf_iova_offset(m, mbuf_offset);
+ }
+
+ if (unlikely(async_iter_add_iovec(dev, async, src, dst,
+ (size_t)mapped_len)))
return -1;
cpy_len -= (uint32_t)mapped_len;
@@ -1161,8 +1168,8 @@ mbuf_to_desc(struct virtio_net *dev, struct vhost_virtqueue *vq,
cpy_len = RTE_MIN(buf_avail, mbuf_avail);
if (is_async) {
- if (async_mbuf_to_desc_seg(dev, vq, m, mbuf_offset,
- buf_iova + buf_offset, cpy_len) < 0)
+ if (async_fill_seg(dev, vq, m, mbuf_offset,
+ buf_iova + buf_offset, cpy_len, true) < 0)
goto error;
} else {
sync_fill_seg(dev, vq, m, mbuf_offset,
--
2.17.1
next prev parent reply other threads:[~2022-04-11 10:01 UTC|newest]
Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-07 15:25 [PATCH v1 0/5] vhost: support async dequeue data path xuan.ding
2022-04-07 15:25 ` [PATCH v1 1/5] vhost: prepare sync for descriptor to mbuf refactoring xuan.ding
2022-04-07 15:25 ` [PATCH v1 2/5] vhost: prepare async " xuan.ding
2022-04-07 15:25 ` [PATCH v1 3/5] vhost: merge sync and async descriptor to mbuf filling xuan.ding
2022-04-07 15:25 ` [PATCH v1 4/5] vhost: support async dequeue for split ring xuan.ding
2022-04-07 15:25 ` [PATCH v1 5/5] examples/vhost: support async dequeue data path xuan.ding
2022-04-11 10:00 ` [PATCH v2 0/5] vhost: " xuan.ding
2022-04-11 10:00 ` [PATCH v2 1/5] vhost: prepare sync for descriptor to mbuf refactoring xuan.ding
2022-04-11 10:00 ` xuan.ding [this message]
2022-04-11 10:00 ` [PATCH v2 3/5] vhost: merge sync and async descriptor to mbuf filling xuan.ding
2022-04-11 10:00 ` [PATCH v2 4/5] vhost: support async dequeue for split ring xuan.ding
2022-04-11 10:00 ` [PATCH v2 5/5] examples/vhost: support async dequeue data path xuan.ding
2022-04-19 3:43 ` [PATCH v3 0/5] vhost: " xuan.ding
2022-04-19 3:43 ` [PATCH v3 1/5] vhost: prepare sync for descriptor to mbuf refactoring xuan.ding
2022-04-22 15:30 ` Maxime Coquelin
2022-04-19 3:43 ` [PATCH v3 2/5] vhost: prepare async " xuan.ding
2022-04-22 15:32 ` Maxime Coquelin
2022-04-19 3:43 ` [PATCH v3 3/5] vhost: merge sync and async descriptor to mbuf filling xuan.ding
2022-04-22 11:06 ` David Marchand
2022-04-22 15:46 ` Maxime Coquelin
2022-04-24 2:02 ` Ding, Xuan
2022-04-22 15:43 ` Maxime Coquelin
2022-04-19 3:43 ` [PATCH v3 4/5] vhost: support async dequeue for split ring xuan.ding
2022-04-19 3:43 ` [PATCH v3 5/5] examples/vhost: support async dequeue data path xuan.ding
2022-05-05 6:23 ` [PATCH v4 0/5] vhost: " xuan.ding
2022-05-05 6:23 ` [PATCH v4 1/5] vhost: prepare sync for descriptor to mbuf refactoring xuan.ding
2022-05-05 7:37 ` Yang, YvonneX
2022-05-05 6:23 ` [PATCH v4 2/5] vhost: prepare async " xuan.ding
2022-05-05 7:38 ` Yang, YvonneX
2022-05-05 6:23 ` [PATCH v4 3/5] vhost: merge sync and async descriptor to mbuf filling xuan.ding
2022-05-05 7:39 ` Yang, YvonneX
2022-05-05 6:23 ` [PATCH v4 4/5] vhost: support async dequeue for split ring xuan.ding
2022-05-05 7:40 ` Yang, YvonneX
2022-05-05 19:36 ` Maxime Coquelin
2022-05-05 6:23 ` [PATCH v4 5/5] examples/vhost: support async dequeue data path xuan.ding
2022-05-05 7:39 ` Yang, YvonneX
2022-05-05 19:38 ` Maxime Coquelin
2022-05-05 19:52 ` [PATCH v4 0/5] vhost: " Maxime Coquelin
2022-05-06 1:49 ` Ding, Xuan
2022-05-13 2:00 ` [PATCH v5 " xuan.ding
2022-05-13 2:00 ` [PATCH v5 1/5] vhost: prepare sync for descriptor to mbuf refactoring xuan.ding
2022-05-13 2:00 ` [PATCH v5 2/5] vhost: prepare async " xuan.ding
2022-05-13 2:00 ` [PATCH v5 3/5] vhost: merge sync and async descriptor to mbuf filling xuan.ding
2022-05-13 2:00 ` [PATCH v5 4/5] vhost: support async dequeue for split ring xuan.ding
2022-05-13 2:24 ` Stephen Hemminger
2022-05-13 2:33 ` Ding, Xuan
2022-05-13 2:00 ` [PATCH v5 5/5] examples/vhost: support async dequeue data path xuan.ding
2022-05-13 2:50 ` [PATCH v6 0/5] vhost: " xuan.ding
2022-05-13 2:50 ` [PATCH v6 1/5] vhost: prepare sync for descriptor to mbuf refactoring xuan.ding
2022-05-13 2:50 ` [PATCH v6 2/5] vhost: prepare async " xuan.ding
2022-05-13 2:50 ` [PATCH v6 3/5] vhost: merge sync and async descriptor to mbuf filling xuan.ding
2022-05-13 2:50 ` [PATCH v6 4/5] vhost: support async dequeue for split ring xuan.ding
2022-05-13 2:50 ` [PATCH v6 5/5] examples/vhost: support async dequeue data path xuan.ding
2022-05-13 3:27 ` Xia, Chenbo
2022-05-13 3:51 ` Ding, Xuan
2022-05-16 2:43 ` [PATCH v7 0/5] vhost: " xuan.ding
2022-05-16 2:43 ` [PATCH v7 1/5] vhost: prepare sync for descriptor to mbuf refactoring xuan.ding
2022-05-16 2:43 ` [PATCH v7 2/5] vhost: prepare async " xuan.ding
2022-05-16 2:43 ` [PATCH v7 3/5] vhost: merge sync and async descriptor to mbuf filling xuan.ding
2022-05-16 2:43 ` [PATCH v7 4/5] vhost: support async dequeue for split ring xuan.ding
2022-05-16 5:52 ` Hu, Jiayu
2022-05-16 6:10 ` Ding, Xuan
2022-05-16 2:43 ` [PATCH v7 5/5] examples/vhost: support async dequeue data path xuan.ding
2022-05-16 11:10 ` [PATCH v8 0/5] vhost: " xuan.ding
2022-05-16 11:10 ` [PATCH v8 1/5] vhost: prepare sync for descriptor to mbuf refactoring xuan.ding
2022-05-16 11:10 ` [PATCH v8 2/5] vhost: prepare async " xuan.ding
2022-05-16 11:10 ` [PATCH v8 3/5] vhost: merge sync and async descriptor to mbuf filling xuan.ding
2022-05-16 11:10 ` [PATCH v8 4/5] vhost: support async dequeue for split ring xuan.ding
2022-06-16 14:38 ` David Marchand
2022-06-16 14:40 ` David Marchand
2022-06-17 6:34 ` Ding, Xuan
2022-05-16 11:10 ` [PATCH v8 5/5] examples/vhost: support async dequeue data path xuan.ding
2022-05-17 13:22 ` [PATCH v8 0/5] vhost: " 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=20220411100032.114434-3-xuan.ding@intel.com \
--to=xuan.ding@intel.com \
--cc=chenbo.xia@intel.com \
--cc=cheng1.jiang@intel.com \
--cc=dev@dpdk.org \
--cc=jiayu.hu@intel.com \
--cc=liangma@liangbit.com \
--cc=maxime.coquelin@redhat.com \
--cc=sunil.pai.g@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).