Commit d250bf4e authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

blk-mq: only iterate over inflight requests in blk_mq_tagset_busy_iter 



We already check for started commands in all callbacks, but we should
also protect against already completed commands.  Do this by taking
the checks to common code.

Acked-by: default avatarJosef Bacik <josef@toxicpanda.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 5e3c3a7e

block/blk-mq-tag.c

+1 −1
Original line number Diff line number Diff line
@@ -271,7 +271,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)

	if (rq && blk_mq_rq_state(rq) == MQ_RQ_IN_FLIGHT)

		iter_data->fn(rq, iter_data->data, reserved);



	return true;

drivers/block/mtip32xx/mtip32xx.c

+2 −10
Original line number Diff line number Diff line
@@ -2725,15 +2725,11 @@ static void mtip_softirq_done_fn(struct request *rq) 
	blk_mq_end_request(rq, cmd->status);

}



static void mtip_abort_cmd(struct request *req, void *data,

							bool reserved)

static void 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_request_started(req))

		return;



	dbg_printk(MTIP_DRV_NAME " Aborting request, tag = %d\n", req->tag);



	clear_bit(req->tag, dd->port->cmds_to_issue);
@@ -2741,14 +2737,10 @@ static void mtip_abort_cmd(struct request *req, void *data, 
	mtip_softirq_done_fn(req);

}



static void mtip_queue_cmd(struct request *req, void *data,

							bool reserved)

static void mtip_queue_cmd(struct request *req, void *data, bool reserved)

{

	struct driver_data *dd = data;



	if (!blk_mq_request_started(req))

		return;



	set_bit(req->tag, dd->port->cmds_to_issue);

	blk_abort_request(req);

}

drivers/block/nbd.c

+1 −4
Original line number Diff line number Diff line
@@ -676,11 +676,8 @@ static void recv_work(struct work_struct *work) 


static void nbd_clear_req(struct request *req, void *data, bool reserved)

{

	struct nbd_cmd *cmd;

	struct nbd_cmd *cmd = blk_mq_rq_to_pdu(req);



	if (!blk_mq_request_started(req))

		return;

	cmd = blk_mq_rq_to_pdu(req);

	cmd->status = BLK_STS_IOERR;

	blk_mq_complete_request(req);

}

drivers/nvme/host/core.c

+0 −3
Original line number Diff line number Diff line
@@ -242,9 +242,6 @@ EXPORT_SYMBOL_GPL(nvme_complete_rq); 


void nvme_cancel_request(struct request *req, void *data, bool reserved)

{

	if (!blk_mq_request_started(req))

		return;



	dev_dbg_ratelimited(((struct nvme_ctrl *) data)->device,

				"Cancelling I/O %d", req->tag);

drivers/nvme/host/fc.c

+0 −3
Original line number Diff line number Diff line
@@ -2393,9 +2393,6 @@ 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_request_started(req))

		return;



	__nvme_fc_abort_op(ctrl, op);

}