提交 436c15ab 编写于 作者: S Sagi Grimberg

mtip32xx: quiesce request queues to make sure no submissions are inflight

Unlike blk_mq_stop_hw_queues, blk_mq_quiesce_queue respects the
submission path rcu grace. quiesce the queue before iterating
on live tags, or performing device io quiescing.

While were at it, verify that the request started in mtip_abort_cmd
amd mtip_queue_cmd tag iteration calls.
Reviewed-by: NMing Lei <ming.lei@redhat.com>
Signed-off-by: NSagi Grimberg <sagi@grimberg.me>
上级 b52c2e92
...@@ -950,7 +950,7 @@ static int mtip_quiesce_io(struct mtip_port *port, unsigned long timeout) ...@@ -950,7 +950,7 @@ static int mtip_quiesce_io(struct mtip_port *port, unsigned long timeout)
unsigned long to; unsigned long to;
bool active = true; bool active = true;
blk_mq_stop_hw_queues(port->dd->queue); blk_mq_quiesce_queue(port->dd->queue);
to = jiffies + msecs_to_jiffies(timeout); to = jiffies + msecs_to_jiffies(timeout);
do { do {
...@@ -970,10 +970,10 @@ static int mtip_quiesce_io(struct mtip_port *port, unsigned long timeout) ...@@ -970,10 +970,10 @@ static int mtip_quiesce_io(struct mtip_port *port, unsigned long timeout)
break; break;
} while (time_before(jiffies, to)); } while (time_before(jiffies, to));
blk_mq_start_stopped_hw_queues(port->dd->queue, true); blk_mq_unquiesce_queue(port->dd->queue);
return active ? -EBUSY : 0; return active ? -EBUSY : 0;
err_fault: err_fault:
blk_mq_start_stopped_hw_queues(port->dd->queue, true); blk_mq_unquiesce_queue(port->dd->queue);
return -EFAULT; return -EFAULT;
} }
...@@ -2737,6 +2737,9 @@ static void mtip_abort_cmd(struct request *req, void *data, ...@@ -2737,6 +2737,9 @@ static void mtip_abort_cmd(struct request *req, void *data,
struct mtip_cmd *cmd = blk_mq_rq_to_pdu(req); struct mtip_cmd *cmd = blk_mq_rq_to_pdu(req);
struct driver_data *dd = data; struct driver_data *dd = data;
if (!blk_mq_request_started(req))
return;
dbg_printk(MTIP_DRV_NAME " Aborting request, tag = %d\n", req->tag); dbg_printk(MTIP_DRV_NAME " Aborting request, tag = %d\n", req->tag);
clear_bit(req->tag, dd->port->cmds_to_issue); clear_bit(req->tag, dd->port->cmds_to_issue);
...@@ -2749,6 +2752,9 @@ static void mtip_queue_cmd(struct request *req, void *data, ...@@ -2749,6 +2752,9 @@ static void mtip_queue_cmd(struct request *req, void *data,
{ {
struct driver_data *dd = data; struct driver_data *dd = data;
if (!blk_mq_request_started(req))
return;
set_bit(req->tag, dd->port->cmds_to_issue); set_bit(req->tag, dd->port->cmds_to_issue);
blk_abort_request(req); blk_abort_request(req);
} }
...@@ -2814,6 +2820,8 @@ static int mtip_service_thread(void *data) ...@@ -2814,6 +2820,8 @@ static int mtip_service_thread(void *data)
dev_warn(&dd->pdev->dev, dev_warn(&dd->pdev->dev,
"Completion workers still active!"); "Completion workers still active!");
blk_mq_quiesce_queue(dd->queue);
spin_lock(dd->queue->queue_lock); spin_lock(dd->queue->queue_lock);
blk_mq_tagset_busy_iter(&dd->tags, blk_mq_tagset_busy_iter(&dd->tags,
mtip_queue_cmd, dd); mtip_queue_cmd, dd);
...@@ -2826,6 +2834,8 @@ static int mtip_service_thread(void *data) ...@@ -2826,6 +2834,8 @@ static int mtip_service_thread(void *data)
mtip_abort_cmd, dd); mtip_abort_cmd, dd);
clear_bit(MTIP_PF_TO_ACTIVE_BIT, &dd->port->flags); clear_bit(MTIP_PF_TO_ACTIVE_BIT, &dd->port->flags);
blk_mq_unquiesce_queue(dd->queue);
} }
if (test_bit(MTIP_PF_ISSUE_CMDS_BIT, &port->flags)) { if (test_bit(MTIP_PF_ISSUE_CMDS_BIT, &port->flags)) {
...@@ -3995,8 +4005,9 @@ static int mtip_block_remove(struct driver_data *dd) ...@@ -3995,8 +4005,9 @@ static int mtip_block_remove(struct driver_data *dd)
dd->disk->disk_name); dd->disk->disk_name);
blk_freeze_queue_start(dd->queue); blk_freeze_queue_start(dd->queue);
blk_mq_stop_hw_queues(dd->queue); blk_mq_quiesce_queue(dd->queue);
blk_mq_tagset_busy_iter(&dd->tags, mtip_no_dev_cleanup, dd); blk_mq_tagset_busy_iter(&dd->tags, mtip_no_dev_cleanup, dd);
blk_mq_unquiesce_queue(dd->queue);
/* /*
* Delete our gendisk structure. This also removes the device * Delete our gendisk structure. This also removes the device
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册