Commit 2b053aca authored by Bart Van Assche's avatar Bart Van Assche Committed by Jens Axboe
Browse files

blk-mq: Add a kick_requeue_list argument to blk_mq_requeue_request() 



Most blk_mq_requeue_request() and blk_mq_add_to_requeue_list() calls
are followed by kicking the requeue list. Hence add an argument to
these two functions that allows to kick the requeue list. This was
proposed by Christoph Hellwig.

Signed-off-by: default avatarBart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: Hannes Reinecke <hare@suse.com>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 6a83e74d

block/blk-flush.c

+1 −4
Original line number Diff line number Diff line
@@ -134,10 +134,7 @@ static void blk_flush_restore_request(struct request *rq) 
static bool blk_flush_queue_rq(struct request *rq, bool add_front)

{

	if (rq->q->mq_ops) {

		struct request_queue *q = rq->q;



		blk_mq_add_to_requeue_list(rq, add_front);

		blk_mq_kick_requeue_list(q);

		blk_mq_add_to_requeue_list(rq, add_front, true);

		return false;

	} else {

		if (add_front)

block/blk-mq.c

+7 −3
Original line number Diff line number Diff line
@@ -492,12 +492,12 @@ static void __blk_mq_requeue_request(struct request *rq) 
	}

}



void blk_mq_requeue_request(struct request *rq)

void blk_mq_requeue_request(struct request *rq, bool kick_requeue_list)

{

	__blk_mq_requeue_request(rq);



	BUG_ON(blk_queued_rq(rq));

	blk_mq_add_to_requeue_list(rq, true);

	blk_mq_add_to_requeue_list(rq, true, kick_requeue_list);

}

EXPORT_SYMBOL(blk_mq_requeue_request);
@@ -531,7 +531,8 @@ static void blk_mq_requeue_work(struct work_struct *work) 
	blk_mq_run_hw_queues(q, false);

}



void blk_mq_add_to_requeue_list(struct request *rq, bool at_head)

void blk_mq_add_to_requeue_list(struct request *rq, bool at_head,

				bool kick_requeue_list)

{

	struct request_queue *q = rq->q;

	unsigned long flags;
@@ -550,6 +551,9 @@ void blk_mq_add_to_requeue_list(struct request *rq, bool at_head) 
		list_add_tail(&rq->queuelist, &q->requeue_list);

	}

	spin_unlock_irqrestore(&q->requeue_lock, flags);



	if (kick_requeue_list)

		blk_mq_kick_requeue_list(q);

}

EXPORT_SYMBOL(blk_mq_add_to_requeue_list);

drivers/block/xen-blkfront.c

+1 −1
Original line number Diff line number Diff line
@@ -2043,7 +2043,7 @@ static int blkif_recover(struct blkfront_info *info) 
		/* Requeue pending requests (flush or discard) */

		list_del_init(&req->queuelist);

		BUG_ON(req->nr_phys_segments > segs);

		blk_mq_requeue_request(req);

		blk_mq_requeue_request(req, false);

	}

	blk_mq_start_stopped_hw_queues(info->rq, true);

	blk_mq_kick_requeue_list(info->rq);

drivers/md/dm-rq.c

+1 −1
Original line number Diff line number Diff line
@@ -347,7 +347,7 @@ EXPORT_SYMBOL(dm_mq_kick_requeue_list); 


static void dm_mq_delay_requeue_request(struct request *rq, unsigned long msecs)

{

	blk_mq_requeue_request(rq);

	blk_mq_requeue_request(rq, false);

	__dm_mq_kick_requeue_list(rq->q, msecs);

}

drivers/nvme/host/core.c

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ void nvme_requeue_req(struct request *req) 
{

	unsigned long flags;



	blk_mq_requeue_request(req);

	blk_mq_requeue_request(req, false);

	spin_lock_irqsave(req->q->queue_lock, flags);

	if (!blk_queue_stopped(req->q))

		blk_mq_kick_requeue_list(req->q);

CRA Git | Maintained and supported by SUSTech CRA and CCSE