From: Ming Lei <ming.lei@redhat.com>
To: Jens Axboe <axboe@kernel.dk>, Christoph Hellwig <hch@lst.de>,
Sagi Grimberg <sagi@grimberg.me>, Keith Busch <kbusch@kernel.org>,
linux-nvme@lists.infradead.org
Cc: Yi Zhang <yi.zhang@redhat.com>,
linux-block@vger.kernel.org, Chunguang Xu <brookxu.cn@gmail.com>,
Ming Lei <ming.lei@redhat.com>
Subject: [PATCH 3/4] nvme: unfreeze queues before removing namespaces
Date: Thu, 15 Jun 2023 22:32:35 +0800 [thread overview]
Message-ID: <20230615143236.297456-4-ming.lei@redhat.com> (raw)
In-Reply-To: <20230615143236.297456-1-ming.lei@redhat.com>
If removal is from breaking error recovery, queues may be frozen, and
there may be pending IOs in bio_queue_enter(), and the following
del_gendisk() may wait for these IOs, especially from writeback.
Similar IO hang exists in flushing scan work too if there are pending
IO in scan work context.
Fix the kind of issue by unfreezing queues before removing namespace,
so that all pending IOs can be handled.
Reported-by: Chunguang Xu <brookxu.cn@gmail.com>
https://lore.kernel.org/linux-nvme/cover.1685350577.git.chunguang.xu@shopee.com/
Reported-by: Yi Zhang <yi.zhang@redhat.com>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
---
drivers/nvme/host/core.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 96785913845b..ec7bd33b7e5f 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -4645,6 +4645,9 @@ void nvme_remove_namespaces(struct nvme_ctrl *ctrl)
*/
nvme_mpath_clear_ctrl_paths(ctrl);
+ /* unfreeze queues which may be frozen from error recovery */
+ nvme_unfreeze_force(ctrl);
+
/* prevent racing with ns scanning */
flush_work(&ctrl->scan_work);
--
2.40.1
next prev parent reply other threads:[~2023-06-15 14:33 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-15 14:32 [PATCH 0/4] nvme: fix two kinds of IO hang from removing NSs Ming Lei
2023-06-15 14:32 ` [PATCH 1/4] blk-mq: add API of blk_mq_unfreeze_queue_force Ming Lei
2023-06-15 15:16 ` Keith Busch
2023-06-15 15:43 ` Ming Lei
2023-06-16 5:48 ` Christoph Hellwig
2023-06-16 7:20 ` Ming Lei
2023-06-16 7:27 ` Christoph Hellwig
2023-06-16 7:33 ` Ming Lei
2023-06-20 5:41 ` Christoph Hellwig
2023-06-20 10:01 ` Sagi Grimberg
2023-06-20 13:15 ` Ming Lei
2023-06-15 14:32 ` [PATCH 2/4] nvme: add nvme_unfreeze_force() Ming Lei
2023-06-15 14:32 ` Ming Lei [this message]
2023-06-15 14:32 ` [PATCH 4/4] nvme: unquiesce io queues when removing namespaces Ming Lei
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230615143236.297456-4-ming.lei@redhat.com \
--to=ming.lei@redhat.com \
--cc=axboe@kernel.dk \
--cc=brookxu.cn@gmail.com \
--cc=hch@lst.de \
--cc=kbusch@kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=sagi@grimberg.me \
--cc=yi.zhang@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox