From: Jens Freimann <jfreimann@redhat.com>
To: Jiayu Hu <jiayu.hu@intel.com>
Cc: dev@dpdk.org, tiwei.bie@intel.com, zhihong.wang@intel.com,
maxime.coquelin@redhat.com, lei.a.yao@intel.com
Subject: Re: [dpdk-dev] [PATCH] vhost: fix return value
Date: Wed, 25 Jul 2018 11:16:28 +0200 [thread overview]
Message-ID: <20180725091628.2okgfghweto5aip2@jenstp.localdomain> (raw)
In-Reply-To: <1532506902-98105-1-git-send-email-jiayu.hu@intel.com>
On Wed, Jul 25, 2018 at 04:21:42PM +0800, Jiayu Hu wrote:
>This patch fixes the incorrect return value for rte_vhost_dequeue_burst()
>when virtqueue is not enabled or virtqueue address translation fails.
>
>Fixes: 62250c1d0978 ("vhost: extract split ring handling from Rx and Tx functions")
An alternative would be to add a new variable and not reuse the count
parameter as the return value, but your version is the minimal change
and fixes the bug, so
Reviewed-by: Jens Freimann <jfreiman@redhat.com>
regards,
Jens
>
>Signed-off-by: Jiayu Hu <jiayu.hu@intel.com>
>---
> lib/librte_vhost/virtio_net.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
>diff --git a/lib/librte_vhost/virtio_net.c b/lib/librte_vhost/virtio_net.c
>index 2b7ffcf..5d4b975 100644
>--- a/lib/librte_vhost/virtio_net.c
>+++ b/lib/librte_vhost/virtio_net.c
>@@ -1592,15 +1592,19 @@ rte_vhost_dequeue_burst(int vid, uint16_t queue_id,
> if (unlikely(rte_spinlock_trylock(&vq->access_lock) == 0))
> return 0;
>
>- if (unlikely(vq->enabled == 0))
>+ if (unlikely(vq->enabled == 0)) {
>+ count = 0;
> goto out_access_unlock;
>+ }
>
> if (dev->features & (1ULL << VIRTIO_F_IOMMU_PLATFORM))
> vhost_user_iotlb_rd_lock(vq);
>
> if (unlikely(vq->access_ok == 0))
>- if (unlikely(vring_translate(dev, vq) < 0))
>+ if (unlikely(vring_translate(dev, vq) < 0)) {
>+ count = 0;
> goto out;
>+ }
>
> /*
> * Construct a RARP broadcast packet, and inject it to the "pkts"
>--
>2.7.4
>
next prev parent reply other threads:[~2018-07-25 9:16 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-25 8:21 Jiayu Hu
2018-07-25 9:16 ` Jens Freimann [this message]
2018-07-26 1:55 ` Tiwei Bie
2018-07-26 8:55 ` Tiwei Bie
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=20180725091628.2okgfghweto5aip2@jenstp.localdomain \
--to=jfreimann@redhat.com \
--cc=dev@dpdk.org \
--cc=jiayu.hu@intel.com \
--cc=lei.a.yao@intel.com \
--cc=maxime.coquelin@redhat.com \
--cc=tiwei.bie@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).