From nobody Wed Dec 24 08:07:44 2025 Received: from SHSQR01.spreadtrum.com (mx1.unisoc.com [222.66.158.135]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 102A454F82 for ; Mon, 29 Jan 2024 08:54:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=222.66.158.135 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706518500; cv=none; b=tumjvvdtgEep9ai6MwRA93/k22tWKJ/i6cEXq1MkEC2q3KXkfcsSJ6HYsOk+qnR1kFFQ9fGP6+JXJsc+PcmuzzatR620RymH5decBEAF2zgF4mfU5vSTiBa5lpxmgbV/6knNIJ405eDzMZQXXQJVRXeps//NH8vgsYpi2MGQChc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706518500; c=relaxed/simple; bh=Ey0T0NpVcUZVPAB7X0i7MndAEhRfLqJyUuHr9Wwueak=; h=From:To:CC:Subject:Date:Message-ID:MIME-Version:Content-Type; b=PVVCCh2oDVV2QdoS7HZ4j+Whk9A8jQm8LHmO6yeMJBLstuM+vbMZHJt5GazGRCwtsuEbbwWgrSawxw8H/BMCWpTXinFbjACHLpvph6XpIfx0xL4FJUdjF9uDc6AdC+FWU4JJM76kpmri4fChSRYFJAMtH2bxOZ82fNjdQeH0L8M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=unisoc.com; spf=pass smtp.mailfrom=unisoc.com; arc=none smtp.client-ip=222.66.158.135 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=unisoc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=unisoc.com Received: from dlp.unisoc.com ([10.29.3.86]) by SHSQR01.spreadtrum.com with ESMTP id 40T8quam034189; Mon, 29 Jan 2024 16:52:56 +0800 (+08) (envelope-from Yi.Sun@unisoc.com) Received: from SHDLP.spreadtrum.com (bjmbx01.spreadtrum.com [10.0.64.7]) by dlp.unisoc.com (SkyGuard) with ESMTPS id 4TNhhL73qlz2S36N9; Mon, 29 Jan 2024 16:45:22 +0800 (CST) Received: from tj10379pcu.spreadtrum.com (10.5.32.15) by BJMBX01.spreadtrum.com (10.0.64.7) with Microsoft SMTP Server (TLS) id 15.0.1497.23; Mon, 29 Jan 2024 16:52:53 +0800 From: Yi Sun To: , , , CC: , , , , , , , , Subject: [PATCH V2] virtio-blk: Ensure no requests in virtqueues before deleting vqs. Date: Mon, 29 Jan 2024 16:52:50 +0800 Message-ID: <20240129085250.1550594-1-yi.sun@unisoc.com> X-Mailer: git-send-email 2.25.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SHCAS03.spreadtrum.com (10.0.1.207) To BJMBX01.spreadtrum.com (10.0.64.7) X-MAIL: SHSQR01.spreadtrum.com 40T8quam034189 Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Stefan Hajnoczi --- drivers/block/virtio_blk.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 *vde= v) { struct virtio_blk *vblk =3D vdev->priv; =20 + /* 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); =20 /* Make sure no work handler is accessing the device. */ flush_work(&vblk->config_work); =20 - blk_mq_quiesce_queue(vblk->disk->queue); - vdev->config->del_vqs(vdev); kfree(vblk->vqs); =20 @@ -1620,7 +1621,7 @@ static int virtblk_restore(struct virtio_device *vdev) =20 virtio_device_ready(vdev); =20 - blk_mq_unquiesce_queue(vblk->disk->queue); + blk_mq_unfreeze_queue(vblk->disk->queue); return 0; } #endif --=20 2.25.1