* [PATCH RESENT] nvme-pci: introduce RECONNECTING state to mark initializing procedure
@ 2018-01-22 14:03 Jianchao Wang
2018-01-23 13:33 ` Sagi Grimberg
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Jianchao Wang @ 2018-01-22 14:03 UTC (permalink / raw)
To: keith.busch, axboe, hch, sagi, maxg, james.smart; +Cc: linux-nvme, linux-kernel
After Sagi's commit (nvme-rdma: fix concurrent reset and reconnect),
both nvme-fc/rdma have following pattern:
RESETTING - quiesce blk-mq queues, teardown and delete queues/
connections, clear out outstanding IO requests...
RECONNECTING - establish new queues/connections and some other
initializing things.
Introduce RECONNECTING to nvme-pci transport to do the same mark.
Then we get a coherent state definition among nvme pci/rdma/fc
transports.
Suggested-by: James Smart <james.smart@broadcom.com>
Reviewed-by: James Smart <james.smart@broadcom.com>
Signed-off-by: Jianchao Wang <jianchao.w.wang@oracle.com>
---
drivers/nvme/host/core.c | 2 +-
drivers/nvme/host/pci.c | 19 +++++++++++++++++--
2 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 230cc09..23b3e53 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -242,7 +242,7 @@ bool nvme_change_ctrl_state(struct nvme_ctrl *ctrl,
switch (new_state) {
case NVME_CTRL_ADMIN_ONLY:
switch (old_state) {
- case NVME_CTRL_RESETTING:
+ case NVME_CTRL_RECONNECTING:
changed = true;
/* FALLTHRU */
default:
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 45f843d..05344be 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -1138,9 +1138,14 @@ static bool nvme_should_reset(struct nvme_dev *dev, u32 csts)
*/
bool nssro = dev->subsystem && (csts & NVME_CSTS_NSSRO);
- /* If there is a reset ongoing, we shouldn't reset again. */
- if (dev->ctrl.state == NVME_CTRL_RESETTING)
+ /* If there is a reset/reinit ongoing, we shouldn't reset again. */
+ switch (dev->ctrl.state) {
+ case NVME_CTRL_RESETTING:
+ case NVME_CTRL_RECONNECTING:
return false;
+ default:
+ break;
+ }
/* We shouldn't reset unless the controller is on fatal error state
* _or_ if we lost the communication with it.
@@ -2304,6 +2309,16 @@ static void nvme_reset_work(struct work_struct *work)
if (dev->ctrl.ctrl_config & NVME_CC_ENABLE)
nvme_dev_disable(dev, false);
+ /*
+ * Introduce RECONNECTING state from nvme-fc/rdma transports to mark the
+ * initializing procedure here.
+ */
+ if (!nvme_change_ctrl_state(&dev->ctrl, NVME_CTRL_RECONNECTING)) {
+ dev_warn(dev->ctrl.device,
+ "failed to mark controller RECONNECTING\n");
+ goto out;
+ }
+
result = nvme_pci_enable(dev);
if (result)
goto out;
--
2.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH RESENT] nvme-pci: introduce RECONNECTING state to mark initializing procedure
2018-01-22 14:03 [PATCH RESENT] nvme-pci: introduce RECONNECTING state to mark initializing procedure Jianchao Wang
@ 2018-01-23 13:33 ` Sagi Grimberg
2018-01-25 2:33 ` jianchao.wang
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Sagi Grimberg @ 2018-01-23 13:33 UTC (permalink / raw)
To: Jianchao Wang, keith.busch, axboe, hch, maxg, james.smart
Cc: linux-nvme, linux-kernel
This looks fine to me, but we need Keith to ack on this.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH RESENT] nvme-pci: introduce RECONNECTING state to mark initializing procedure
2018-01-22 14:03 [PATCH RESENT] nvme-pci: introduce RECONNECTING state to mark initializing procedure Jianchao Wang
2018-01-23 13:33 ` Sagi Grimberg
@ 2018-01-25 2:33 ` jianchao.wang
2018-01-25 21:45 ` Keith Busch
2018-01-26 7:12 ` Christoph Hellwig
3 siblings, 0 replies; 5+ messages in thread
From: jianchao.wang @ 2018-01-25 2:33 UTC (permalink / raw)
To: keith.busch, axboe, hch, sagi, maxg, james.smart; +Cc: linux-kernel, linux-nvme
Hi Keith
If you have time, can have a look at this.
That's really appreciated and thanks in advance.
:)
Jianchao
On 01/22/2018 10:03 PM, Jianchao Wang wrote:
> After Sagi's commit (nvme-rdma: fix concurrent reset and reconnect),
> both nvme-fc/rdma have following pattern:
> RESETTING - quiesce blk-mq queues, teardown and delete queues/
> connections, clear out outstanding IO requests...
> RECONNECTING - establish new queues/connections and some other
> initializing things.
> Introduce RECONNECTING to nvme-pci transport to do the same mark.
> Then we get a coherent state definition among nvme pci/rdma/fc
> transports.
>
> Suggested-by: James Smart <james.smart@broadcom.com>
> Reviewed-by: James Smart <james.smart@broadcom.com>
> Signed-off-by: Jianchao Wang <jianchao.w.wang@oracle.com>
> ---
> drivers/nvme/host/core.c | 2 +-
> drivers/nvme/host/pci.c | 19 +++++++++++++++++--
> 2 files changed, 18 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
> index 230cc09..23b3e53 100644
> --- a/drivers/nvme/host/core.c
> +++ b/drivers/nvme/host/core.c
> @@ -242,7 +242,7 @@ bool nvme_change_ctrl_state(struct nvme_ctrl *ctrl,
> switch (new_state) {
> case NVME_CTRL_ADMIN_ONLY:
> switch (old_state) {
> - case NVME_CTRL_RESETTING:
> + case NVME_CTRL_RECONNECTING:
> changed = true;
> /* FALLTHRU */
> default:
> diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
> index 45f843d..05344be 100644
> --- a/drivers/nvme/host/pci.c
> +++ b/drivers/nvme/host/pci.c
> @@ -1138,9 +1138,14 @@ static bool nvme_should_reset(struct nvme_dev *dev, u32 csts)
> */
> bool nssro = dev->subsystem && (csts & NVME_CSTS_NSSRO);
>
> - /* If there is a reset ongoing, we shouldn't reset again. */
> - if (dev->ctrl.state == NVME_CTRL_RESETTING)
> + /* If there is a reset/reinit ongoing, we shouldn't reset again. */
> + switch (dev->ctrl.state) {
> + case NVME_CTRL_RESETTING:
> + case NVME_CTRL_RECONNECTING:
> return false;
> + default:
> + break;
> + }
>
> /* We shouldn't reset unless the controller is on fatal error state
> * _or_ if we lost the communication with it.
> @@ -2304,6 +2309,16 @@ static void nvme_reset_work(struct work_struct *work)
> if (dev->ctrl.ctrl_config & NVME_CC_ENABLE)
> nvme_dev_disable(dev, false);
>
> + /*
> + * Introduce RECONNECTING state from nvme-fc/rdma transports to mark the
> + * initializing procedure here.
> + */
> + if (!nvme_change_ctrl_state(&dev->ctrl, NVME_CTRL_RECONNECTING)) {
> + dev_warn(dev->ctrl.device,
> + "failed to mark controller RECONNECTING\n");
> + goto out;
> + }
> +
> result = nvme_pci_enable(dev);
> if (result)
> goto out;
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH RESENT] nvme-pci: introduce RECONNECTING state to mark initializing procedure
2018-01-22 14:03 [PATCH RESENT] nvme-pci: introduce RECONNECTING state to mark initializing procedure Jianchao Wang
2018-01-23 13:33 ` Sagi Grimberg
2018-01-25 2:33 ` jianchao.wang
@ 2018-01-25 21:45 ` Keith Busch
2018-01-26 7:12 ` Christoph Hellwig
3 siblings, 0 replies; 5+ messages in thread
From: Keith Busch @ 2018-01-25 21:45 UTC (permalink / raw)
To: Jianchao Wang
Cc: axboe, hch, sagi, maxg, james.smart, linux-nvme, linux-kernel
On Mon, Jan 22, 2018 at 10:03:16PM +0800, Jianchao Wang wrote:
> After Sagi's commit (nvme-rdma: fix concurrent reset and reconnect),
> both nvme-fc/rdma have following pattern:
> RESETTING - quiesce blk-mq queues, teardown and delete queues/
> connections, clear out outstanding IO requests...
> RECONNECTING - establish new queues/connections and some other
> initializing things.
> Introduce RECONNECTING to nvme-pci transport to do the same mark.
> Then we get a coherent state definition among nvme pci/rdma/fc
> transports.
>
> Suggested-by: James Smart <james.smart@broadcom.com>
> Reviewed-by: James Smart <james.smart@broadcom.com>
> Signed-off-by: Jianchao Wang <jianchao.w.wang@oracle.com>
This looks fine. Thank you for your patience.
Reviewed-by: Keith Busch <keith.busch@intel.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH RESENT] nvme-pci: introduce RECONNECTING state to mark initializing procedure
2018-01-22 14:03 [PATCH RESENT] nvme-pci: introduce RECONNECTING state to mark initializing procedure Jianchao Wang
` (2 preceding siblings ...)
2018-01-25 21:45 ` Keith Busch
@ 2018-01-26 7:12 ` Christoph Hellwig
3 siblings, 0 replies; 5+ messages in thread
From: Christoph Hellwig @ 2018-01-26 7:12 UTC (permalink / raw)
To: Jianchao Wang
Cc: keith.busch, axboe, hch, sagi, maxg, james.smart, linux-nvme,
linux-kernel
Thanks,
applied to nvme-4.16.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-01-26 7:12 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-01-22 14:03 [PATCH RESENT] nvme-pci: introduce RECONNECTING state to mark initializing procedure Jianchao Wang
2018-01-23 13:33 ` Sagi Grimberg
2018-01-25 2:33 ` jianchao.wang
2018-01-25 21:45 ` Keith Busch
2018-01-26 7:12 ` Christoph Hellwig
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).