From: sagi@grimberg.me (Sagi Grimberg)
Subject: [PATCH v2 5/5] nvme-rdma: Make sure to shutdown the controller if we can
Date: Tue, 2 Aug 2016 10:53:39 +0300 [thread overview]
Message-ID: <1470124419-30405-6-git-send-email-sagi@grimberg.me> (raw)
In-Reply-To: <1470124419-30405-1-git-send-email-sagi@grimberg.me>
Relying on ctrl state in nvme_rdma_shutdown_ctrl is wrong because
it will never be NVME_CTRL_LIVE (delete_ctrl or reset_ctrl invoked it).
Instead, check that the admin queue is connected. Note that it is safe
because we can never see a copmeting thread trying to destroy the admin
queue (reset or delete controller).
Signed-off-by: Sagi Grimberg <sagi at grimberg.me>
---
drivers/nvme/host/rdma.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
index f31915696421..ef821592b791 100644
--- a/drivers/nvme/host/rdma.c
+++ b/drivers/nvme/host/rdma.c
@@ -1644,7 +1644,7 @@ static void nvme_rdma_shutdown_ctrl(struct nvme_rdma_ctrl *ctrl)
nvme_rdma_free_io_queues(ctrl);
}
- if (ctrl->ctrl.state == NVME_CTRL_LIVE)
+ if (test_bit(NVME_RDMA_Q_CONNECTED, &ctrl->queues[0].flags))
nvme_shutdown_ctrl(&ctrl->ctrl);
blk_mq_stop_hw_queues(ctrl->ctrl.admin_q);
--
1.9.1
next prev parent reply other threads:[~2016-08-02 7:53 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-02 7:53 [PATCH v2 0/5] Some fabrics fixes Sagi Grimberg
2016-08-02 7:53 ` [PATCH v2 1/5] nvme-rdma: Fix device removal handling Sagi Grimberg
2016-08-02 7:53 ` [PATCH v2 2/5] nvme-rdma: Remove duplicate call to nvme_remove_namespaces Sagi Grimberg
2016-08-03 9:03 ` Christoph Hellwig
2016-08-02 7:53 ` [PATCH v2 3/5] nvme-rdma: Free the I/O tags when we delete the controller Sagi Grimberg
2016-08-03 9:03 ` Christoph Hellwig
2016-08-02 7:53 ` [PATCH v2 4/5] nvme-loop: Remove duplicate call to nvme_remove_namespaces Sagi Grimberg
2016-08-03 9:03 ` Christoph Hellwig
2016-08-02 7:53 ` Sagi Grimberg [this message]
2016-08-03 9:04 ` [PATCH v2 5/5] nvme-rdma: Make sure to shutdown the controller if we can 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=1470124419-30405-6-git-send-email-sagi@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).