From: Maxime Coquelin <maxime.coquelin@redhat.com>
To: Patrick Fu <patrick.fu@intel.com>, dev@dpdk.org, chenbo.xia@intel.com
Cc: zhihong.wang@intel.com, cheng1.jiang@intel.com
Subject: Re: [dpdk-dev] [PATCH v1 3/4] vhost: fix async vec buf overrun
Date: Wed, 23 Sep 2020 11:21:52 +0200 [thread overview]
Message-ID: <87121cfa-b7f8-25c3-daaa-00e78ffa4278@redhat.com> (raw)
In-Reply-To: <20200911015316.1903181-4-patrick.fu@intel.com>
s/buf/buffer/
On 9/11/20 3:53 AM, Patrick Fu wrote:
> Add check on the async vec buffer usage to prevent the buf overrun.
s/vec/vector/
s/buf/buffer/
> If vec buf is not sufficient to prepare for next packet's iov
same here
> creation, an async transfer will be triggered immediately to free
> the vec buf.
>
> Fixes: 78639d54563a ("vhost: introduce async enqueue registration API")
>
> Signed-off-by: Patrick Fu <patrick.fu@intel.com>
> ---
> lib/librte_vhost/vhost.h | 2 +-
> lib/librte_vhost/virtio_net.c | 7 ++++++-
> 2 files changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h
> index 0af0ac23d..5e669e28f 100644
> --- a/lib/librte_vhost/vhost.h
> +++ b/lib/librte_vhost/vhost.h
> @@ -47,7 +47,7 @@
> #define MAX_PKT_BURST 32
>
> #define VHOST_MAX_ASYNC_IT (MAX_PKT_BURST * 2)
> -#define VHOST_MAX_ASYNC_VEC (BUF_VECTOR_MAX * 2)
> +#define VHOST_MAX_ASYNC_VEC (BUF_VECTOR_MAX * 4)
>
> #define PACKED_DESC_ENQUEUE_USED_FLAG(w) \
> ((w) ? (VRING_DESC_F_AVAIL | VRING_DESC_F_USED | VRING_DESC_F_WRITE) : \
> diff --git a/lib/librte_vhost/virtio_net.c b/lib/librte_vhost/virtio_net.c
> index 70c3377fb..18b91836a 100644
> --- a/lib/librte_vhost/virtio_net.c
> +++ b/lib/librte_vhost/virtio_net.c
> @@ -1492,6 +1492,7 @@ virtio_dev_rx_async_submit_split(struct virtio_net *dev,
> struct rte_vhost_iov_iter *dst_it = it_pool + 1;
> uint16_t n_free_slot, slot_idx;
> uint16_t pkt_err = 0;
> + uint16_t segs_await = 0;
> struct async_inflight_info *pkts_info = vq->async_pkts_info;
> int n_pkts = 0;
>
> @@ -1540,6 +1541,7 @@ virtio_dev_rx_async_submit_split(struct virtio_net *dev,
> dst_iovec += dst_it->nr_segs;
> src_it += 2;
> dst_it += 2;
> + segs_await += src_it->nr_segs;
> } else {
> pkts_info[slot_idx].info = num_buffers;
> vq->async_pkts_inflight_n++;
> @@ -1548,13 +1550,16 @@ virtio_dev_rx_async_submit_split(struct virtio_net *dev,
> vq->last_avail_idx += num_buffers;
>
> if (pkt_burst_idx >= VHOST_ASYNC_BATCH_THRESHOLD ||
> - (pkt_idx == count - 1 && pkt_burst_idx)) {
> + (pkt_idx == count - 1 && pkt_burst_idx) ||
> + VHOST_MAX_ASYNC_VEC / 2 - segs_await <
> + BUF_VECTOR_MAX) {
Parenthesis may help.
Or better to refactor the code for better readability.
> n_pkts = vq->async_ops.transfer_data(dev->vid,
> queue_id, tdes, 0, pkt_burst_idx);
> src_iovec = vec_pool;
> dst_iovec = vec_pool + (VHOST_MAX_ASYNC_VEC >> 1);
> src_it = it_pool;
> dst_it = it_pool + 1;
> + segs_await = 0;
> vq->async_pkts_inflight_n += n_pkts;
>
> if (unlikely(n_pkts < (int)pkt_burst_idx)) {
>
next prev parent reply other threads:[~2020-09-23 9:22 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-11 1:53 [dpdk-dev] [PATCH v1 0/4] optimize async data path Patrick Fu
2020-09-11 1:53 ` [dpdk-dev] [PATCH v1 1/4] vhost: simplify async copy completion Patrick Fu
2020-09-23 9:07 ` Maxime Coquelin
2020-09-11 1:53 ` [dpdk-dev] [PATCH v1 2/4] vhost: dynamically alloc async memory Patrick Fu
2020-09-23 9:15 ` Maxime Coquelin
2020-09-29 5:55 ` Fu, Patrick
2020-09-11 1:53 ` [dpdk-dev] [PATCH v1 3/4] vhost: fix async vec buf overrun Patrick Fu
2020-09-23 9:21 ` Maxime Coquelin [this message]
2020-09-29 2:23 ` Fu, Patrick
2020-09-11 1:53 ` [dpdk-dev] [PATCH v1 4/4] vhost: fix async register/unregister deadlock Patrick Fu
2020-09-29 6:29 ` [dpdk-dev] [PATCH v2 0/4] optimize async data path Patrick Fu
2020-09-29 6:29 ` [dpdk-dev] [PATCH v2 1/4] vhost: simplify async copy completion Patrick Fu
2020-09-29 6:29 ` [dpdk-dev] [PATCH v2 2/4] vhost: dynamically allocate async memory Patrick Fu
2020-09-29 6:29 ` [dpdk-dev] [PATCH v2 3/4] vhost: fix async vector buffer overrun Patrick Fu
2020-09-29 6:29 ` [dpdk-dev] [PATCH v2 4/4] vhost: fix async register/unregister deadlock Patrick Fu
2020-09-29 9:29 ` [dpdk-dev] [PATCH v3 0/4] optimize async data path Patrick Fu
2020-09-29 9:29 ` [dpdk-dev] [PATCH v3 1/4] vhost: simplify async copy completion Patrick Fu
2020-10-05 13:46 ` Maxime Coquelin
2020-10-09 11:16 ` Fu, Patrick
2020-09-29 9:29 ` [dpdk-dev] [PATCH v3 2/4] vhost: dynamically allocate async memory Patrick Fu
2020-10-05 13:50 ` Maxime Coquelin
2020-09-29 9:29 ` [dpdk-dev] [PATCH v3 3/4] vhost: fix async vector buffer overrun Patrick Fu
2020-10-05 14:19 ` Maxime Coquelin
2020-09-29 9:29 ` [dpdk-dev] [PATCH v3 4/4] vhost: fix async register/unregister deadlock Patrick Fu
2020-10-05 14:25 ` Maxime Coquelin
2020-10-09 10:54 ` Fu, Patrick
2020-10-13 1:45 ` [dpdk-dev] [PATCH v4 0/4] optimize async data path Patrick Fu
2020-10-13 1:45 ` [dpdk-dev] [PATCH v4 1/4] vhost: simplify async copy completion Patrick Fu
2020-10-14 9:28 ` Maxime Coquelin
2020-10-13 1:45 ` [dpdk-dev] [PATCH v4 2/4] vhost: dynamically allocate async memory Patrick Fu
2020-10-14 9:30 ` Maxime Coquelin
2020-10-13 1:45 ` [dpdk-dev] [PATCH v4 3/4] vhost: fix async vector buffer overrun Patrick Fu
2020-10-14 9:33 ` Maxime Coquelin
2020-10-13 1:45 ` [dpdk-dev] [PATCH v4 4/4] vhost: fix async unregister deadlock Patrick Fu
2020-10-14 9:34 ` Maxime Coquelin
2020-10-15 15:40 ` [dpdk-dev] [PATCH v4 0/4] optimize async data path 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=87121cfa-b7f8-25c3-daaa-00e78ffa4278@redhat.com \
--to=maxime.coquelin@redhat.com \
--cc=chenbo.xia@intel.com \
--cc=cheng1.jiang@intel.com \
--cc=dev@dpdk.org \
--cc=patrick.fu@intel.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).