@@ -288,7 +288,7 @@ static bool bt_tags_iter(struct sbitmap *bitmap, unsigned int bitnr, void *data)
* test and set the bit before assining ->rqs[].
*/
rq = tags->rqs[bitnr];
- if (rq && blk_mq_request_started(rq))
+ if (rq)
return iter_data->fn(rq, iter_data->data, reserved);
return true;
@@ -299,7 +299,7 @@ static bool bt_tags_iter(struct sbitmap *bitmap, unsigned int bitnr, void *data)
* @tags: Tag map to iterate over.
* @bt: sbitmap to examine. This is either the breserved_tags member
* or the bitmap_tags member of struct blk_mq_tags.
- * @fn: Pointer to the function that will be called for each started
+ * @fn: Pointer to the function that will be called for each
* request. @fn will be called as follows: @fn(rq, @data,
* @reserved) where rq is a pointer to a request. Return true
* to continue iterating tags, false to stop.
@@ -322,9 +322,9 @@ static void bt_tags_for_each(struct blk_mq_tags *tags, struct sbitmap_queue *bt,
}
/**
- * blk_mq_all_tag_busy_iter - iterate over all started requests in a tag map
+ * blk_mq_all_tag_busy_iter - iterate over all requests in a tag map
* @tags: Tag map to iterate over.
- * @fn: Pointer to the function that will be called for each started
+ * @fn: Pointer to the function that will be called for each
* request. @fn will be called as follows: @fn(rq, @priv,
* reserved) where rq is a pointer to a request. 'reserved'
* indicates whether or not @rq is a reserved request. Return
@@ -340,9 +340,9 @@ static void blk_mq_all_tag_busy_iter(struct blk_mq_tags *tags,
}
/**
- * blk_mq_tagset_busy_iter - iterate over all started requests in a tag set
+ * blk_mq_tagset_busy_iter - iterate over all requests in a tag set
* @tagset: Tag set to iterate over.
- * @fn: Pointer to the function that will be called for each started
+ * @fn: Pointer to the function that will be called for each
* request. @fn will be called as follows: @fn(rq, @priv,
* reserved) where rq is a pointer to a request. 'reserved'
* indicates whether or not @rq is a reserved request. Return
@@ -2690,6 +2690,8 @@ static bool mtip_abort_cmd(struct request *req, void *data, bool reserved)
struct mtip_cmd *cmd = blk_mq_rq_to_pdu(req);
struct driver_data *dd = data;
+ if (blk_mq_rq_state(req) != MQ_RQ_IN_FLIGHT)
+ return true;
dbg_printk(MTIP_DRV_NAME " Aborting request, tag = %d\n", req->tag);
clear_bit(req->tag, dd->port->cmds_to_issue);
@@ -2702,6 +2704,8 @@ static bool mtip_queue_cmd(struct request *req, void *data, bool reserved)
{
struct driver_data *dd = data;
+ if (blk_mq_rq_state(req) != MQ_RQ_IN_FLIGHT)
+ return true;
set_bit(req->tag, dd->port->cmds_to_issue);
blk_abort_request(req);
return true;
@@ -3852,6 +3856,8 @@ static bool mtip_no_dev_cleanup(struct request *rq, void *data, bool reserv)
{
struct mtip_cmd *cmd = blk_mq_rq_to_pdu(rq);
+ if (blk_mq_rq_state(rq) != MQ_RQ_IN_FLIGHT)
+ return true;
cmd->status = BLK_STS_IOERR;
blk_mq_complete_request(rq);
return true;
@@ -739,6 +739,8 @@ static bool nbd_clear_req(struct request *req, void *data, bool reserved)
{
struct nbd_cmd *cmd = blk_mq_rq_to_pdu(req);
+ if (blk_mq_rq_state(req) != MQ_RQ_IN_FLIGHT)
+ return true;
cmd->status = BLK_STS_IOERR;
blk_mq_complete_request(req);
return true;
@@ -387,6 +387,8 @@ static bool skd_inc_in_flight(struct request *rq, void *data, bool reserved)
{
int *count = data;
+ if (blk_mq_rq_state(rq) != MQ_RQ_IN_FLIGHT)
+ return true;
count++;
return true;
}
@@ -1899,6 +1901,8 @@ static bool skd_recover_request(struct request *req, void *data, bool reserved)
struct skd_device *const skdev = data;
struct skd_request_context *skreq = blk_mq_rq_to_pdu(req);
+ if (blk_mq_rq_state(req) != MQ_RQ_IN_FLIGHT)
+ return true;
if (skreq->state != SKD_REQ_STATE_BUSY)
return true;
@@ -284,6 +284,8 @@ EXPORT_SYMBOL_GPL(nvme_complete_rq);
bool nvme_cancel_request(struct request *req, void *data, bool reserved)
{
+ if (blk_mq_rq_state(req) != MQ_RQ_IN_FLIGHT)
+ return true;
dev_dbg_ratelimited(((struct nvme_ctrl *) data)->device,
"Cancelling I/O %d", req->tag);
@@ -2373,6 +2373,8 @@ nvme_fc_terminate_exchange(struct request *req, void *data, bool reserved)
struct nvme_fc_ctrl *ctrl = to_fc_ctrl(nctrl);
struct nvme_fc_fcp_op *op = blk_mq_rq_to_pdu(req);
+ if (blk_mq_rq_state(req) != MQ_RQ_IN_FLIGHT)
+ return true;
__nvme_fc_abort_op(ctrl, op);
return true;
}
Let the driver's iterator callback decide what request state it should handle. While there may be other uses, the intention here is to allow drivers to terminate requests that have entered a dying queue without needing to unquiesce that queue. It also turns out no current callback wanted to see COMPLETED requests that were being returned before, so this also fixes that for all existing callback handlers. Signed-off-by: Keith Busch <keith.busch@intel.com> --- block/blk-mq-tag.c | 12 ++++++------ drivers/block/mtip32xx/mtip32xx.c | 6 ++++++ drivers/block/nbd.c | 2 ++ drivers/block/skd_main.c | 4 ++++ drivers/nvme/host/core.c | 2 ++ drivers/nvme/host/fc.c | 2 ++ 6 files changed, 22 insertions(+), 6 deletions(-)