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

Commit 5d1b25c1 authored by Bart Van Assche's avatar Bart Van Assche Committed by Jens Axboe
Browse files

blk-mq: Introduce blk_mq_hctx_stopped() 



Multiple functions test the BLK_MQ_S_STOPPED bit so introduce
a helper function that performs this test.

Signed-off-by: default avatarBart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: default avatarMing Lei <tom.leiming@gmail.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent bc27c01b

block/blk-mq.c

+6 −6
Original line number Diff line number Diff line
@@ -785,7 +785,7 @@ static void __blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx) 
	struct list_head *dptr;

	int queued;



	if (unlikely(test_bit(BLK_MQ_S_STOPPED, &hctx->state)))

	if (unlikely(blk_mq_hctx_stopped(hctx)))

		return;



	WARN_ON(!cpumask_test_cpu(raw_smp_processor_id(), hctx->cpumask) &&
@@ -910,7 +910,7 @@ static int blk_mq_hctx_next_cpu(struct blk_mq_hw_ctx *hctx) 


void blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx, bool async)

{

	if (unlikely(test_bit(BLK_MQ_S_STOPPED, &hctx->state) ||

	if (unlikely(blk_mq_hctx_stopped(hctx) ||

		     !blk_mq_hw_queue_mapped(hctx)))

		return;
@@ -936,7 +936,7 @@ void blk_mq_run_hw_queues(struct request_queue *q, bool async) 
	queue_for_each_hw_ctx(q, hctx, i) {

		if ((!blk_mq_hctx_has_pending(hctx) &&

		    list_empty_careful(&hctx->dispatch)) ||

		    test_bit(BLK_MQ_S_STOPPED, &hctx->state))

		    blk_mq_hctx_stopped(hctx))

			continue;



		blk_mq_run_hw_queue(hctx, async);
@@ -986,7 +986,7 @@ void blk_mq_start_stopped_hw_queues(struct request_queue *q, bool async) 
	int i;



	queue_for_each_hw_ctx(q, hctx, i) {

		if (!test_bit(BLK_MQ_S_STOPPED, &hctx->state))

		if (!blk_mq_hctx_stopped(hctx))

			continue;



		clear_bit(BLK_MQ_S_STOPPED, &hctx->state);
@@ -1317,7 +1317,7 @@ static blk_qc_t blk_mq_make_request(struct request_queue *q, struct bio *bio) 
		blk_mq_put_ctx(data.ctx);

		if (!old_rq)

			goto done;

		if (test_bit(BLK_MQ_S_STOPPED, &data.hctx->state) ||

		if (blk_mq_hctx_stopped(data.hctx) ||

		    blk_mq_direct_issue_request(old_rq, &cookie) != 0)

			blk_mq_insert_request(old_rq, false, true, true);

		goto done;

block/blk-mq.h

+5 −0
Original line number Diff line number Diff line
@@ -100,6 +100,11 @@ static inline void blk_mq_set_alloc_data(struct blk_mq_alloc_data *data, 
	data->hctx = hctx;

}



static inline bool blk_mq_hctx_stopped(struct blk_mq_hw_ctx *hctx)

{

	return test_bit(BLK_MQ_S_STOPPED, &hctx->state);

}



static inline bool blk_mq_hw_queue_mapped(struct blk_mq_hw_ctx *hctx)

{

	return hctx->nr_ctx && hctx->tags;