From: jsmart2021@gmail.com (jsmart2021@gmail.com)
Subject: [RFC 4/7] nvme_fc: check connectivity before initiating reconnects
Date: Thu, 4 May 2017 11:07:34 -0700 [thread overview]
Message-ID: <20170504180737.5472-5-jsmart2021@gmail.com> (raw)
In-Reply-To: <20170504180737.5472-1-jsmart2021@gmail.com>
From: James Smart <jsmart2021@gmail.com>
check remoteport connectivity before initiating reconnects
Signed-off-by: James Smart <james.smart at broadcom.com>
---
drivers/nvme/host/fc.c | 37 +++++++++++++++++++++++++++++++------
1 file changed, 31 insertions(+), 6 deletions(-)
diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c
index a975a48f00a5..419d4a85218d 100644
--- a/drivers/nvme/host/fc.c
+++ b/drivers/nvme/host/fc.c
@@ -586,6 +586,19 @@ nvme_fc_unregister_remoteport(struct nvme_fc_remote_port *portptr)
}
EXPORT_SYMBOL_GPL(nvme_fc_unregister_remoteport);
+static inline bool
+nvme_fc_rport_is_online(struct nvme_fc_rport *rport)
+{
+ unsigned long flags;
+ bool online;
+
+ spin_lock_irqsave(&rport->lock, flags);
+ online = (rport->remoteport.port_state == FC_OBJSTATE_ONLINE);
+ spin_unlock_irqrestore(&rport->lock, flags);
+
+ return online;
+}
+
/* *********************** FC-NVME DMA Handling **************************** */
@@ -2318,6 +2331,9 @@ nvme_fc_create_association(struct nvme_fc_ctrl *ctrl)
++ctrl->ctrl.opts->nr_reconnects;
+ if (!nvme_fc_rport_is_online(ctrl->rport))
+ return -ENODEV;
+
/*
* Create the admin queue
*/
@@ -2619,6 +2635,12 @@ nvme_fc_reconnect_or_delete(struct nvme_fc_ctrl *ctrl, int status)
ctrl->cnum, status);
if (nvmf_should_reconnect(&ctrl->ctrl)) {
+ /*
+ * Only schedule the reconnect if the remote port is online
+ */
+ if (!nvme_fc_rport_is_online(ctrl->rport))
+ return;
+
dev_info(ctrl->ctrl.device,
"NVME-FC{%d}: Reconnect attempt in %d seconds.\n",
ctrl->cnum, ctrl->ctrl.opts->reconnect_delay);
@@ -2650,12 +2672,15 @@ nvme_fc_reset_ctrl_work(struct work_struct *work)
return;
}
- ret = nvme_fc_create_association(ctrl);
- if (ret)
- nvme_fc_reconnect_or_delete(ctrl, ret);
- else
- dev_info(ctrl->ctrl.device,
- "NVME-FC{%d}: controller reset complete\n", ctrl->cnum);
+ if (nvme_fc_rport_is_online(ctrl->rport)) {
+ ret = nvme_fc_create_association(ctrl);
+ if (ret)
+ nvme_fc_reconnect_or_delete(ctrl, ret);
+ else
+ dev_info(ctrl->ctrl.device,
+ "NVME-FC{%d}: controller reset complete\n",
+ ctrl->cnum);
+ }
}
/*
--
2.11.0
next prev parent reply other threads:[~2017-05-04 18:07 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-04 18:07 [RFC 0/7] nvme_fc: add dev_loss_tmo support jsmart2021
2017-05-04 18:07 ` [RFC 1/7] nvme_fc: change ctlr state assignments during reset/reconnect jsmart2021
2017-05-04 18:07 ` [RFC 2/7] nvme_fc: add a dev_loss_tmo field to the remoteport jsmart2021
2017-05-04 18:07 ` [RFC 3/7] nvme_fc: add dev_loss_tmo to controller jsmart2021
2017-05-04 18:07 ` jsmart2021 [this message]
2017-05-04 18:07 ` [RFC 5/7] nvme_fc: change failure code on remoteport connectivity loss jsmart2021
2017-05-04 18:07 ` [RFC 6/7] nvme_fc: move remote port get/put/free location jsmart2021
2017-05-04 18:07 ` [RFC 7/7] nvme_fc: add dev_loss_tmo timeout and remoteport resume support jsmart2021
2017-05-04 19:24 ` [RFC 0/7] nvme_fc: add dev_loss_tmo support James Smart
2017-05-04 21:07 ` Christoph Hellwig
2017-05-04 23:17 ` James Smart
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=20170504180737.5472-5-jsmart2021@gmail.com \
--to=jsmart2021@gmail.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 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.