From: Himanshu Madhani <himanshu.madhani@oracle.com>
To: Hannes Reinecke <hare@suse.de>, Christoph Hellwig <hch@lst.de>
Cc: Sagi Grimberg <sagi@grimberg.me>,
Keith Busch <keith.busch@wdc.com>,
James Smart <james.smart@broadcom.com>,
linux-nvme@lists.infradead.org
Subject: Re: [PATCH] nvme/fc: Short-circuit reconnect retries
Date: Fri, 21 May 2021 12:28:30 -0500 [thread overview]
Message-ID: <18ffaa95-62c3-323b-5f7e-79ee469b5f87@oracle.com> (raw)
In-Reply-To: <20210521082300.146648-1-hare@suse.de>
On 5/21/21 3:23 AM, Hannes Reinecke wrote:
> Returning an nvme status from nvme_fc_create_association() indicates
> that the association is established, and we should honour the DNR bit.
> If it's set a reconnect attempt will just return the same error, so
> we can short-circuit the reconnect attempts and fail the connection
> directly.
>
> Signed-off-by: Hannes Reinecke <hare@suse.de>
> ---
> drivers/nvme/host/fc.c | 25 +++++++++++++++++--------
> 1 file changed, 17 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c
> index d9ab9e7871d0..b16acab5d8d8 100644
> --- a/drivers/nvme/host/fc.c
> +++ b/drivers/nvme/host/fc.c
> @@ -3095,6 +3095,7 @@ nvme_fc_create_association(struct nvme_fc_ctrl *ctrl)
> if (ctrl->ctrl.icdoff) {
> dev_err(ctrl->ctrl.device, "icdoff %d is not supported!\n",
> ctrl->ctrl.icdoff);
> + ret = NVME_SC_INVALID_FIELD | NVME_SC_DNR;
> goto out_disconnect_admin_queue;
> }
>
> @@ -3102,6 +3103,7 @@ nvme_fc_create_association(struct nvme_fc_ctrl *ctrl)
> if (!(ctrl->ctrl.sgls & ((1 << 0) | (1 << 1)))) {
> dev_err(ctrl->ctrl.device,
> "Mandatory sgls are not supported!\n");
> + ret = NVME_SC_INVALID_FIELD | NVME_SC_DNR;
> goto out_disconnect_admin_queue;
> }
>
> @@ -3268,11 +3270,13 @@ nvme_fc_reconnect_or_delete(struct nvme_fc_ctrl *ctrl, int status)
> if (ctrl->ctrl.state != NVME_CTRL_CONNECTING)
> return;
>
> - if (portptr->port_state == FC_OBJSTATE_ONLINE)
> + if (portptr->port_state == FC_OBJSTATE_ONLINE) {
> dev_info(ctrl->ctrl.device,
> "NVME-FC{%d}: reset: Reconnect attempt failed (%d)\n",
> ctrl->cnum, status);
> - else if (time_after_eq(jiffies, rport->dev_loss_end))
> + if (status > 0 && (status & NVME_SC_DNR))
> + recon = false;
> + } else if (time_after_eq(jiffies, rport->dev_loss_end))
> recon = false;
>
> if (recon && nvmf_should_reconnect(&ctrl->ctrl)) {
> @@ -3286,12 +3290,17 @@ nvme_fc_reconnect_or_delete(struct nvme_fc_ctrl *ctrl, int status)
>
> queue_delayed_work(nvme_wq, &ctrl->connect_work, recon_delay);
> } else {
> - if (portptr->port_state == FC_OBJSTATE_ONLINE)
> - dev_warn(ctrl->ctrl.device,
> - "NVME-FC{%d}: Max reconnect attempts (%d) "
> - "reached.\n",
> - ctrl->cnum, ctrl->ctrl.nr_reconnects);
> - else
> + if (portptr->port_state == FC_OBJSTATE_ONLINE) {
> + if (status > 0 && (status & NVME_SC_DNR))
> + dev_warn(ctrl->ctrl.device,
> + "NVME-FC{%d}: reconnect failure\n",
> + ctrl->cnum);
> + else
> + dev_warn(ctrl->ctrl.device,
> + "NVME-FC{%d}: Max reconnect attempts "
> + "(%d) reached.\n",
> + ctrl->cnum, ctrl->ctrl.nr_reconnects);
> + } else
> dev_warn(ctrl->ctrl.device,
> "NVME-FC{%d}: dev_loss_tmo (%d) expired "
> "while waiting for remoteport connectivity.\n",
>
Looks Good to me.
Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
--
Himanshu Madhani Oracle Linux Engineering
_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme
next prev parent reply other threads:[~2021-05-21 17:29 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-21 8:23 [PATCH] nvme/fc: Short-circuit reconnect retries Hannes Reinecke
2021-05-21 17:28 ` Himanshu Madhani [this message]
2021-05-21 20:17 ` Sagi Grimberg
2021-05-21 20:48 ` James Smart
2021-05-22 9:48 ` Hannes Reinecke
2021-05-25 7:24 ` Christoph Hellwig
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=18ffaa95-62c3-323b-5f7e-79ee469b5f87@oracle.com \
--to=himanshu.madhani@oracle.com \
--cc=hare@suse.de \
--cc=hch@lst.de \
--cc=james.smart@broadcom.com \
--cc=keith.busch@wdc.com \
--cc=linux-nvme@lists.infradead.org \
--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