在 2022/9/12 01:22, Kangjie Xu 写道:
> Support queue_enable in vhost-kernel scenario. It can be called when
> a vq reset operation has been performed and the vq is restared.
>
> It should be noted that we can restart the vq when the vhost has
> already started. When launching a new vhost device, the vhost is not
> started and all vqs are not initalized until VIRTIO_PCI_COMMON_STATUS
> is written. Thus, we should use vhost_started to differentiate the
> two cases: vq reset and device start.
>
> Currently it only supports vhost-kernel.
>
> Signed-off-by: Kangjie Xu <kangjie.xu@linux.alibaba.com>
> Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
Acked-by: Jason Wang <jasowang@redhat.com>
> ---
> hw/net/virtio-net.c | 21 +++++++++++++++++++++
> 1 file changed, 21 insertions(+)
>
> diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
> index d774a3e652..7817206596 100644
> --- a/hw/net/virtio-net.c
> +++ b/hw/net/virtio-net.c
> @@ -557,6 +557,26 @@ static void virtio_net_queue_reset(VirtIODevice *vdev, uint32_t queue_index)
> flush_or_purge_queued_packets(nc);
> }
>
> +static void virtio_net_queue_enable(VirtIODevice *vdev, uint32_t queue_index)
> +{
> + VirtIONet *n = VIRTIO_NET(vdev);
> + NetClientState *nc = qemu_get_subqueue(n->nic, vq2q(queue_index));
> + int r;
> +
> + if (!nc->peer || !vdev->vhost_started) {
> + return;
> + }
> +
> + if (get_vhost_net(nc->peer) &&
> + nc->peer->info->type == NET_CLIENT_DRIVER_TAP) {
> + r = vhost_net_virtqueue_restart(vdev, nc, queue_index);
> + if (r < 0) {
> + error_report("unable to restart vhost net virtqueue: %d, "
> + "when resetting the queue", queue_index);
> + }
> + }
> +}
> +
> static void virtio_net_reset(VirtIODevice *vdev)
> {
> VirtIONet *n = VIRTIO_NET(vdev);
> @@ -3802,6 +3822,7 @@ static void virtio_net_class_init(ObjectClass *klass, void *data)
> vdc->bad_features = virtio_net_bad_features;
> vdc->reset = virtio_net_reset;
> vdc->queue_reset = virtio_net_queue_reset;
> + vdc->queue_enable = virtio_net_queue_enable;
> 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;