From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 F30D912D767; Tue, 13 Feb 2024 00:24:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707783860; cv=none; b=ck9owwryqBj4oi1rBv7ADRh/vVobE4zLddG9BOkThQC+KVYYfT57iZRNqzKZ9w/8F/1y6wWX2Zp5kt9aGs1zXhJ3yZ61+LYVPxJVq0aAV3nrn8UtMnZ0wCp5Vm2FGsMofP5bDiUkS/YLh7kaDji/IPJ3sWWhW2HqC8I+UwO3rXM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707783860; c=relaxed/simple; bh=2mJR77cck9kn+VOxlHplT8gY5hst9Ugn7jOmNihCpxQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=upq/d9purSuRE+thzor4aH6IZGmRE4t+xbatUioLdFLmfAXp70CgqbdPz7bV5nFCf+0fxfCF+1aqncsgqBS63/fMjeECZP4BTIQc5UrOFB446szZZDAY/2YGxYaC/5/noL4x/gKW1+2sNrnoj5oyN91IMB449g88MVD6TQ1luoM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=grv68P33; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="grv68P33" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 384F2C43609; Tue, 13 Feb 2024 00:24:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1707783859; bh=2mJR77cck9kn+VOxlHplT8gY5hst9Ugn7jOmNihCpxQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=grv68P33V82secXx5wOSwNsNDHGJTE9LzPKBOrwDXMpD/CeKAe3T+v1CJIkveLm/F LKnVhkRd/WO++SETq4WrpAne+mfN68yUij6JTCvp/KK+ShVm0bHJr74svRuvptMjgU F/GSvCO94aCE8yuNY0ceewesZwBZ/FCVlseJTcCSy9l9fOPGE5weLy2CmcZwubdMkC mZSHa+TJ5sGUiVpjMLUr1Z5U1OUZJwJaA6RAspyn6j86u3s2u3zrRATvyfSuLTIddS BZbNI4fU9/yhWZWl9W2XD99LPcxqVgXLAFP7WzxPMmQtkJ70j6qVspyOWcH9t66zl+ SyytO0MMhYqnA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yi Sun , Stefan Hajnoczi , Jens Axboe , Sasha Levin , mst@redhat.com, jasowang@redhat.com, virtualization@lists.linux.dev, linux-block@vger.kernel.org Subject: [PATCH AUTOSEL 5.10 6/6] virtio-blk: Ensure no requests in virtqueues before deleting vqs. Date: Mon, 12 Feb 2024 19:24:08 -0500 Message-ID: <20240213002409.673084-6-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240213002409.673084-1-sashal@kernel.org> References: <20240213002409.673084-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.10.209 Content-Transfer-Encoding: 8bit From: Yi Sun [ Upstream commit 4ce6e2db00de8103a0687fb0f65fd17124a51aaa ] 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 Link: https://lore.kernel.org/r/20240129085250.1550594-1-yi.sun@unisoc.com Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- 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 9b54eec9b17e..7eae3f373233 100644 --- a/drivers/block/virtio_blk.c +++ b/drivers/block/virtio_blk.c @@ -952,14 +952,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 */ vdev->config->reset(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); @@ -977,7 +978,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.43.0