[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 12/15] virtio-net: support queue reset
From: |
Xuan Zhuo |
Subject: |
[PATCH v6 12/15] virtio-net: support queue reset |
Date: |
Mon, 17 Oct 2022 17:25:55 +0800 |
virtio-net and vhost-kernel implement queue reset.
Queued packets in the corresponding queue pair are flushed
or purged.
For virtio-net, userspace datapath will be disabled later in
__virtio_queue_reset(). It will set addr of vring to 0 and idx to 0.
Thus, virtio_net_receive() and virtio_net_flush_tx() will not receive
or send packets.
For vhost-net, the datapath will be disabled in vhost_net_virtqueue_reset().
Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
Signed-off-by: Kangjie Xu <kangjie.xu@linux.alibaba.com>
Acked-by: Jason Wang <jasowang@redhat.com>
---
hw/net/virtio-net.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index 4ace57fa6d..8feeb032b4 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -546,6 +546,23 @@ static RxFilterInfo
*virtio_net_query_rxfilter(NetClientState *nc)
return info;
}
+static void virtio_net_queue_reset(VirtIODevice *vdev, uint32_t queue_index)
+{
+ VirtIONet *n = VIRTIO_NET(vdev);
+ NetClientState *nc = qemu_get_subqueue(n->nic, vq2q(queue_index));
+
+ if (!nc->peer) {
+ return;
+ }
+
+ if (get_vhost_net(nc->peer) &&
+ nc->peer->info->type == NET_CLIENT_DRIVER_TAP) {
+ vhost_net_virtqueue_reset(vdev, nc, queue_index);
+ }
+
+ flush_or_purge_queued_packets(nc);
+}
+
static void virtio_net_reset(VirtIODevice *vdev)
{
VirtIONet *n = VIRTIO_NET(vdev);
@@ -3784,6 +3801,7 @@ static void virtio_net_class_init(ObjectClass *klass,
void *data)
vdc->set_features = virtio_net_set_features;
vdc->bad_features = virtio_net_bad_features;
vdc->reset = virtio_net_reset;
+ vdc->queue_reset = virtio_net_queue_reset;
vdc->set_status = virtio_net_set_status;
vdc->guest_notifier_mask = virtio_net_guest_notifier_mask;
vdc->guest_notifier_pending = virtio_net_guest_notifier_pending;
--
2.32.0.3.g01195cf9f
- [PATCH v6 00/15] Support VIRTIO_F_RING_RESET for virtio-net, vhost-net kernel in virtio pci-modern, Xuan Zhuo, 2022/10/17
- [PATCH v6 02/15] virtio: introduce virtio_queue_reset(), Xuan Zhuo, 2022/10/17
- [PATCH v6 01/15] virtio: introduce __virtio_queue_reset(), Xuan Zhuo, 2022/10/17
- [PATCH v6 08/15] vhost: expose vhost_virtqueue_stop(), Xuan Zhuo, 2022/10/17
- [PATCH v6 07/15] vhost: expose vhost_virtqueue_start(), Xuan Zhuo, 2022/10/17
- [PATCH v6 11/15] virtio-net: introduce flush_or_purge_queued_packets(), Xuan Zhuo, 2022/10/17
- [PATCH v6 03/15] virtio: introduce virtio_queue_enable(), Xuan Zhuo, 2022/10/17
- [PATCH v6 12/15] virtio-net: support queue reset,
Xuan Zhuo <=
- [PATCH v6 04/15] virtio: core: vq reset feature negotation support, Xuan Zhuo, 2022/10/17
- [PATCH v6 14/15] vhost: vhost-kernel: enable vq reset feature, Xuan Zhuo, 2022/10/17
- [PATCH v6 15/15] virtio-net: enable vq reset feature, Xuan Zhuo, 2022/10/17
- [PATCH v6 10/15] vhost-net: vhost-kernel: introduce vhost_net_virtqueue_restart(), Xuan Zhuo, 2022/10/17
- [PATCH v6 13/15] virtio-net: support queue_enable, Xuan Zhuo, 2022/10/17
- [PATCH v6 06/15] virtio-pci: support queue enable, Xuan Zhuo, 2022/10/17
- [PATCH v6 09/15] vhost-net: vhost-kernel: introduce vhost_net_virtqueue_reset(), Xuan Zhuo, 2022/10/17
- [PATCH v6 05/15] virtio-pci: support queue reset, Xuan Zhuo, 2022/10/17