Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

blk-mq: pass a reserved argument to the timeout handler 



Allow blk-mq to pass an argument to the timeout handler to indicate
if we're timing out a reserved or regular command.  For many drivers
those need to be handled different.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 46f92d42

block/blk-mq.c

+3 −3
Original line number Diff line number Diff line
@@ -530,7 +530,7 @@ struct blk_mq_timeout_data { 
	unsigned int next_set;

};



static void blk_mq_rq_timed_out(struct request *req)

static void blk_mq_rq_timed_out(struct request *req, bool reserved)

{

	struct blk_mq_ops *ops = req->q->mq_ops;

	enum blk_eh_timer_return ret = BLK_EH_RESET_TIMER;
@@ -548,7 +548,7 @@ static void blk_mq_rq_timed_out(struct request *req) 
		return;



	if (ops->timeout)

		ret = ops->timeout(req);

		ret = ops->timeout(req, reserved);



	switch (ret) {

	case BLK_EH_HANDLED:
@@ -576,7 +576,7 @@ static void blk_mq_check_expired(struct blk_mq_hw_ctx *hctx, 


	if (time_after_eq(jiffies, rq->deadline)) {

		if (!blk_mark_rq_complete(rq))

			blk_mq_rq_timed_out(rq);

			blk_mq_rq_timed_out(rq, reserved);

	} else if (!data->next_set || time_after(data->next, rq->deadline)) {

		data->next = rq->deadline;

		data->next_set = 1;

drivers/scsi/scsi_lib.c

+9 −1
Original line number Diff line number Diff line
@@ -1932,6 +1932,14 @@ static int scsi_queue_rq(struct blk_mq_hw_ctx *hctx, struct request *req, 
	return ret;

}



static enum blk_eh_timer_return scsi_timeout(struct request *req,

		bool reserved)

{

	if (reserved)

		return BLK_EH_RESET_TIMER;

	return scsi_times_out(req);

}



static int scsi_init_request(void *data, struct request *rq,

		unsigned int hctx_idx, unsigned int request_idx,

		unsigned int numa_node)
@@ -2043,7 +2051,7 @@ static struct blk_mq_ops scsi_mq_ops = { 
	.map_queue	= blk_mq_map_queue,

	.queue_rq	= scsi_queue_rq,

	.complete	= scsi_softirq_done,

	.timeout	= scsi_times_out,

	.timeout	= scsi_timeout,

	.init_request	= scsi_init_request,

	.exit_request	= scsi_exit_request,

};

include/linux/blk-mq.h

+2 −1
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ struct blk_mq_tag_set { 


typedef int (queue_rq_fn)(struct blk_mq_hw_ctx *, struct request *, bool);

typedef struct blk_mq_hw_ctx *(map_queue_fn)(struct request_queue *, const int);

typedef enum blk_eh_timer_return (timeout_fn)(struct request *, bool);

typedef int (init_hctx_fn)(struct blk_mq_hw_ctx *, void *, unsigned int);

typedef void (exit_hctx_fn)(struct blk_mq_hw_ctx *, unsigned int);

typedef int (init_request_fn)(void *, struct request *, unsigned int,
@@ -103,7 +104,7 @@ struct blk_mq_ops { 
	/*

	 * Called on request timeout

	 */

	rq_timed_out_fn		*timeout;

	timeout_fn		*timeout;



	softirq_done_fn		*complete;