From: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
To: qemu-devel@nongnu.org
Cc: "Michael S. Tsirkin" <mst@redhat.com>,
Jason Wang <jasowang@redhat.com>,
Alexander Bulekov <alxndr@bu.edu>
Subject: [PATCH v1 2/2] virtio-net: virtio_net_flush_tx() check for per-queue reset
Date: Sun, 29 Jan 2023 10:51:50 +0800 [thread overview]
Message-ID: <20230129025150.119972-3-xuanzhuo@linux.alibaba.com> (raw)
In-Reply-To: <20230129025150.119972-1-xuanzhuo@linux.alibaba.com>
Check whether it is per-queue reset state in virtio_net_flush_tx().
Before per-queue reset, we need to recover async tx resources. At this
time, virtio_net_flush_tx() is called, but we should not try to send
new packets, so virtio_net_flush_tx() should check the current
per-queue reset state.
Fixes: 7dc6be52 ("virtio-net: support queue reset")
Fixes: https://gitlab.com/qemu-project/qemu/-/issues/1451
Reported-by: Alexander Bulekov <alxndr@bu.edu>
Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
---
hw/net/virtio-net.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index 3ae909041a..fba6451a50 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -2627,7 +2627,8 @@ static int32_t virtio_net_flush_tx(VirtIONetQueue *q)
VirtQueueElement *elem;
int32_t num_packets = 0;
int queue_index = vq2q(virtio_get_queue_index(q->tx_vq));
- if (!(vdev->status & VIRTIO_CONFIG_S_DRIVER_OK)) {
+ if (!(vdev->status & VIRTIO_CONFIG_S_DRIVER_OK) ||
+ virtio_queue_reset_state(q->tx_vq)) {
return num_packets;
}
--
2.32.0.3.g01195cf9f
next prev parent reply other threads:[~2023-01-29 2:52 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-29 2:51 [PATCH v1 0/2] virtio: fix for assertion failure: virtio_net_get_subqueue(nc)->async_tx.elem failed Xuan Zhuo
2023-01-29 2:51 ` [PATCH v1 1/2] virtio: struct VirtQueue introduce reset Xuan Zhuo
2023-01-29 7:12 ` Michael S. Tsirkin
2023-01-29 7:15 ` Xuan Zhuo
2023-01-29 7:37 ` Michael S. Tsirkin
2023-01-29 7:39 ` Xuan Zhuo
2023-01-29 2:51 ` Xuan Zhuo [this message]
2023-01-29 6:23 ` [PATCH v1 2/2] virtio-net: virtio_net_flush_tx() check for per-queue reset Jason Wang
2023-01-29 7:43 ` Xuan Zhuo
2023-01-30 3:01 ` Jason Wang
2023-01-30 3:38 ` Xuan Zhuo
2023-01-30 3:53 ` Jason Wang
2023-01-30 5:50 ` Michael S. Tsirkin
2023-01-30 8:41 ` Jason Wang
2023-01-29 7:25 ` Michael S. Tsirkin
2023-01-29 7:28 ` Xuan Zhuo
2023-01-29 8:12 ` Michael S. Tsirkin
2023-01-29 8:23 ` Xuan Zhuo
2023-01-29 11:57 ` Michael S. Tsirkin
2023-01-29 12:03 ` Xuan Zhuo
2023-01-29 12:15 ` Michael S. Tsirkin
2023-01-29 12:28 ` Xuan Zhuo
2023-01-30 2:15 ` Xuan Zhuo
2023-01-30 5:32 ` Michael S. Tsirkin
2023-01-30 7:49 ` Jason Wang
2023-01-30 7:53 ` Xuan Zhuo
2023-01-30 8:40 ` Jason Wang
2023-01-30 10:24 ` Xuan Zhuo
2023-01-31 3:27 ` Jason Wang
2023-01-31 7:17 ` Xuan Zhuo
2023-01-31 7:38 ` Xuan Zhuo
2023-01-29 7:26 ` [PATCH v1 0/2] virtio: fix for assertion failure: virtio_net_get_subqueue(nc)->async_tx.elem failed Michael S. Tsirkin
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=20230129025150.119972-3-xuanzhuo@linux.alibaba.com \
--to=xuanzhuo@linux.alibaba.com \
--cc=alxndr@bu.edu \
--cc=jasowang@redhat.com \
--cc=mst@redhat.com \
--cc=qemu-devel@nongnu.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).