virtio-net: fix qemu set used ring flag even vhost started
PATCH 1/1 virtio-net: fix qemu set used ring flag even vhost started
When vhost-user or vhost-kernel is handling virtio net datapath, qemu should not touch used ring.
But with vhost-user socket reconnect scenario, in a very rare case (has pending kick event). VRING_USED_F_NO_NOTIFY is set by qemu in following code path:
#0 virtio_queue_split_set_notification (vq=0x7ff5f4c920a8, enable=0) at ../hw/virtio/virtio.c:511 #1 0x0000559d6dbf033b in virtio_queue_set_notification (vq=0x7ff5f4c920a8, enable=0) at ../hw/virtio/virtio.c:576 #2 0x0000559d6dbbbdbc in virtio_net_handle_tx_bh (vdev=0x559d703a6aa0, vq=0x7ff5f4c920a8) at ../hw/net/virtio-net.c:2801 #3 0x0000559d6dbf4791 in virtio_queue_notify_vq (vq=0x7ff5f4c920a8) at ../hw/virtio/virtio.c:2248 #4 0x0000559d6dbf79da in virtio_queue_host_notifier_read (n=0x7ff5f4c9211c) at ../hw/virtio/virtio.c:3525 #5 0x0000559d6d9a5814 in virtio_bus_cleanup_host_notifier (bus=0x559d703a6a20, n=1) at ../hw/virtio/virtio-bus.c:321 #6 0x0000559d6dbf83c9 in virtio_device_stop_ioeventfd_impl (vdev=0x559d703a6aa0) at ../hw/virtio/virtio.c:3774 #7 0x0000559d6d9a55c8 in virtio_bus_stop_ioeventfd (bus=0x559d703a6a20) at ../hw/virtio/virtio-bus.c:259 #8 0x0000559d6d9a53e8 in virtio_bus_grab_ioeventfd (bus=0x559d703a6a20) at ../hw/virtio/virtio-bus.c:199 #9 0x0000559d6dbf841c in virtio_device_grab_ioeventfd (vdev=0x559d703a6aa0) at ../hw/virtio/virtio.c:3783 #10 0x0000559d6d9bde18 in vhost_dev_enable_notifiers (hdev=0x559d707edd70, vdev=0x559d703a6aa0) at ../hw/virtio/vhost.c:1592 #11 0x0000559d6d89a0b8 in vhost_net_start_one (net=0x559d707edd70, dev=0x559d703a6aa0) at ../hw/net/vhost_net.c:266 #12 0x0000559d6d89a6df in vhost_net_start (dev=0x559d703a6aa0, ncs=0x559d7048d890, data_queue_pairs=31, cvq=0) at ../hw/net/vhost_net.c:412 #13 0x0000559d6dbb5b89 in virtio_net_vhost_status (n=0x559d703a6aa0, status=15 '\017') at ../hw/net/virtio-net.c:311 #14 0x0000559d6dbb5e34 in virtio_net_set_status (vdev=0x559d703a6aa0, status=15 '\017') at ../hw/net/virtio-net.c:392 #15 0x0000559d6dbb60d8 in virtio_net_set_link_status (nc=0x559d7048d890) at ../hw/net/virtio-net.c:455 #16 0x0000559d6da64863 in qmp_set_link (name=0x559d6f0b83d0 "hostnet1", up=true, errp=0x7ffdd76569f0) at ../net/net.c:1459 #17 0x0000559d6da7226e in net_vhost_user_event (opaque=0x559d6f0b83d0, event=CHR_EVENT_OPENED) at ../net/vhost-user.c:301 #18 0x0000559d6ddc7f63 in chr_be_event (s=0x559d6f2ffea0, event=CHR_EVENT_OPENED) at ../chardev/char.c:62 #19 0x0000559d6ddc7fdc in qemu_chr_be_event (s=0x559d6f2ffea0, event=CHR_EVENT_OPENED) at ../chardev/char.c:82
This issue causes guest kernel stop kicking device and traffic stop.
Add vhost_started check in virtio_net_handle_tx_bh to fix this wrong VRING_USED_F_NO_NOTIFY set.
--- hw/net/virtio-net.c | 4 ++++ 1 file changed, 4 insertions(+)
hw/net/virtio-net.c +4 -0
@@ -2865,6 +2865,10 @@ static void virtio_net_handle_tx_bh(VirtIODevice *vdev, VirtQueue *vq)VirtIONet *n =VIRTIO_NET (vdev);VirtIONetQueue *q = &n->vqs[vq2q (virtio_get_queue_index (vq))]; +if (n->vhost_started) { +return ; + } +if (unlikely ((n->status &VIRTIO_NET_S_LINK_UP ) ==0 )) {virtio_net_drop_tx_queue_data (vdev, vq);return ;
Signature · 1 line
2.27.0
Quoted 28 lines · Yajun Wu
When vhost-user or vhost-kernel is handling virtio net datapath, qemu should not touch used ring.
But with vhost-user socket reconnect scenario, in a very rare case (has pending kick event).
VRING_USED_F_NO_NOTIFYis set by qemu in following code path:#0 virtio_queue_split_set_notification (vq=0x7ff5f4c920a8, enable=0) at ../hw/virtio/virtio.c:511 #1 0x0000559d6dbf033b in virtio_queue_set_notification (vq=0x7ff5f4c920a8, enable=0) at ../hw/virtio/virtio.c:576 #2 0x0000559d6dbbbdbc in virtio_net_handle_tx_bh (vdev=0x559d703a6aa0, vq=0x7ff5f4c920a8) at ../hw/net/virtio-net.c:2801 #3 0x0000559d6dbf4791 in virtio_queue_notify_vq (vq=0x7ff5f4c920a8) at ../hw/virtio/virtio.c:2248 #4 0x0000559d6dbf79da in virtio_queue_host_notifier_read (n=0x7ff5f4c9211c) at ../hw/virtio/virtio.c:3525 #5 0x0000559d6d9a5814 in virtio_bus_cleanup_host_notifier (bus=0x559d703a6a20, n=1) at ../hw/virtio/virtio-bus.c:321 #6 0x0000559d6dbf83c9 in virtio_device_stop_ioeventfd_impl (vdev=0x559d703a6aa0) at ../hw/virtio/virtio.c:3774 #7 0x0000559d6d9a55c8 in virtio_bus_stop_ioeventfd (bus=0x559d703a6a20) at ../hw/virtio/virtio-bus.c:259 #8 0x0000559d6d9a53e8 in virtio_bus_grab_ioeventfd (bus=0x559d703a6a20) at ../hw/virtio/virtio-bus.c:199 #9 0x0000559d6dbf841c in virtio_device_grab_ioeventfd (vdev=0x559d703a6aa0) at ../hw/virtio/virtio.c:3783 #10 0x0000559d6d9bde18 in vhost_dev_enable_notifiers (hdev=0x559d707edd70, vdev=0x559d703a6aa0) at ../hw/virtio/vhost.c:1592 #11 0x0000559d6d89a0b8 in vhost_net_start_one (net=0x559d707edd70, dev=0x559d703a6aa0) at ../hw/net/vhost_net.c:266 #12 0x0000559d6d89a6df in vhost_net_start (dev=0x559d703a6aa0, ncs=0x559d7048d890, data_queue_pairs=31, cvq=0) at ../hw/net/vhost_net.c:412 #13 0x0000559d6dbb5b89 in virtio_net_vhost_status (n=0x559d703a6aa0, status=15 '\017') at ../hw/net/virtio-net.c:311 #14 0x0000559d6dbb5e34 in virtio_net_set_status (vdev=0x559d703a6aa0, status=15 '\017') at ../hw/net/virtio-net.c:392 #15 0x0000559d6dbb60d8 in virtio_net_set_link_status (nc=0x559d7048d890) at ../hw/net/virtio-net.c:455 #16 0x0000559d6da64863 in qmp_set_link (name=0x559d6f0b83d0 "hostnet1", up=true, errp=0x7ffdd76569f0) at ../net/net.c:1459 #17 0x0000559d6da7226e in net_vhost_user_event (opaque=0x559d6f0b83d0, event=CHR_EVENT_OPENED) at ../net/vhost-user.c:301 #18 0x0000559d6ddc7f63 in chr_be_event (s=0x559d6f2ffea0, event=CHR_EVENT_OPENED) at ../chardev/char.c:62 #19 0x0000559d6ddc7fdc in qemu_chr_be_event (s=0x559d6f2ffea0, event=CHR_EVENT_OPENED) at ../chardev/char.c:82
Quoted 7 lines
This issue causes guest kernel stop kicking device and traffic stop.
Add
vhost_startedcheck invirtio_net_handle_tx_bhto fix this wrongVRING_USED_F_NO_NOTIFYset.Signed-off-by Yajun Wu <[email protected]>Reviewed-by Jiri Pirko <[email protected]>
Quoted 21 lines
--- hw/net/virtio-net.c | 4 ++++ 1 file changed, 4 insertions(+)hw/net/virtio-net.c +4
-0@@ -2865,6 +2865,10 @@ static void virtio_net_handle_tx_bh(VirtIODevice *vdev, VirtQueue *vq)VirtIONet *n =VIRTIO_NET (vdev);VirtIONetQueue *q = &n->vqs[vq2q (virtio_get_queue_index (vq))]; +if (n->vhost_started) { +return ; + } +if (unlikely ((n->status &VIRTIO_NET_S_LINK_UP ) ==0 )) {virtio_net_drop_tx_queue_data (vdev, vq);return ;Signature · 1 line
2.27.0
Hi Yajun,
Quoted 1 line · Yajun Wu
When vhost-user or vhost-kernel is handling virtio net datapath, qemu
"QEMU"
Quoted 4 lines
should not touch used ring.
But with vhost-user socket reconnect scenario, in a very rare case (has pending kick event).
VRING_USED_F_NO_NOTIFYis set by qemu in
"QEMU"
Quoted 39 lines
following code path:
#0 virtio_queue_split_set_notification (vq=0x7ff5f4c920a8, enable=0) at ../hw/virtio/virtio.c:511 #1 0x0000559d6dbf033b in virtio_queue_set_notification (vq=0x7ff5f4c920a8, enable=0) at ../hw/virtio/virtio.c:576 #2 0x0000559d6dbbbdbc in virtio_net_handle_tx_bh (vdev=0x559d703a6aa0, vq=0x7ff5f4c920a8) at ../hw/net/virtio-net.c:2801 #3 0x0000559d6dbf4791 in virtio_queue_notify_vq (vq=0x7ff5f4c920a8) at ../hw/virtio/virtio.c:2248 #4 0x0000559d6dbf79da in virtio_queue_host_notifier_read (n=0x7ff5f4c9211c) at ../hw/virtio/virtio.c:3525 #5 0x0000559d6d9a5814 in virtio_bus_cleanup_host_notifier (bus=0x559d703a6a20, n=1) at ../hw/virtio/virtio-bus.c:321 #6 0x0000559d6dbf83c9 in virtio_device_stop_ioeventfd_impl (vdev=0x559d703a6aa0) at ../hw/virtio/virtio.c:3774 #7 0x0000559d6d9a55c8 in virtio_bus_stop_ioeventfd (bus=0x559d703a6a20) at ../hw/virtio/virtio-bus.c:259 #8 0x0000559d6d9a53e8 in virtio_bus_grab_ioeventfd (bus=0x559d703a6a20) at ../hw/virtio/virtio-bus.c:199 #9 0x0000559d6dbf841c in virtio_device_grab_ioeventfd (vdev=0x559d703a6aa0) at ../hw/virtio/virtio.c:3783 #10 0x0000559d6d9bde18 in vhost_dev_enable_notifiers (hdev=0x559d707edd70, vdev=0x559d703a6aa0) at ../hw/virtio/vhost.c:1592 #11 0x0000559d6d89a0b8 in vhost_net_start_one (net=0x559d707edd70, dev=0x559d703a6aa0) at ../hw/net/vhost_net.c:266 #12 0x0000559d6d89a6df in vhost_net_start (dev=0x559d703a6aa0, ncs=0x559d7048d890, data_queue_pairs=31, cvq=0) at ../hw/net/vhost_net.c:412 #13 0x0000559d6dbb5b89 in virtio_net_vhost_status (n=0x559d703a6aa0, status=15 '\017') at ../hw/net/virtio-net.c:311 #14 0x0000559d6dbb5e34 in virtio_net_set_status (vdev=0x559d703a6aa0, status=15 '\017') at ../hw/net/virtio-net.c:392 #15 0x0000559d6dbb60d8 in virtio_net_set_link_status (nc=0x559d7048d890) at ../hw/net/virtio-net.c:455 #16 0x0000559d6da64863 in qmp_set_link (name=0x559d6f0b83d0 "hostnet1", up=true, errp=0x7ffdd76569f0) at ../net/net.c:1459 #17 0x0000559d6da7226e in net_vhost_user_event (opaque=0x559d6f0b83d0, event=CHR_EVENT_OPENED) at ../net/vhost-user.c:301 #18 0x0000559d6ddc7f63 in chr_be_event (s=0x559d6f2ffea0, event=CHR_EVENT_OPENED) at ../chardev/char.c:62 #19 0x0000559d6ddc7fdc in qemu_chr_be_event (s=0x559d6f2ffea0, event=CHR_EVENT_OPENED) at ../chardev/char.c:82This issue causes guest kernel stop kicking device and traffic stop.
Add
vhost_startedcheck invirtio_net_handle_tx_bhto fix this wrongVRING_USED_F_NO_NOTIFYset.Signed-off-by Yajun Wu <[email protected]>Reviewed-by Jiri Pirko <[email protected]>--- hw/net/virtio-net.c | 4 ++++ 1 file changed, 4 insertions(+)hw/net/virtio-net.c +0
-0
hw/net/virtio-net.c static void virtio_net_handle_tx_bh(VirtIODevice *vdev, VirtQueue *vq) · line 2868
Quoted 4 lines
hw/net/virtio-net.c +1
-0@@ -2865,6 +2865,10 @@ static void virtio_net_handle_tx_bh(VirtIODevice *vdev, VirtQueue *vq)VirtIONet *n =VIRTIO_NET (vdev);VirtIONetQueue *q = &n->vqs[vq2q (virtio_get_queue_index (vq))]; +if (n->vhost_started) {
Since you mentioned "in a very rare case", maybe use unlikely()?
Quoted 6 lines
hw/net/virtio-net.c +3
-0+return ; + } +if (unlikely ((n->status &VIRTIO_NET_S_LINK_UP ) ==0 )) {virtio_net_drop_tx_queue_data (vdev, vq);return ;
Quoted 8 lines · Philippe Mathieu-Daudé
External email: Use caution opening links or attachments
Hi Yajun,
Quoted 1 line · Yajun Wu
When vhost-user or vhost-kernel is handling virtio net datapath, qemu
"QEMU"
Ack.
Quoted 5 lines
Quoted 4 lines
should not touch used ring.
But with vhost-user socket reconnect scenario, in a very rare case (has pending kick event).
VRING_USED_F_NO_NOTIFYis set by qemu in"QEMU"
Ack.
Quoted 42 lines
Quoted 42 lines
following code path:
#0 virtio_queue_split_set_notification (vq=0x7ff5f4c920a8, enable=0) at ../hw/virtio/virtio.c:511 #1 0x0000559d6dbf033b in virtio_queue_set_notification (vq=0x7ff5f4c920a8, enable=0) at ../hw/virtio/virtio.c:576 #2 0x0000559d6dbbbdbc in virtio_net_handle_tx_bh (vdev=0x559d703a6aa0, vq=0x7ff5f4c920a8) at ../hw/net/virtio-net.c:2801 #3 0x0000559d6dbf4791 in virtio_queue_notify_vq (vq=0x7ff5f4c920a8) at ../hw/virtio/virtio.c:2248 #4 0x0000559d6dbf79da in virtio_queue_host_notifier_read (n=0x7ff5f4c9211c) at ../hw/virtio/virtio.c:3525 #5 0x0000559d6d9a5814 in virtio_bus_cleanup_host_notifier (bus=0x559d703a6a20, n=1) at ../hw/virtio/virtio-bus.c:321 #6 0x0000559d6dbf83c9 in virtio_device_stop_ioeventfd_impl (vdev=0x559d703a6aa0) at ../hw/virtio/virtio.c:3774 #7 0x0000559d6d9a55c8 in virtio_bus_stop_ioeventfd (bus=0x559d703a6a20) at ../hw/virtio/virtio-bus.c:259 #8 0x0000559d6d9a53e8 in virtio_bus_grab_ioeventfd (bus=0x559d703a6a20) at ../hw/virtio/virtio-bus.c:199 #9 0x0000559d6dbf841c in virtio_device_grab_ioeventfd (vdev=0x559d703a6aa0) at ../hw/virtio/virtio.c:3783 #10 0x0000559d6d9bde18 in vhost_dev_enable_notifiers (hdev=0x559d707edd70, vdev=0x559d703a6aa0) at ../hw/virtio/vhost.c:1592 #11 0x0000559d6d89a0b8 in vhost_net_start_one (net=0x559d707edd70, dev=0x559d703a6aa0) at ../hw/net/vhost_net.c:266 #12 0x0000559d6d89a6df in vhost_net_start (dev=0x559d703a6aa0, ncs=0x559d7048d890, data_queue_pairs=31, cvq=0) at ../hw/net/vhost_net.c:412 #13 0x0000559d6dbb5b89 in virtio_net_vhost_status (n=0x559d703a6aa0, status=15 '\017') at ../hw/net/virtio-net.c:311 #14 0x0000559d6dbb5e34 in virtio_net_set_status (vdev=0x559d703a6aa0, status=15 '\017') at ../hw/net/virtio-net.c:392 #15 0x0000559d6dbb60d8 in virtio_net_set_link_status (nc=0x559d7048d890) at ../hw/net/virtio-net.c:455 #16 0x0000559d6da64863 in qmp_set_link (name=0x559d6f0b83d0 "hostnet1", up=true, errp=0x7ffdd76569f0) at ../net/net.c:1459 #17 0x0000559d6da7226e in net_vhost_user_event (opaque=0x559d6f0b83d0, event=CHR_EVENT_OPENED) at ../net/vhost-user.c:301 #18 0x0000559d6ddc7f63 in chr_be_event (s=0x559d6f2ffea0, event=CHR_EVENT_OPENED) at ../chardev/char.c:62 #19 0x0000559d6ddc7fdc in qemu_chr_be_event (s=0x559d6f2ffea0, event=CHR_EVENT_OPENED) at ../chardev/char.c:82This issue causes guest kernel stop kicking device and traffic stop.
Add
vhost_startedcheck invirtio_net_handle_tx_bhto fix this wrongVRING_USED_F_NO_NOTIFYset.Signed-off-by Yajun Wu <[email protected]>Reviewed-by Jiri Pirko <[email protected]>--- hw/net/virtio-net.c | 4 ++++ 1 file changed, 4 insertions(+)hw/net/virtio-net.c +0
-0@@ -2865,6 +2865,10 @@ static void virtio_net_handle_tx_bh(VirtIODevice *vdev, VirtQueue *vq)VirtIONet *n =VIRTIO_NET (vdev);VirtIONetQueue *q = &n->vqs[vq2q (virtio_get_queue_index (vq))];
Quoted 2 lines
hw/net/virtio-net.c static void virtio_net_handle_tx_bh(VirtIODevice *vdev, VirtQueue *vq) · line 2868
Quoted 1 line
hw/net/virtio-net.c +1
-0+if (n->vhost_started) {Since you mentioned "in a very rare case", maybe use
unlikely()?
Ack.
Quoted 7 lines
Quoted 7 lines
hw/net/virtio-net.c +3
-0+return ; + } +if (unlikely ((n->status &VIRTIO_NET_S_LINK_UP ) ==0 )) {virtio_net_drop_tx_queue_data (vdev, vq);return ;
Quoted 60 lines · Yajun Wu
Quoted 8 lines · Philippe Mathieu-Daudé
External email: Use caution opening links or attachments
Hi Yajun,
Quoted 1 line · Yajun Wu
When vhost-user or vhost-kernel is handling virtio net datapath, qemu
"QEMU"
Ack.
Quoted 5 lines
Quoted 4 lines
should not touch used ring.
But with vhost-user socket reconnect scenario, in a very rare case (has pending kick event).
VRING_USED_F_NO_NOTIFYis set by qemu in"QEMU"
Ack.
Quoted 43 lines
Quoted 43 lines
following code path:
#0
virtio_queue_split_set_notification(vq=0x7ff5f4c920a8, enable=0) at../hw/virtio/virtio.c:511
#10x0000559d6dbf033binvirtio_queue_set_notification(vq=0x7ff5f4c920a8, enable=0) at../hw/virtio/virtio.c:576#20x0000559d6dbbbdbcinvirtio_net_handle_tx_bh(vdev=0x559d703a6aa0, vq=0x7ff5f4c920a8) at../hw/net/virtio-net.c:2801#30x0000559d6dbf4791invirtio_queue_notify_vq(vq=0x7ff5f4c920a8) at../hw/virtio/virtio.c:2248
#40x0000559d6dbf79dainvirtio_queue_host_notifier_read(n=0x7ff5f4c9211c) at../hw/virtio/virtio.c:3525
#50x0000559d6d9a5814invirtio_bus_cleanup_host_notifier(bus=0x559d703a6a20, n=1) at../hw/virtio/virtio-bus.c:321#60x0000559d6dbf83c9invirtio_device_stop_ioeventfd_impl(vdev=0x559d703a6aa0) at../hw/virtio/virtio.c:3774
#70x0000559d6d9a55c8invirtio_bus_stop_ioeventfd(bus=0x559d703a6a20) at../hw/virtio/virtio-bus.c:259
#80x0000559d6d9a53e8invirtio_bus_grab_ioeventfd(bus=0x559d703a6a20) at../hw/virtio/virtio-bus.c:199
#90x0000559d6dbf841cinvirtio_device_grab_ioeventfd(vdev=0x559d703a6aa0) at../hw/virtio/virtio.c:3783
#100x0000559d6d9bde18invhost_dev_enable_notifiers(hdev=0x559d707edd70, vdev=0x559d703a6aa0) at../hw/virtio/vhost.c:1592#110x0000559d6d89a0b8invhost_net_start_one(net=0x559d707edd70, dev=0x559d703a6aa0) at../hw/net/vhost_net.c:266#120x0000559d6d89a6dfinvhost_net_start(dev=0x559d703a6aa0, ncs=0x559d7048d890, data_queue_pairs=31, cvq=0) at../hw/net/vhost_net.c:412#130x0000559d6dbb5b89invirtio_net_vhost_status(n=0x559d703a6aa0, status=15 '\017') at../hw/net/virtio-net.c:311#140x0000559d6dbb5e34invirtio_net_set_status(vdev=0x559d703a6aa0, status=15 '\017') at../hw/net/virtio-net.c:392#150x0000559d6dbb60d8invirtio_net_set_link_status(nc=0x559d7048d890) at../hw/net/virtio-net.c:455
#160x0000559d6da64863inqmp_set_link(name=0x559d6f0b83d0 "hostnet1", up=true, errp=0x7ffdd76569f0) at../net/net.c:1459#170x0000559d6da7226einnet_vhost_user_event(opaque=0x559d6f0b83d0, event=CHR_EVENT_OPENED) at../net/vhost-user.c:301#180x0000559d6ddc7f63inchr_be_event(s=0x559d6f2ffea0, event=CHR_EVENT_OPENED) at../chardev/char.c:62
#190x0000559d6ddc7fdcinqemu_chr_be_event(s=0x559d6f2ffea0, event=CHR_EVENT_OPENED) at../chardev/char.c:82This issue causes guest kernel stop kicking device and traffic stop.
Add
vhost_startedcheck invirtio_net_handle_tx_bhto fix this wrongVRING_USED_F_NO_NOTIFYset.Signed-off-by Yajun Wu <[email protected]>Reviewed-by Jiri Pirko <[email protected]>---
hw/net/virtio-net.c| 4 ++++1 file changed, 4 insertions(+)hw/net/virtio-net.c +0
-0@@ -2865,6 +2865,10 @@ static voidvirtio_net_handle_tx_bh (VirtIODevice *vdev, VirtQueue *vq) VirtIONet *n = VIRTIO_NET(vdev); VirtIONetQueue *q = &n->vqs[vq2q(virtio_get_queue_index(vq))];
Quoted 3 lines
Quoted 2 lines
hw/net/virtio-net.c static void virtio_net_handle_tx_bh(VirtIODevice *vdev, VirtQueue *vq) · line 2868
Quoted 1 line
hw/net/virtio-net.c +1
-0+ if (n->vhost_started) {Since you mentioned "in a very rare case", maybe use
unlikely()?Ack.
Thanks, queued squashing:
- if (n->vhost_started) {
+ if (unlikely(n->vhost_started)) {
return;
}Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
hw/net/virtio-net.c +3
-0+ return; + } + if (unlikely((n->status & VIRTIO_NET_S_LINK_UP) == 0)) { virtio_net_drop_tx_queue_data(vdev, vq);return;
02.04.2024 07:51, Yajun Wu:
Quoted 6 lines
When vhost-user or vhost-kernel is handling virtio net datapath, qemu should not touch used ring.
But with vhost-user socket reconnect scenario, in a very rare case (has pending kick event).
VRING_USED_F_NO_NOTIFYis set by qemu in following code path:
...
Quoted 4 lines
This issue causes guest kernel stop kicking device and traffic stop.
Add
vhost_startedcheck invirtio_net_handle_tx_bhto fix this wrongVRING_USED_F_NO_NOTIFYset.
This seems to be qemu-stable material, even if the case when the issue happens is "very rare", -- is it not?
Thanks,
/mjt
Quoted 21 lines
Signed-off-by Yajun Wu <[email protected]>Reviewed-by Jiri Pirko <[email protected]>--- hw/net/virtio-net.c | 4 ++++ 1 file changed, 4 insertions(+)hw/net/virtio-net.c +4
-0@@ -2865,6 +2865,10 @@ static void virtio_net_handle_tx_bh(VirtIODevice *vdev, VirtQueue *vq)VirtIONet *n =VIRTIO_NET (vdev);VirtIONetQueue *q = &n->vqs[vq2q (virtio_get_queue_index (vq))]; +if (n->vhost_started) { +return ; + } +if (unlikely ((n->status &VIRTIO_NET_S_LINK_UP ) ==0 )) {virtio_net_drop_tx_queue_data (vdev, vq);return ;
Quoted 10 lines · Michael Tokarev
External email: Use caution opening links or attachments
02.04.2024 07:51, Yajun Wu:
Quoted 6 lines
When vhost-user or vhost-kernel is handling virtio net datapath, qemu should not touch used ring.
But with vhost-user socket reconnect scenario, in a very rare case (has pending kick event).
VRING_USED_F_NO_NOTIFYis set by qemu in following code path:
Quoted 7 lines
...
Quoted 4 lines
This issue causes guest kernel stop kicking device and traffic stop.
Add
vhost_startedcheck invirtio_net_handle_tx_bhto fix this wrongVRING_USED_F_NO_NOTIFYset.This seems to be qemu-stable material, even if the case when the issue happens is "very rare", -- is it not?
If you mean this fix needs back port to previous version? Yes.
Quoted 25 lines
Thanks,
/mjt
Quoted 21 lines
Signed-off-by Yajun Wu <[email protected]>Reviewed-by Jiri Pirko <[email protected]>--- hw/net/virtio-net.c | 4 ++++ 1 file changed, 4 insertions(+)hw/net/virtio-net.c +4
-0@@ -2865,6 +2865,10 @@ static void virtio_net_handle_tx_bh(VirtIODevice *vdev, VirtQueue *vq)VirtIONet *n =VIRTIO_NET (vdev);VirtIONetQueue *q = &n->vqs[vq2q (virtio_get_queue_index (vq))]; +if (n->vhost_started) { +return ; + } +if (unlikely ((n->status &VIRTIO_NET_S_LINK_UP ) ==0 )) {virtio_net_drop_tx_queue_data (vdev, vq);return ;