From: Maxime Coquelin <maxime.coquelin@redhat.com>
To: dev@dpdk.org, chenbo.xia@intel.com, jiayu.hu@intel.com,
yuanx.wang@intel.com, wenwux.ma@intel.com,
bruce.richardson@intel.com, john.mcnamara@intel.com
Cc: Maxime Coquelin <maxime.coquelin@redhat.com>
Subject: [dpdk-dev] [PATCH v2 04/15] vhost: simplify async IO vectors iterators
Date: Tue, 26 Oct 2021 18:28:53 +0200 [thread overview]
Message-ID: <20211026162904.482987-5-maxime.coquelin@redhat.com> (raw)
In-Reply-To: <20211026162904.482987-1-maxime.coquelin@redhat.com>
This patch splits the iterator arrays in two, one for
source and one for destination. The goal is make the code
easier to understand.
Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
lib/vhost/vhost.h | 5 +++--
lib/vhost/virtio_net.c | 24 ++++++++++++------------
2 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/lib/vhost/vhost.h b/lib/vhost/vhost.h
index 686f468eff..132c1b070e 100644
--- a/lib/vhost/vhost.h
+++ b/lib/vhost/vhost.h
@@ -48,7 +48,7 @@
#define MAX_PKT_BURST 32
-#define VHOST_MAX_ASYNC_IT (MAX_PKT_BURST * 2)
+#define VHOST_MAX_ASYNC_IT (MAX_PKT_BURST)
#define VHOST_MAX_ASYNC_VEC (BUF_VECTOR_MAX * 2)
#define PACKED_DESC_ENQUEUE_USED_FLAG(w) \
@@ -132,7 +132,8 @@ struct vhost_async {
/* operation callbacks for DMA */
struct rte_vhost_async_channel_ops ops;
- struct rte_vhost_iov_iter it_pool[VHOST_MAX_ASYNC_IT];
+ struct rte_vhost_iov_iter src_iov_iter[VHOST_MAX_ASYNC_IT];
+ struct rte_vhost_iov_iter dst_iov_iter[VHOST_MAX_ASYNC_IT];
struct iovec src_iovec[VHOST_MAX_ASYNC_VEC];
struct iovec dst_iovec[VHOST_MAX_ASYNC_VEC];
diff --git a/lib/vhost/virtio_net.c b/lib/vhost/virtio_net.c
index 2a243701c0..f0d923704a 100644
--- a/lib/vhost/virtio_net.c
+++ b/lib/vhost/virtio_net.c
@@ -1511,7 +1511,8 @@ virtio_dev_rx_async_submit_split(struct virtio_net *dev,
uint16_t avail_head;
struct vhost_async *async = vq->async;
- struct rte_vhost_iov_iter *it_pool = async->it_pool;
+ struct rte_vhost_iov_iter *src_iter = async->src_iov_iter;
+ struct rte_vhost_iov_iter *dst_iter = async->dst_iov_iter;
struct rte_vhost_async_desc tdes[MAX_PKT_BURST];
struct iovec *src_iovec = async->src_iovec;
struct iovec *dst_iovec = async->dst_iovec;
@@ -1547,20 +1548,19 @@ virtio_dev_rx_async_submit_split(struct virtio_net *dev,
if (async_mbuf_to_desc(dev, vq, pkts[pkt_idx], buf_vec, nr_vec, num_buffers,
&src_iovec[iovec_idx], &dst_iovec[iovec_idx],
- &it_pool[it_idx], &it_pool[it_idx + 1]) < 0) {
+ &src_iter[it_idx], &dst_iter[it_idx]) < 0) {
vq->shadow_used_idx -= num_buffers;
break;
}
- async_fill_desc(&tdes[pkt_burst_idx++], &it_pool[it_idx],
- &it_pool[it_idx + 1]);
+ async_fill_desc(&tdes[pkt_burst_idx++], &src_iter[it_idx], &dst_iter[it_idx]);
slot_idx = (async->pkts_idx + pkt_idx) & (vq->size - 1);
pkts_info[slot_idx].descs = num_buffers;
pkts_info[slot_idx].mbuf = pkts[pkt_idx];
- iovec_idx += it_pool[it_idx].nr_segs;
- it_idx += 2;
+ iovec_idx += src_iter[it_idx].nr_segs;
+ it_idx++;
vq->last_avail_idx += num_buffers;
@@ -1829,7 +1829,8 @@ virtio_dev_rx_async_submit_packed(struct virtio_net *dev,
uint16_t num_descs;
struct vhost_async *async = vq->async;
- struct rte_vhost_iov_iter *it_pool = async->it_pool;
+ struct rte_vhost_iov_iter *src_iter = async->src_iov_iter;
+ struct rte_vhost_iov_iter *dst_iter = async->dst_iov_iter;
struct rte_vhost_async_desc tdes[MAX_PKT_BURST];
struct iovec *src_iovec = async->src_iovec;
struct iovec *dst_iovec = async->dst_iovec;
@@ -1846,18 +1847,17 @@ virtio_dev_rx_async_submit_packed(struct virtio_net *dev,
if (unlikely(virtio_dev_rx_async_packed(dev, vq, pkts[pkt_idx],
&num_descs, &num_buffers,
&src_iovec[iovec_idx], &dst_iovec[iovec_idx],
- &it_pool[it_idx], &it_pool[it_idx + 1]) < 0))
+ &src_iter[it_idx], &dst_iter[it_idx]) < 0))
break;
slot_idx = (async->pkts_idx + pkt_idx) % vq->size;
- async_fill_desc(&tdes[pkt_burst_idx++], &it_pool[it_idx],
- &it_pool[it_idx + 1]);
+ async_fill_desc(&tdes[pkt_burst_idx++], &src_iter[it_idx], &dst_iter[it_idx]);
pkts_info[slot_idx].descs = num_descs;
pkts_info[slot_idx].nr_buffers = num_buffers;
pkts_info[slot_idx].mbuf = pkts[pkt_idx];
- iovec_idx += it_pool[it_idx].nr_segs;
- it_idx += 2;
+ iovec_idx += src_iter[it_idx].nr_segs;
+ it_idx++;
pkt_idx++;
remained--;
--
2.31.1
next prev parent reply other threads:[~2021-10-26 16:29 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-26 16:28 [dpdk-dev] [PATCH v2 00/15] vhost: clean-up and simplify async implementation Maxime Coquelin
2021-10-26 16:28 ` [dpdk-dev] [PATCH v2 01/15] vhost: move async data in a dedicated structure Maxime Coquelin
2021-10-28 12:03 ` Xia, Chenbo
2021-10-26 16:28 ` [dpdk-dev] [PATCH v2 02/15] vhost: hide inflight async structure Maxime Coquelin
2021-10-28 12:07 ` Xia, Chenbo
2021-10-26 16:28 ` [dpdk-dev] [PATCH v2 03/15] vhost: simplify async IO vectors Maxime Coquelin
2021-10-29 5:37 ` Xia, Chenbo
2021-10-26 16:28 ` Maxime Coquelin [this message]
2021-10-29 5:44 ` [dpdk-dev] [PATCH v2 04/15] vhost: simplify async IO vectors iterators Xia, Chenbo
2021-10-26 16:28 ` [dpdk-dev] [PATCH v2 05/15] vhost: remove async batch threshold Maxime Coquelin
2021-10-29 6:19 ` Xia, Chenbo
2021-10-26 16:28 ` [dpdk-dev] [PATCH v2 06/15] vhost: introduce specific iovec structure Maxime Coquelin
2021-10-29 6:19 ` Xia, Chenbo
2021-10-26 16:28 ` [dpdk-dev] [PATCH v2 07/15] vhost: remove useless fields in async iterator struct Maxime Coquelin
2021-10-29 6:19 ` Xia, Chenbo
2021-10-26 16:28 ` [dpdk-dev] [PATCH v2 08/15] vhost: improve IO vector logic Maxime Coquelin
2021-10-26 16:28 ` [dpdk-dev] [PATCH v2 09/15] vhost: remove notion of async descriptor Maxime Coquelin
2021-10-26 16:28 ` [dpdk-dev] [PATCH v2 10/15] vhost: simplify async enqueue completion Maxime Coquelin
2021-10-26 16:29 ` [dpdk-dev] [PATCH v2 11/15] vhost: simplify getting the first in-flight index Maxime Coquelin
2021-10-26 16:29 ` [dpdk-dev] [PATCH v2 12/15] vhost: prepare async for mbuf to desc refactoring Maxime Coquelin
2021-10-26 16:29 ` [dpdk-dev] [PATCH v2 13/15] vhost: prepare sync " Maxime Coquelin
2021-10-26 16:29 ` [dpdk-dev] [PATCH v2 14/15] vhost: merge sync and async mbuf to desc filling Maxime Coquelin
2021-10-26 16:29 ` [dpdk-dev] [PATCH v2 15/15] vhost: increase number of async IO vectors Maxime Coquelin
2021-10-28 12:40 ` [dpdk-dev] [PATCH v2 00/15] vhost: clean-up and simplify async implementation Hu, Jiayu
2021-10-29 10:34 ` 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=20211026162904.482987-5-maxime.coquelin@redhat.com \
--to=maxime.coquelin@redhat.com \
--cc=bruce.richardson@intel.com \
--cc=chenbo.xia@intel.com \
--cc=dev@dpdk.org \
--cc=jiayu.hu@intel.com \
--cc=john.mcnamara@intel.com \
--cc=wenwux.ma@intel.com \
--cc=yuanx.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).