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

blk-mq: move the call to blk_queue_enter_live out of blk_mq_get_request 



Move the blk_queue_enter_live calls into the callers, where they can
successively be cleaned up.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 870c153c

block/blk-mq.c

+16 −11
Original line number Original line Diff line number Diff line
@@ -342,8 +342,6 @@ static struct request *blk_mq_get_request(struct request_queue *q, 
	bool clear_ctx_on_error = false;

	bool clear_ctx_on_error = false;

	u64 alloc_time_ns = 0;

	u64 alloc_time_ns = 0;





	blk_queue_enter_live(q);



	/* alloc_time includes depth and tag waits */

	/* alloc_time includes depth and tag waits */

	if (blk_queue_rq_alloc_time(q))

	if (blk_queue_rq_alloc_time(q))

		alloc_time_ns = ktime_get_ns();

		alloc_time_ns = ktime_get_ns();
@@ -379,7 +377,6 @@ static struct request *blk_mq_get_request(struct request_queue *q, 
	if (tag == BLK_MQ_TAG_FAIL) {

	if (tag == BLK_MQ_TAG_FAIL) {

		if (clear_ctx_on_error)

		if (clear_ctx_on_error)

			data->ctx = NULL;

			data->ctx = NULL;

		blk_queue_exit(q);

		return NULL;

		return NULL;

	}

	}
@@ -409,16 +406,19 @@ struct request *blk_mq_alloc_request(struct request_queue *q, unsigned int op, 
	if (ret)

	if (ret)

		return ERR_PTR(ret);

		return ERR_PTR(ret);





	blk_queue_enter_live(q);

	rq = blk_mq_get_request(q, NULL, &alloc_data);

	rq = blk_mq_get_request(q, NULL, &alloc_data);

	blk_queue_exit(q);

	blk_queue_exit(q);





	if (!rq)

	if (!rq)

		return ERR_PTR(-EWOULDBLOCK);

		goto out_queue_exit;



	rq->__data_len = 0;

	rq->__data_len = 0;

	rq->__sector = (sector_t) -1;

	rq->__sector = (sector_t) -1;

	rq->bio = rq->biotail = NULL;

	rq->bio = rq->biotail = NULL;

	return rq;

	return rq;

out_queue_exit:

	blk_queue_exit(q);

	return ERR_PTR(-EWOULDBLOCK);

}

}

EXPORT_SYMBOL(blk_mq_alloc_request);

EXPORT_SYMBOL(blk_mq_alloc_request);
@@ -450,21 +450,24 @@ struct request *blk_mq_alloc_request_hctx(struct request_queue *q, 
	 * Check if the hardware context is actually mapped to anything.

	 * Check if the hardware context is actually mapped to anything.

	 * If not tell the caller that it should skip this queue.

	 * If not tell the caller that it should skip this queue.

	 */

	 */

	ret = -EXDEV;

	alloc_data.hctx = q->queue_hw_ctx[hctx_idx];

	alloc_data.hctx = q->queue_hw_ctx[hctx_idx];

	if (!blk_mq_hw_queue_mapped(alloc_data.hctx)) {

	if (!blk_mq_hw_queue_mapped(alloc_data.hctx))

		blk_queue_exit(q);

		goto out_queue_exit;

		return ERR_PTR(-EXDEV);

	}

	cpu = cpumask_first_and(alloc_data.hctx->cpumask, cpu_online_mask);

	cpu = cpumask_first_and(alloc_data.hctx->cpumask, cpu_online_mask);

	alloc_data.ctx = __blk_mq_get_ctx(q, cpu);

	alloc_data.ctx = __blk_mq_get_ctx(q, cpu);





	ret = -EWOULDBLOCK;

	blk_queue_enter_live(q);

	rq = blk_mq_get_request(q, NULL, &alloc_data);

	rq = blk_mq_get_request(q, NULL, &alloc_data);

	blk_queue_exit(q);

	blk_queue_exit(q);





	if (!rq)

	if (!rq)

		return ERR_PTR(-EWOULDBLOCK);

		goto out_queue_exit;



	return rq;

	return rq;

out_queue_exit:

	blk_queue_exit(q);

	return ERR_PTR(ret);

}

}

EXPORT_SYMBOL_GPL(blk_mq_alloc_request_hctx);

EXPORT_SYMBOL_GPL(blk_mq_alloc_request_hctx);
@@ -2043,8 +2046,10 @@ blk_qc_t blk_mq_make_request(struct request_queue *q, struct bio *bio) 
	rq_qos_throttle(q, bio);

	rq_qos_throttle(q, bio);





	data.cmd_flags = bio->bi_opf;

	data.cmd_flags = bio->bi_opf;

	blk_queue_enter_live(q);

	rq = blk_mq_get_request(q, bio, &data);

	rq = blk_mq_get_request(q, bio, &data);

	if (unlikely(!rq)) {

	if (unlikely(!rq)) {

		blk_queue_exit(q);

		rq_qos_cleanup(q, bio);

		rq_qos_cleanup(q, bio);

		if (bio->bi_opf & REQ_NOWAIT)

		if (bio->bi_opf & REQ_NOWAIT)

			bio_wouldblock_error(bio);

			bio_wouldblock_error(bio);