Re: [PATCH v3 12/15] virtio-net: introduce flush_or_purge_queued_packets()

[Jason Wang]

在 2022/8/25 16:08, Kangjie Xu 写道:
> 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>


Acked-by: Jason Wang <jasowang@redhat.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));
>       }
>   }
>