From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DF82BCF5396 for ; Wed, 23 Oct 2024 14:32:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=3Bwg3RwmnGrWF3oy8OX9NDLyp/753tQVV+kOiMa29FU=; b=O45XXyTbUSRE3A+t4JdCflst6t 35AymVpvM86PRK4a23T+0Qblky+zHQfXtXPphoibS9jpKVlfCXRfWI2tVsr6ydan+BvAM12OVGblC 4uZstG3cI7qQWciHed48BAF72vSA9En7o+pKLc5Jmn9R178V2JvVv5oSSfnVmu8QiC43uCaouVOab r1iMPT9B0tA1XbMRodEJqsFXzTx58pZtlmeNxn+QwbwE+Qr4vhr/DMnuAP8VxWs/wXwhbkRQIlg5V GjiKlaQHLxG3d/bLgAeVlx2YF1bz4CGvqQcGXX9d8UR9IQx0BkL7XgUAQTEzgt3uJuEGu9GktsQJZ CVfT8aPg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1t3cPR-0000000EiOI-2jt9; Wed, 23 Oct 2024 14:32:25 +0000 Received: from nyc.source.kernel.org ([147.75.193.91]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1t3cOA-0000000Ehse-0vhE for linux-nvme@lists.infradead.org; Wed, 23 Oct 2024 14:31:08 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 14D29A44F50; Wed, 23 Oct 2024 14:30:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E8963C4CEE5; Wed, 23 Oct 2024 14:31:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1729693864; bh=g43AfRYMdMX1ToPOcP7uPAFGnLXV5Stu3IUoyJcnHVg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nC3kD5bZH8bLo7fsT8IwOvcuXn065j7rZeW/1BS7sV6Vtew2R2ShtfEutJEd9inR+ grXRnwsWRG3cIrghqperDzGEOVl5mrTS+8938sRzpiEPDRgizvcMwsakm2GshoWFyi biAp7/AWDtBiY9E2jmuFs2OfALgHLzEKfqNdm1mj4Llghtv/cZcwxpe2/NJ3AbX8Z8 fvEnb3Skzy8ZqDMBCStXqS7jbADVdyCmJA5EZzaxSDWTgfErf5cSD/s6T5bYswR8Uv 1hY17hAsG2NlxHReQATtuG/FF1SKEIqldYRufo2HtIvO14pTGa4EhrJshQy63Y2kUr 6u9OtcZ+NQdtA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Nilay Shroff , Christoph Hellwig , Keith Busch , Sasha Levin , sagi@grimberg.me, kch@nvidia.com, linux-nvme@lists.infradead.org Subject: [PATCH AUTOSEL 6.11 29/30] nvme-loop: flush off pending I/O while shutting down loop controller Date: Wed, 23 Oct 2024 10:29:54 -0400 Message-ID: <20241023143012.2980728-29-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241023143012.2980728-1-sashal@kernel.org> References: <20241023143012.2980728-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.11.5 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241023_073106_375678_B6CA1DC0 X-CRM114-Status: GOOD ( 12.49 ) X-BeenThere: linux-nvme@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-nvme" Errors-To: linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org From: Nilay Shroff [ Upstream commit c199fac88fe7c749f88a0653e9f621b9f5a71cf1 ] While shutting down loop controller, we first quiesce the admin/IO queue, delete the admin/IO tag-set and then at last destroy the admin/IO queue. However it's quite possible that during the window between quiescing and destroying of the admin/IO queue, some admin/IO request might sneak in and if that happens then we could potentially encounter a hung task because shutdown operation can't forward progress until any pending I/O is flushed off. This commit helps ensure that before destroying the admin/IO queue, we unquiesce the admin/IO queue so that any outstanding requests, which are added after the admin/IO queue is quiesced, are now flushed to its completion. Reviewed-by: Christoph Hellwig Signed-off-by: Nilay Shroff Signed-off-by: Keith Busch Signed-off-by: Sasha Levin --- drivers/nvme/target/loop.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/drivers/nvme/target/loop.c b/drivers/nvme/target/loop.c index e32790d8fc260..a9d112d34d4f4 100644 --- a/drivers/nvme/target/loop.c +++ b/drivers/nvme/target/loop.c @@ -265,6 +265,13 @@ static void nvme_loop_destroy_admin_queue(struct nvme_loop_ctrl *ctrl) { if (!test_and_clear_bit(NVME_LOOP_Q_LIVE, &ctrl->queues[0].flags)) return; + /* + * It's possible that some requests might have been added + * after admin queue is stopped/quiesced. So now start the + * queue to flush these requests to the completion. + */ + nvme_unquiesce_admin_queue(&ctrl->ctrl); + nvmet_sq_destroy(&ctrl->queues[0].nvme_sq); nvme_remove_admin_tag_set(&ctrl->ctrl); } @@ -297,6 +304,12 @@ static void nvme_loop_destroy_io_queues(struct nvme_loop_ctrl *ctrl) nvmet_sq_destroy(&ctrl->queues[i].nvme_sq); } ctrl->ctrl.queue_count = 1; + /* + * It's possible that some requests might have been added + * after io queue is stopped/quiesced. So now start the + * queue to flush these requests to the completion. + */ + nvme_unquiesce_io_queues(&ctrl->ctrl); } static int nvme_loop_init_io_queues(struct nvme_loop_ctrl *ctrl) -- 2.43.0