From: sagi@grimberg.me (Sagi Grimberg)
Subject: [PATCH 2/5] nvme: Ending failed unstarted requests
Date: Tue, 23 Jan 2018 15:09:40 +0200 [thread overview]
Message-ID: <9ef17f8b-d01d-74ef-32a5-e77f5dd669fd@grimberg.me> (raw)
In-Reply-To: <20180122215630.13697-2-keith.busch@intel.com>
> diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
> index 71070eedb773..e51a84d1d732 100644
> --- a/drivers/nvme/host/rdma.c
> +++ b/drivers/nvme/host/rdma.c
> @@ -966,11 +966,9 @@ static void nvme_rdma_error_recovery_work(struct work_struct *work)
> nvme_rdma_destroy_admin_queue(ctrl, false);
>
> /*
> - * queues are not a live anymore, so restart the queues to fail fast
> - * new IO
> + * queues are not a live anymore, so end all unstarted requests.
> */
> - blk_mq_unquiesce_queue(ctrl->ctrl.admin_q);
> - nvme_start_queues(&ctrl->ctrl);
> + nvme_end_requests(&ctrl->ctrl);
>
> nvme_rdma_reconnect_or_remove(ctrl);
> }
> @@ -1730,7 +1728,7 @@ static void nvme_rdma_shutdown_ctrl(struct nvme_rdma_ctrl *ctrl, bool shutdown)
>
> blk_mq_quiesce_queue(ctrl->ctrl.admin_q);
> nvme_cancel_admin_requests(&ctrl->ctrl);
> - blk_mq_unquiesce_queue(ctrl->ctrl.admin_q);
> + nvme_end_admin_requests(&ctrl->ctrl);
> nvme_rdma_destroy_admin_queue(ctrl, shutdown);
> }
I think we need to end_io_requests a little above as well.
next prev parent reply other threads:[~2018-01-23 13:09 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-22 21:56 [PATCH 1/5] nvme: Request cancelling helpers Keith Busch
2018-01-22 21:56 ` [PATCH 2/5] nvme: Ending failed unstarted requests Keith Busch
2018-01-23 2:15 ` jianchao.wang
2018-01-23 13:02 ` Sagi Grimberg
2018-01-23 13:09 ` jianchao.wang
2018-01-23 2:29 ` jianchao.wang
2018-01-23 13:07 ` Sagi Grimberg
2018-01-23 13:09 ` Sagi Grimberg [this message]
2018-01-22 21:56 ` [PATCH 3/5] nvme/pci: End stopped queue requests directly Keith Busch
2018-01-23 13:14 ` Sagi Grimberg
2018-01-22 21:56 ` [PATCH 4/5] nvme/pci: Remove cq_vector checks in io path Keith Busch
2018-01-22 21:56 ` [PATCH 5/5] nvme: Sync queues on controller resets Keith Busch
2018-01-23 12:45 ` [PATCH 1/5] nvme: Request cancelling helpers Sagi Grimberg
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=9ef17f8b-d01d-74ef-32a5-e77f5dd669fd@grimberg.me \
--to=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).