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 74FED13B2B4; Tue, 27 Feb 2024 14:22:54 +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=1709043774; cv=none; b=o+FFd9e4vVx22aIocj+VTXJEUPaSM7UQihAaX0x09gnQwXEvQHwURWOR7Yexl46jX58/DtleMQ4Az2kiiMgzcD4D7ql4s2FSmnIEhw4jGBdXZXVkYe1s26T4Vqyl3ekbec79DRFE7QqpyFyBJmIDqUjM6b6GWMk8SMe91Gs30wU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709043774; c=relaxed/simple; bh=1KUkGq0/M78MDpNRqal4pWSU5RMCmSc71SUc1TMfbAA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QNKQRFbqNtdb9nL2jQ4z+5mlUjvViEW1/t2v4ExOLVPNcPimgXTiSAO9AROcZl9ZPPDLvNuRikVDb4eaeP1IoGGr4byhjPIbNnliQzwwlxZbk1srgtPK32oTvvxEN7aftgF+02Cv+cG9bWNnXoeemzgyiTybf+unVlSc/AYvpR8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ca5V/oQz; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="ca5V/oQz" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EA2A3C433C7; Tue, 27 Feb 2024 14:22:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1709043774; bh=1KUkGq0/M78MDpNRqal4pWSU5RMCmSc71SUc1TMfbAA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ca5V/oQz8glXBMI0I43/9TSrFX4JQQ7dyF9RVolr3CsEKLgxHRr0oJ4Bm8U2ayxS5 4b7PEAMkbTTmXo+9bViXHX4iWAEjDvN3TK/nmkdpVYPNHfV5XGLsunSx+ONUk/10kH g+IycOAOe7uoAS+CcdX3Sfwftj9+YWWJyzQDLrGw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yi Sun , Stefan Hajnoczi , Jens Axboe , Sasha Levin Subject: [PATCH 5.4 31/84] virtio-blk: Ensure no requests in virtqueues before deleting vqs. Date: Tue, 27 Feb 2024 14:26:58 +0100 Message-ID: <20240227131553.877565096@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240227131552.864701583@linuxfoundation.org> References: <20240227131552.864701583@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.4-stable review patch. If anyone has any objections, please let me know. ------------------ 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 9b3ea86c20e5e..3afc07b59477b 100644 --- a/drivers/block/virtio_blk.c +++ b/drivers/block/virtio_blk.c @@ -1063,14 +1063,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); @@ -1088,7 +1089,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