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

Commit 70ab0b2d authored by Jens Axboe's avatar Jens Axboe
Browse files

Revert "blk-mq: initialize req->q in allocation" 

This reverts commit 6a3c8a3a.

We need selective clearing of the request to make the init-at-free
time completely safe. Otherwise we end up stomping on
rq->atomic_flags, which we don't want to do.
parent 981bd189

block/blk-mq.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -82,6 +82,7 @@ static struct request *__blk_mq_alloc_request(struct blk_mq_hw_ctx *hctx, 
	tag = blk_mq_get_tag(hctx->tags, gfp, reserved);

	tag = blk_mq_get_tag(hctx->tags, gfp, reserved);

	if (tag != BLK_MQ_TAG_FAIL) {

	if (tag != BLK_MQ_TAG_FAIL) {

		rq = hctx->tags->rqs[tag];

		rq = hctx->tags->rqs[tag];

		blk_rq_init(hctx->queue, rq);

		rq->tag = tag;

		rq->tag = tag;





		return rq;

		return rq;
@@ -186,7 +187,6 @@ static void blk_mq_rq_ctx_init(struct request_queue *q, struct blk_mq_ctx *ctx, 
	if (blk_queue_io_stat(q))

	if (blk_queue_io_stat(q))

		rw_flags |= REQ_IO_STAT;

		rw_flags |= REQ_IO_STAT;





	rq->q = q;

	rq->mq_ctx = ctx;

	rq->mq_ctx = ctx;

	rq->cmd_flags = rw_flags;

	rq->cmd_flags = rw_flags;

	rq->start_time = jiffies;

	rq->start_time = jiffies;
@@ -258,7 +258,6 @@ static void __blk_mq_free_request(struct blk_mq_hw_ctx *hctx, 
	const int tag = rq->tag;

	const int tag = rq->tag;

	struct request_queue *q = rq->q;

	struct request_queue *q = rq->q;





	blk_rq_init(hctx->queue, rq);

	blk_mq_put_tag(hctx->tags, tag);

	blk_mq_put_tag(hctx->tags, tag);

	blk_mq_queue_exit(q);

	blk_mq_queue_exit(q);

}

}
@@ -1195,7 +1194,6 @@ static struct blk_mq_tags *blk_mq_init_rq_map(struct blk_mq_tag_set *set, 
		left -= to_do * rq_size;

		left -= to_do * rq_size;

		for (j = 0; j < to_do; j++) {

		for (j = 0; j < to_do; j++) {

			tags->rqs[i] = p;

			tags->rqs[i] = p;

			blk_rq_init(NULL, tags->rqs[i]);

			if (set->ops->init_request) {

			if (set->ops->init_request) {

				if (set->ops->init_request(set->driver_data,

				if (set->ops->init_request(set->driver_data,

						tags->rqs[i], hctx_idx, i,

						tags->rqs[i], hctx_idx, i,