From: Daniel Wagner <dwagner@suse.de>
To: linux-nvme@lists.infradead.org
Cc: linux-kernel@vger.kernel.org,
James Smart <james.smart@broadcom.com>,
Keith Busch <kbusch@kernel.org>, Jens Axboe <axboe@fb.com>,
Ming Lei <ming.lei@redhat.com>, Sagi Grimberg <sagi@grimberg.me>,
Daniel Wagner <dwagner@suse.de>
Subject: [PATCH 2/2] nvme-fc: Wait with a timeout for queue to freeze
Date: Fri, 25 Jun 2021 12:16:49 +0200 [thread overview]
Message-ID: <20210625101649.49296-3-dwagner@suse.de> (raw)
In-Reply-To: <20210625101649.49296-1-dwagner@suse.de>
Do not wait indifinitly for all queues to freeze. Instead use a
timeout and abort the operation if we get stuck.
Signed-off-by: Daniel Wagner <dwagner@suse.de>
---
drivers/nvme/host/fc.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c
index a9645cd89eca..d8db85aa5417 100644
--- a/drivers/nvme/host/fc.c
+++ b/drivers/nvme/host/fc.c
@@ -2955,7 +2955,14 @@ nvme_fc_recreate_io_queues(struct nvme_fc_ctrl *ctrl)
dev_info(ctrl->ctrl.device,
"reconnect: revising io queue count from %d to %d\n",
prior_ioq_cnt, nr_io_queues);
- nvme_wait_freeze(&ctrl->ctrl);
+ if (!nvme_wait_freeze_timeout(&ctrl->ctrl, NVME_IO_TIMEOUT)) {
+ /*
+ * If we timed out waiting for freeze we are likely to
+ * be stuck. Fail the controller initialization just
+ * to be safe.
+ */
+ return -ENODEV;
+ }
blk_mq_update_nr_hw_queues(&ctrl->tag_set, nr_io_queues);
nvme_unfreeze(&ctrl->ctrl);
}
--
2.29.2
_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme
next prev parent reply other threads:[~2021-06-25 10:46 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-25 10:16 [PATCH 0/2] Handle update hardware queues and queue freeze more carefully Daniel Wagner
2021-06-25 10:16 ` [PATCH 1/2] nvme-fc: Update hardware queues before using them Daniel Wagner
2021-06-27 13:47 ` James Smart
2021-06-29 1:32 ` Ming Lei
2021-06-29 12:31 ` Hannes Reinecke
2021-06-25 10:16 ` Daniel Wagner [this message]
2021-06-27 14:04 ` [PATCH 2/2] nvme-fc: Wait with a timeout for queue to freeze James Smart
2021-06-29 1:39 ` Ming Lei
2021-06-29 7:48 ` Daniel Wagner
2021-07-05 16:34 ` Daniel Wagner
2021-07-06 7:29 ` Ming Lei
2021-07-06 8:10 ` Daniel Wagner
2021-07-06 8:45 ` Ming Lei
2021-07-06 8:59 ` Daniel Wagner
2021-07-06 12:21 ` Daniel Wagner
2021-07-07 2:46 ` Ming Lei
2021-06-29 12:31 ` Hannes Reinecke
2021-06-25 12:21 ` [PATCH 0/2] Handle update hardware queues and queue freeze more carefully Daniel Wagner
2021-06-25 13:00 ` Ming Lei
2021-06-29 1:31 ` 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=20210625101649.49296-3-dwagner@suse.de \
--to=dwagner@suse.de \
--cc=axboe@fb.com \
--cc=james.smart@broadcom.com \
--cc=kbusch@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=ming.lei@redhat.com \
--cc=sagi@grimberg.me \
/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;
as well as URLs for NNTP newsgroup(s).