Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

vhost: Add smp_rmb() in vhost_enable_notify()

A smp_rmb() has been missed in vhost_enable_notify(), inspired 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_enable_notify(). When it 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 d3bb267bbdcb
("vhost: cache avail index in vhost_enable_notify()").

Fixes: d3bb267bbdcb ("vhost: cache avail index in vhost_enable_notify()")
Cc: <stable@kernel.org> # v5.18+
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>
Message-Id: <20240328002149.1141302-3-gshan@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>

authored by

Gavin Shan and committed by
Michael S. Tsirkin
df9ace76 22e1992c

+12 -2
+12 -2
drivers/vhost/vhost.c
··· 2848 2848 &vq->avail->idx, r); 2849 2849 return false; 2850 2850 } 2851 - vq->avail_idx = vhost16_to_cpu(vq, avail_idx); 2852 2851 2853 - return vq->avail_idx != vq->last_avail_idx; 2852 + vq->avail_idx = vhost16_to_cpu(vq, avail_idx); 2853 + if (vq->avail_idx != vq->last_avail_idx) { 2854 + /* Since we have updated avail_idx, the following 2855 + * call to vhost_get_vq_desc() will read available 2856 + * ring entries. Make sure that read happens after 2857 + * the avail_idx read. 2858 + */ 2859 + smp_rmb(); 2860 + return true; 2861 + } 2862 + 2863 + return false; 2854 2864 } 2855 2865 EXPORT_SYMBOL_GPL(vhost_enable_notify); 2856 2866