From: Kangjie Xu <kangjie.xu@linux.alibaba.com>
To: qemu-devel@nongnu.org
Cc: mst@redhat.com, jasowang@redhat.com, eduardo@habkost.net,
marcel.apfelbaum@gmail.com, f4bug@amsat.org,
wangyanan55@huawei.com, hengqi@linux.alibaba.com,
xuanzhuo@linux.alibaba.com
Subject: [PATCH v3 12/15] virtio-net: introduce flush_or_purge_queued_packets()
Date: Thu, 25 Aug 2022 16:08:55 +0800 [thread overview]
Message-ID: <c14beaa45cd29f8425d74c53ef11965979dbd6b0.1661414345.git.kangjie.xu@linux.alibaba.com> (raw)
In-Reply-To: <cover.1661414345.git.kangjie.xu@linux.alibaba.com>
Introduce the fucntion flush_or_purge_queued_packets(), it will be
used in device reset and virtqueue reset. Therefore, we extract the
common logic as a new function.
Signed-off-by: Kangjie Xu <kangjie.xu@linux.alibaba.com>
Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
---
hw/net/virtio-net.c | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index dd0d056fde..27b59c0ad6 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -118,6 +118,16 @@ static int vq2q(int queue_index)
return queue_index / 2;
}
+static void flush_or_purge_queued_packets(NetClientState *nc)
+{
+ if (!nc->peer) {
+ return;
+ }
+
+ qemu_flush_or_purge_queued_packets(nc->peer, true);
+ assert(!virtio_net_get_subqueue(nc)->async_tx.elem);
+}
+
/* TODO
* - we could suppress RX interrupt if we were so inclined.
*/
@@ -560,12 +570,7 @@ static void virtio_net_reset(VirtIODevice *vdev)
/* Flush any async TX */
for (i = 0; i < n->max_queue_pairs; i++) {
- NetClientState *nc = qemu_get_subqueue(n->nic, i);
-
- if (nc->peer) {
- qemu_flush_or_purge_queued_packets(nc->peer, true);
- assert(!virtio_net_get_subqueue(nc)->async_tx.elem);
- }
+ flush_or_purge_queued_packets(qemu_get_subqueue(n->nic, i));
}
}
--
2.32.0
next prev parent reply other threads:[~2022-08-25 8:23 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-25 8:08 [PATCH v3 00/15] Support VIRTIO_F_RING_RESET for virtio-net, vhost-net kernel in virtio pci-modern Kangjie Xu
2022-08-25 8:08 ` [PATCH v3 01/15] virtio: sync relevant definitions with linux Kangjie Xu
2022-09-05 4:56 ` Jason Wang
2022-08-25 8:08 ` [PATCH v3 02/15] virtio: introduce __virtio_queue_reset() Kangjie Xu
2022-08-25 8:08 ` [PATCH v3 03/15] virtio: introduce virtio_queue_reset() Kangjie Xu
2022-08-25 8:08 ` [PATCH v3 04/15] virtio: introduce virtio_queue_enable() Kangjie Xu
2022-08-25 8:08 ` [PATCH v3 05/15] virtio: core: vq reset feature negotation support Kangjie Xu
2022-08-25 8:08 ` [PATCH v3 06/15] virtio-pci: support queue reset Kangjie Xu
2022-09-05 7:59 ` Jason Wang
2022-08-25 8:08 ` [PATCH v3 07/15] virtio-pci: support queue enable Kangjie Xu
2022-09-05 8:00 ` Jason Wang
2022-08-25 8:08 ` [PATCH v3 08/15] vhost: extract the logic of unmapping the vrings and desc Kangjie Xu
2022-08-25 8:08 ` [PATCH v3 09/15] vhost: expose vhost_virtqueue_start() Kangjie Xu
2022-08-25 8:08 ` [PATCH v3 10/15] vhost-net: vhost-kernel: introduce vhost_net_virtqueue_reset() Kangjie Xu
2022-09-05 8:03 ` Jason Wang
2022-09-05 10:15 ` Kangjie Xu
2022-09-06 5:24 ` Jason Wang
2022-08-25 8:08 ` [PATCH v3 11/15] vhost-net: vhost-kernel: introduce vhost_net_virtqueue_restart() Kangjie Xu
2022-09-05 8:24 ` Jason Wang
2022-09-05 10:21 ` Kangjie Xu
2022-08-25 8:08 ` Kangjie Xu [this message]
2022-09-05 8:25 ` [PATCH v3 12/15] virtio-net: introduce flush_or_purge_queued_packets() Jason Wang
2022-08-25 8:08 ` [PATCH v3 13/15] virtio-net: support queue reset Kangjie Xu
2022-09-05 8:30 ` Jason Wang
2022-09-05 10:25 ` Kangjie Xu
2022-09-05 16:25 ` Kangjie Xu
2022-09-06 5:37 ` Jason Wang
2022-09-06 3:14 ` Kangjie Xu
2022-08-25 8:08 ` [PATCH v3 14/15] virtio-net: support queue_enable Kangjie Xu
2022-08-25 8:08 ` [PATCH v3 15/15] vhost: vhost-kernel: enable vq reset feature Kangjie Xu
2022-09-02 1:04 ` [PATCH v3 00/15] Support VIRTIO_F_RING_RESET for virtio-net, vhost-net kernel in virtio pci-modern Kangjie Xu
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=c14beaa45cd29f8425d74c53ef11965979dbd6b0.1661414345.git.kangjie.xu@linux.alibaba.com \
--to=kangjie.xu@linux.alibaba.com \
--cc=eduardo@habkost.net \
--cc=f4bug@amsat.org \
--cc=hengqi@linux.alibaba.com \
--cc=jasowang@redhat.com \
--cc=marcel.apfelbaum@gmail.com \
--cc=mst@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=wangyanan55@huawei.com \
--cc=xuanzhuo@linux.alibaba.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).