From: Stefano Garzarella <sgarzare@redhat.com>
To: Gavin Shan <gshan@redhat.com>
Cc: virtualization@lists.linux.dev, linux-kernel@vger.kernel.org,
mst@redhat.com, jasowang@redhat.com, will@kernel.org,
davem@davemloft.net, stefanha@redhat.com, keirf@google.com,
yihyu@redhat.com, shan.gavin@gmail.com
Subject: Re: [PATCH v3 1/3] vhost: Add smp_rmb() in vhost_vq_avail_empty()
Date: Thu, 28 Mar 2024 10:47:08 +0100 [thread overview]
Message-ID: <se44xqedp6lh33yv3cnckpvik6qujrywu7ia3ws4gigkxib4o4@ygwrhlkmkekz> (raw)
In-Reply-To: <20240328002149.1141302-2-gshan@redhat.com>
On Thu, Mar 28, 2024 at 10:21:47AM +1000, Gavin Shan wrote:
>A smp_rmb() has been missed in vhost_vq_avail_empty(), spotted by
>Will. Otherwise, it's not ensured the available ring entries pushed
>by guest can be observed by vhost in time, leading to stale available
>ring entries fetched by vhost in vhost_get_vq_desc(), as reported by
>Yihuang Yu on NVidia's grace-hopper (ARM64) platform.
>
> /home/gavin/sandbox/qemu.main/build/qemu-system-aarch64 \
> -accel kvm -machine virt,gic-version=host -cpu host \
> -smp maxcpus=1,cpus=1,sockets=1,clusters=1,cores=1,threads=1 \
> -m 4096M,slots=16,maxmem=64G \
> -object memory-backend-ram,id=mem0,size=4096M \
> : \
> -netdev tap,id=vnet0,vhost=true \
> -device virtio-net-pci,bus=pcie.8,netdev=vnet0,mac=52:54:00:f1:26:b0
> :
> guest# netperf -H 10.26.1.81 -l 60 -C -c -t UDP_STREAM
> virtio_net virtio0: output.0:id 100 is not a head!
>
>Add the missed smp_rmb() in vhost_vq_avail_empty(). When tx_can_batch()
>returns true, it means there's still pending tx buffers. Since it might
>read indices, so it still can bypass the smp_rmb() in vhost_get_vq_desc().
>Note that it should be safe until vq->avail_idx is changed by commit
>275bf960ac697 ("vhost: better detection of available buffers").
>
>Fixes: 275bf960ac69 ("vhost: better detection of available buffers")
>Cc: <stable@kernel.org> # v4.11+
>Reported-by: Yihuang Yu <yihyu@redhat.com>
>Suggested-by: Will Deacon <will@kernel.org>
>Signed-off-by: Gavin Shan <gshan@redhat.com>
>Acked-by: Jason Wang <jasowang@redhat.com>
>---
> drivers/vhost/vhost.c | 12 +++++++++++-
> 1 file changed, 11 insertions(+), 1 deletion(-)
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
>
>diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
>index 045f666b4f12..29df65b2ebf2 100644
>--- a/drivers/vhost/vhost.c
>+++ b/drivers/vhost/vhost.c
>@@ -2799,9 +2799,19 @@ bool vhost_vq_avail_empty(struct vhost_dev *dev, struct vhost_virtqueue *vq)
> r = vhost_get_avail_idx(vq, &avail_idx);
> if (unlikely(r))
> return false;
>+
> vq->avail_idx = vhost16_to_cpu(vq, avail_idx);
>+ if (vq->avail_idx != vq->last_avail_idx) {
>+ /* Since we have updated avail_idx, the following
>+ * call to vhost_get_vq_desc() will read available
>+ * ring entries. Make sure that read happens after
>+ * the avail_idx read.
>+ */
>+ smp_rmb();
>+ return false;
>+ }
>
>- return vq->avail_idx == vq->last_avail_idx;
>+ return true;
> }
> EXPORT_SYMBOL_GPL(vhost_vq_avail_empty);
>
>--
>2.44.0
>
next prev parent reply other threads:[~2024-03-28 9:47 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-28 0:21 [PATCH v3 0/3] vhost: Fix stale available ring entries Gavin Shan
2024-03-28 0:21 ` [PATCH v3 1/3] vhost: Add smp_rmb() in vhost_vq_avail_empty() Gavin Shan
2024-03-28 9:47 ` Stefano Garzarella [this message]
2024-03-28 0:21 ` [PATCH v3 2/3] vhost: Add smp_rmb() in vhost_enable_notify() Gavin Shan
2024-03-28 9:48 ` Stefano Garzarella
2024-03-28 0:21 ` [PATCH v3 3/3] vhost: Improve vhost_get_avail_idx() with smp_rmb() Gavin Shan
2024-03-28 3:54 ` Jason Wang
2024-03-28 9:31 ` Michael S. Tsirkin
2024-03-30 9:02 ` Gavin Shan
2024-04-08 4:15 ` Gavin Shan
2024-04-08 7:19 ` Michael S. Tsirkin
2024-04-08 7:33 ` Michael S. Tsirkin
2024-04-22 20:46 ` Michael S. Tsirkin
2024-04-23 3:36 ` Gavin Shan
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=se44xqedp6lh33yv3cnckpvik6qujrywu7ia3ws4gigkxib4o4@ygwrhlkmkekz \
--to=sgarzare@redhat.com \
--cc=davem@davemloft.net \
--cc=gshan@redhat.com \
--cc=jasowang@redhat.com \
--cc=keirf@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mst@redhat.com \
--cc=shan.gavin@gmail.com \
--cc=stefanha@redhat.com \
--cc=virtualization@lists.linux.dev \
--cc=will@kernel.org \
--cc=yihyu@redhat.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).