On Wed, Nov 28, 2018 at 03:31:46PM -0700, Keith Busch wrote:
> Waiting for a freeze isn't really the criteria we need anyway: we don't
> care if there are entered requests in REQ_MQ_IDLE. We just want to wait
> for dispatched ones to return, and we currently don't have a good way
> to sync with that condition.
One thing making this weird is that blk_mq_request_started() returns true
for COMPLETED requests, and that makes no sense to me. Completed is
the opposite of started, so I'm not sure why we would return true for
such states. Is anyone actually depending on that?
If we can return true only for started commands, the following
implements the desired wait criteria:
---
diff --git a/block/blk-mq.c b/block/blk-mq.c
index a82830f39933..d0ef540711c7 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -647,7 +647,7 @@ EXPORT_SYMBOL(blk_mq_complete_request);
int blk_mq_request_started(struct request *rq)
{
- return blk_mq_rq_state(rq) != MQ_RQ_IDLE;
+ return blk_mq_rq_state(rq) == MQ_RQ_IN_FLIGHT;
}
EXPORT_SYMBOL_GPL(blk_mq_request_started);
diff --git a/drivers/nvme/target/loop.c b/drivers/nvme/target/loop.c
index 9908082b32c4..ae50b6ed95fb 100644
--- a/drivers/nvme/target/loop.c
+++ b/drivers/nvme/target/loop.c
@@ -14,6 +14,7 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/scatterlist.h>
#include <linux/blk-mq.h>
+#include <linux/delay.h>
#include <linux/nvme.h>
#include <linux/module.h>
#include <linux/parser.h>
@@ -425,12 +426,37 @@ static int nvme_loop_configure_admin_queue(struct nvme_loop_ctrl *ctrl)
return error;
}
+bool nvme_count_active(struct request *req, void *data, bool reserved)
+{
+ unsigned int *active = data;
+
+ (*active)++;
+ return true;
+}
+
+/*
+ * It is the backing device driver's responsibility to ensure all dispatched
+ * requests are eventually completed.
+ */
+static void nvme_wait_for_stopped(struct nvme_loop_ctrl *ctrl)
+{
+ unsigned int active;
+
+ do {
+ active = 0;
+ blk_mq_tagset_busy_iter(&ctrl->tag_set, nvme_count_active,
+ &active);
+ if (!active)
+ return;
+ msleep(100);
+ } while (true);
+}
+
static void nvme_loop_shutdown_ctrl(struct nvme_loop_ctrl *ctrl)
{
if (ctrl->ctrl.queue_count > 1) {
nvme_stop_queues(&ctrl->ctrl);
- blk_mq_tagset_busy_iter(&ctrl->tag_set,
- nvme_cancel_request, &ctrl->ctrl);
+ nvme_wait_for_stopped(ctrl);
nvme_loop_destroy_io_queues(ctrl);
}
--
