From: Yongseok Koh <yskoh@mellanox.com>
To: Yahui Cao <yahui.cao@intel.com>
Cc: Jiayu Hu <jiayu.hu@intel.com>, Yuanhan Liu <yliu@fridaylinux.org>,
Maxime Coquelin <maxime.coquelin@redhat.com>,
"stable@dpdk.org" <stable@dpdk.org>
Subject: Re: [dpdk-stable] [PATCH 17.11] vhost: fix corner case for enqueue operation
Date: Fri, 28 Dec 2018 09:48:57 +0000 [thread overview]
Message-ID: <998BFBC4-7982-4FF6-B0C2-A19FDAE70C37@mellanox.com> (raw)
In-Reply-To: <20181224013722.28856-1-yahui.cao@intel.com>
> On Dec 23, 2018, at 5:37 PM, Yahui Cao <yahui.cao@intel.com> wrote:
>
> [ backported from upstream commit 729199397f9fc4ba265e94d492c792244e8c364b ]
>
> When performing enqueue operations on the split and packed rings,
> if the reserved buffer length from the descriptor table exceeds
> 65535, the returned length by fill_vec_buf_split/_packed()
> overflows. This patch is to avoid this corner case.
>
> Fixes: f689586bc060 ("vhost: shadow used ring update")
> Fixes: fd68b4739d2c ("vhost: use buffer vectors in dequeue path")
> Fixes: 2f3225a7d69b ("vhost: add vector filling support for packed ring")
> Fixes: 37f5e79a271d ("vhost: add shadow used ring support for packed rings")
> Fixes: a922401f35cc ("vhost: add Rx support for packed ring")
> Fixes: ae999ce49dcb ("vhost: add Tx support for packed ring")
>
> Signed-off-by: Jiayu Hu <jiayu.hu@intel.com>
> Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
>
> Signed-off-by: Yahui Cao <yahui.cao@intel.com>
> ---
Applied to stable/17.11
Thanks,
Yongseok
> lib/librte_vhost/virtio_net.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/lib/librte_vhost/virtio_net.c b/lib/librte_vhost/virtio_net.c
> index bde360f3d..8c0c1b4bb 100644
> --- a/lib/librte_vhost/virtio_net.c
> +++ b/lib/librte_vhost/virtio_net.c
> @@ -144,7 +144,7 @@ flush_shadow_used_ring(struct virtio_net *dev, struct vhost_virtqueue *vq)
>
> static __rte_always_inline void
> update_shadow_used_ring(struct vhost_virtqueue *vq,
> - uint16_t desc_idx, uint16_t len)
> + uint16_t desc_idx, uint32_t len)
> {
> uint16_t i = vq->shadow_used_idx++;
>
> @@ -560,7 +560,7 @@ static __rte_always_inline int
> fill_vec_buf(struct virtio_net *dev, struct vhost_virtqueue *vq,
> uint32_t avail_idx, uint32_t *vec_idx,
> struct buf_vector *buf_vec, uint16_t *desc_chain_head,
> - uint16_t *desc_chain_len)
> + uint32_t *desc_chain_len)
> {
> uint16_t idx = vq->avail->ring[avail_idx & (vq->size - 1)];
> uint32_t vec_id = *vec_idx;
> @@ -635,7 +635,7 @@ reserve_avail_buf_mergeable(struct virtio_net *dev, struct vhost_virtqueue *vq,
> uint16_t tries = 0;
>
> uint16_t head_idx = 0;
> - uint16_t len = 0;
> + uint32_t len = 0;
>
> *num_buffers = 0;
> cur_idx = vq->last_avail_idx;
> --
> 2.17.1
>
prev parent reply other threads:[~2018-12-28 9:48 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-24 1:37 Yahui Cao
2018-12-28 9:48 ` Yongseok Koh [this message]
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=998BFBC4-7982-4FF6-B0C2-A19FDAE70C37@mellanox.com \
--to=yskoh@mellanox.com \
--cc=jiayu.hu@intel.com \
--cc=maxime.coquelin@redhat.com \
--cc=stable@dpdk.org \
--cc=yahui.cao@intel.com \
--cc=yliu@fridaylinux.org \
/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).