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 ACF23EAD0; Fri, 15 Nov 2024 06:49:23 +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=1731653363; cv=none; b=g3MsHxB6YoctXODmGvqYCJxIJ07UqIjq9lhX6kO/hDgbd8R8pHC1hNxHs0yliSbSOfwJYbVWyxWF3pdVqBCPsRTx2w/d78EHbkeAbDp9P3i2CR/WNdJeWl6k4LIxrBAnM0CW8lC2V1ONTH7DIZY7iagh1HfJpUnebScOsY3yMQA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731653363; c=relaxed/simple; bh=/j7oANDh/28SnyK0KQ05ah6F3aZ3dOVZk2uUEja1hmE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KhFahB4Ke7PadWybxCvXB5IuOoWH5/dsJVAEgTwX/7a0n8PLlM9qmidGs0Nz7frMlFwacOqo+lovuRfkl8lAdh5QJNLgEDlIQdTh3nWnOAbcEy0pVQNpc0Z/6XiPAuLcxZHYbIkzwuSy1zZVwGL6W8RsbUBarKMronqYrmgfGNM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=RYic/7yt; 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="RYic/7yt" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 11A2BC4CECF; Fri, 15 Nov 2024 06:49:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1731653363; bh=/j7oANDh/28SnyK0KQ05ah6F3aZ3dOVZk2uUEja1hmE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RYic/7ytgnh83TmngBI6jqhwkxwGevpuBFSOMjBXQCLfVWMkIkmeGXjih0UXUu4fQ sA4gvHz2Qsxj3ek4q/dBYjg2gYpe+1Su670bIebt3UcaqIwjnt+Szt313R9NlsthAK ddIRjTz3BSFR56VYk4Nw/LsrbiGjVkXbHujRbWuk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Christoph Hellwig , Nilay Shroff , Keith Busch , Sasha Levin Subject: [PATCH 6.11 31/63] nvme-loop: flush off pending I/O while shutting down loop controller Date: Fri, 15 Nov 2024 07:37:54 +0100 Message-ID: <20241115063727.043335695@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241115063725.892410236@linuxfoundation.org> References: <20241115063725.892410236@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 6.11-stable review patch. If anyone has any objections, please let me know. ------------------ 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