From: Hannes Reinecke <hare@suse.de> To: Daniel Wagner <dwagner@suse.de>, 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>, James Smart <jsmart2021@gmail.com> Subject: Re: [PATCH v2 4/5] nvme-fc: Wait with a timeout for queue to freeze Date: Thu, 8 Jul 2021 12:12:21 +0200 [thread overview] Message-ID: <bf265380-6164-2462-ff30-6144e9f9b2ea@suse.de> (raw) In-Reply-To: <20210708092755.15660-5-dwagner@suse.de> On 7/8/21 11:27 AM, Daniel Wagner wrote: > Do not wait indifinitly for all queues to freeze. Instead use a > timeout and abort the operation if we get stuck. > > Reviewed-by: James Smart <jsmart2021@gmail.com> > 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 d0eb81387d4e..8e1fc3796735 100644 > --- a/drivers/nvme/host/fc.c > +++ b/drivers/nvme/host/fc.c > @@ -2956,7 +2956,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; For controller reset we're using '-ENOTCONN'; maybe it's worthwhile to use the same error code here. But that's just a minor detail. > + } > blk_mq_update_nr_hw_queues(&ctrl->tag_set, nr_io_queues); > nvme_unfreeze(&ctrl->ctrl); > } > Reviewed-by: Hannes Reinecke <hare@suse.de> Cheers, Hannes -- Dr. Hannes Reinecke Kernel Storage Architect hare@suse.de +49 911 74053 688 SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg HRB 36809 (AG Nürnberg), Geschäftsführer: Felix Imendörffer
WARNING: multiple messages have this Message-ID (diff)
From: Hannes Reinecke <hare@suse.de> To: Daniel Wagner <dwagner@suse.de>, 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>, James Smart <jsmart2021@gmail.com> Subject: Re: [PATCH v2 4/5] nvme-fc: Wait with a timeout for queue to freeze Date: Thu, 8 Jul 2021 12:12:21 +0200 [thread overview] Message-ID: <bf265380-6164-2462-ff30-6144e9f9b2ea@suse.de> (raw) In-Reply-To: <20210708092755.15660-5-dwagner@suse.de> On 7/8/21 11:27 AM, Daniel Wagner wrote: > Do not wait indifinitly for all queues to freeze. Instead use a > timeout and abort the operation if we get stuck. > > Reviewed-by: James Smart <jsmart2021@gmail.com> > 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 d0eb81387d4e..8e1fc3796735 100644 > --- a/drivers/nvme/host/fc.c > +++ b/drivers/nvme/host/fc.c > @@ -2956,7 +2956,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; For controller reset we're using '-ENOTCONN'; maybe it's worthwhile to use the same error code here. But that's just a minor detail. > + } > blk_mq_update_nr_hw_queues(&ctrl->tag_set, nr_io_queues); > nvme_unfreeze(&ctrl->ctrl); > } > Reviewed-by: Hannes Reinecke <hare@suse.de> Cheers, Hannes -- Dr. Hannes Reinecke Kernel Storage Architect hare@suse.de +49 911 74053 688 SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg HRB 36809 (AG Nürnberg), Geschäftsführer: Felix Imendörffer _______________________________________________ Linux-nvme mailing list Linux-nvme@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-nvme
next prev parent reply other threads:[~2021-07-08 10:12 UTC|newest] Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-07-08 9:27 [PATCH v2 0/5] Handle update hardware queues and queue freeze more carefully Daniel Wagner 2021-07-08 9:27 ` Daniel Wagner 2021-07-08 9:27 ` [PATCH v2 1/5] nvme-fc: Update hardware queues before using them Daniel Wagner 2021-07-08 9:27 ` Daniel Wagner 2021-07-08 10:08 ` Hannes Reinecke 2021-07-08 10:08 ` Hannes Reinecke 2021-07-08 9:27 ` [PATCH v2 2/5] nvme-tcp: Update number of " Daniel Wagner 2021-07-08 9:27 ` Daniel Wagner 2021-07-08 9:27 ` [PATCH v2 3/5] nvme-rdma: " Daniel Wagner 2021-07-08 9:27 ` Daniel Wagner 2021-07-08 9:27 ` [PATCH v2 4/5] nvme-fc: Wait with a timeout for queue to freeze Daniel Wagner 2021-07-08 9:27 ` Daniel Wagner 2021-07-08 10:12 ` Hannes Reinecke [this message] 2021-07-08 10:12 ` Hannes Reinecke 2021-07-08 9:27 ` [PATCH v2 5/5] nvme-fc: Freeze queues before destroying them Daniel Wagner 2021-07-08 9:27 ` Daniel Wagner 2021-07-08 10:14 ` Hannes Reinecke 2021-07-08 10:14 ` Hannes Reinecke 2021-07-09 16:14 ` James Smart 2021-07-09 16:14 ` James Smart 2021-07-09 16:42 ` Daniel Wagner 2021-07-09 16:42 ` Daniel Wagner
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=bf265380-6164-2462-ff30-6144e9f9b2ea@suse.de \ --to=hare@suse.de \ --cc=axboe@fb.com \ --cc=dwagner@suse.de \ --cc=james.smart@broadcom.com \ --cc=jsmart2021@gmail.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.