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

Commit 9c621104 authored by Jens Axboe's avatar Jens Axboe
Browse files

blk-mq-sched: don't run the queue async from blk_mq_try_issue_directly() 



If we have scheduling enabled, we jump directly to insert-and-run.
That's fine, but we run the queue async and we don't pass in information
on whether we can block from this context or not. Fixup both these
cases.

Reviewed-by: default avatarBart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: default avatarOmar Sandoval <osandov@fb.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 4a3a485b

block/blk-mq.c

+5 −4
Original line number Original line Diff line number Diff line
@@ -1434,7 +1434,8 @@ static blk_qc_t request_to_qc_t(struct blk_mq_hw_ctx *hctx, struct request *rq) 
	return blk_tag_to_qc_t(rq->internal_tag, hctx->queue_num, true);

	return blk_tag_to_qc_t(rq->internal_tag, hctx->queue_num, true);

}

}





static void blk_mq_try_issue_directly(struct request *rq, blk_qc_t *cookie)

static void blk_mq_try_issue_directly(struct request *rq, blk_qc_t *cookie,

				      bool may_sleep)

{

{

	struct request_queue *q = rq->q;

	struct request_queue *q = rq->q;

	struct blk_mq_queue_data bd = {

	struct blk_mq_queue_data bd = {
@@ -1475,7 +1476,7 @@ static void blk_mq_try_issue_directly(struct request *rq, blk_qc_t *cookie) 
	}

	}





insert:

insert:

	blk_mq_sched_insert_request(rq, false, true, true, false);

	blk_mq_sched_insert_request(rq, false, true, false, may_sleep);

}

}





/*

/*
@@ -1569,11 +1570,11 @@ static blk_qc_t blk_mq_make_request(struct request_queue *q, struct bio *bio) 




		if (!(data.hctx->flags & BLK_MQ_F_BLOCKING)) {

		if (!(data.hctx->flags & BLK_MQ_F_BLOCKING)) {

			rcu_read_lock();

			rcu_read_lock();

			blk_mq_try_issue_directly(old_rq, &cookie);

			blk_mq_try_issue_directly(old_rq, &cookie, false);

			rcu_read_unlock();

			rcu_read_unlock();

		} else {

		} else {

			srcu_idx = srcu_read_lock(&data.hctx->queue_rq_srcu);

			srcu_idx = srcu_read_lock(&data.hctx->queue_rq_srcu);

			blk_mq_try_issue_directly(old_rq, &cookie);

			blk_mq_try_issue_directly(old_rq, &cookie, true);

			srcu_read_unlock(&data.hctx->queue_rq_srcu, srcu_idx);

			srcu_read_unlock(&data.hctx->queue_rq_srcu, srcu_idx);

		}

		}

		goto done;

		goto done;