Received-SPF: pass (google.com: domain of linux-kernel+bounces-45326-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Precedence: bulk
MIME-Version: 1.0
References: <20240129085250.1550594-1-yi.sun@unisoc.com>
In-Reply-To: <20240129085250.1550594-1-yi.sun@unisoc.com>
From: Stefan Hajnoczi <stefanha@gmail.com>
Date: Tue, 30 Jan 2024 16:15:41 -0500
Message-ID: <CAJSP0QWLk_=Nm2aw+rwgg6L4CJPy6w--=SyF4vCU_sDCyQdosQ@mail.gmail.com>
Subject: Re: [PATCH V2] virtio-blk: Ensure no requests in virtqueues before
 deleting vqs.
To: Yi Sun <yi.sun@unisoc.com>
Cc: stefanha@redhat.com, mst@redhat.com, jasowang@redhat.com, axboe@kernel.dk, 
	sunyibuaa@gmail.com, hongyu.jin@unisoc.com, zhiguo.niu@unisoc.com, 
	xuanzhuo@linux.alibaba.com, pbonzini@redhat.com, 
	virtualization@lists.linux.dev, linux-block@vger.kernel.org, 
	linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"

On Mon, 29 Jan 2024 at 03:54, Yi Sun <yi.sun@unisoc.com> wrote:
>
> Ensure no remaining requests in virtqueues before resetting vdev and
> deleting virtqueues. Otherwise these requests will never be completed.
> It may cause the system to become unresponsive.
>
> Function blk_mq_quiesce_queue() can ensure that requests have become
> in_flight status, but it cannot guarantee that requests have been
> processed by the device. Virtqueues should never be deleted before
> all requests become complete status.
>
> Function blk_mq_freeze_queue() ensure that all requests in virtqueues
> become complete status. And no requests can enter in virtqueues.
>
> Signed-off-by: Yi Sun <yi.sun@unisoc.com>
> ---
>  drivers/block/virtio_blk.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>

>
> diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
> index 3b6b9abb8ce1..14ecc14ce8db 100644
> --- a/drivers/block/virtio_blk.c
> +++ b/drivers/block/virtio_blk.c
> @@ -1595,14 +1595,15 @@ static int virtblk_freeze(struct virtio_device *vdev)
>  {
>         struct virtio_blk *vblk = vdev->priv;
>
> +       /* Ensure no requests in virtqueues before deleting vqs. */
> +       blk_mq_freeze_queue(vblk->disk->queue);
> +
>         /* Ensure we don't receive any more interrupts */
>         virtio_reset_device(vdev);
>
>         /* Make sure no work handler is accessing the device. */
>         flush_work(&vblk->config_work);
>
> -       blk_mq_quiesce_queue(vblk->disk->queue);
> -
>         vdev->config->del_vqs(vdev);
>         kfree(vblk->vqs);
>
> @@ -1620,7 +1621,7 @@ static int virtblk_restore(struct virtio_device *vdev)
>
>         virtio_device_ready(vdev);
>
> -       blk_mq_unquiesce_queue(vblk->disk->queue);
> +       blk_mq_unfreeze_queue(vblk->disk->queue);
>         return 0;
>  }
>  #endif
> --
> 2.25.1
>
>