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

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

blk-mq: update ->init_request and ->exit_request prototypes 



Remove the request_idx parameter, which can't be used safely now that we
support I/O schedulers with blk-mq.  Except for a superflous check in
mtip32xx it was unused anyway.

Also pass the tag_set instead of just the driver data - this allows drivers
to avoid some code duplication in a follow on cleanup.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent a800ce8b

block/blk-mq.c

+5 −13
Original line number Diff line number Diff line
@@ -1655,8 +1655,7 @@ void blk_mq_free_rqs(struct blk_mq_tag_set *set, struct blk_mq_tags *tags, 


			if (!rq)

				continue;

			set->ops->exit_request(set->driver_data, rq,

						hctx_idx, i);

			set->ops->exit_request(set, rq, hctx_idx);

			tags->static_rqs[i] = NULL;

		}

	}
@@ -1787,8 +1786,7 @@ int blk_mq_alloc_rqs(struct blk_mq_tag_set *set, struct blk_mq_tags *tags, 


			tags->static_rqs[i] = rq;

			if (set->ops->init_request) {

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

						rq, hctx_idx, i,

				if (set->ops->init_request(set, rq, hctx_idx,

						node)) {

					tags->static_rqs[i] = NULL;

					goto fail;
@@ -1849,14 +1847,10 @@ static void blk_mq_exit_hctx(struct request_queue *q, 
		struct blk_mq_tag_set *set,

		struct blk_mq_hw_ctx *hctx, unsigned int hctx_idx)

{

	unsigned flush_start_tag = set->queue_depth;



	blk_mq_tag_idle(hctx);



	if (set->ops->exit_request)

		set->ops->exit_request(set->driver_data,

				       hctx->fq->flush_rq, hctx_idx,

				       flush_start_tag + hctx_idx);

		set->ops->exit_request(set, hctx->fq->flush_rq, hctx_idx);



	blk_mq_sched_exit_hctx(q, hctx, hctx_idx);
@@ -1889,7 +1883,6 @@ static int blk_mq_init_hctx(struct request_queue *q, 
		struct blk_mq_hw_ctx *hctx, unsigned hctx_idx)

{

	int node;

	unsigned flush_start_tag = set->queue_depth;



	node = hctx->numa_node;

	if (node == NUMA_NO_NODE)
@@ -1933,9 +1926,8 @@ static int blk_mq_init_hctx(struct request_queue *q, 
		goto sched_exit_hctx;



	if (set->ops->init_request &&

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

				   hctx->fq->flush_rq, hctx_idx,

				   flush_start_tag + hctx_idx, node))

	    set->ops->init_request(set, hctx->fq->flush_rq, hctx_idx,

				   node))

		goto free_fq;



	if (hctx->flags & BLK_MQ_F_BLOCKING)

drivers/block/loop.c

+2 −3
Original line number Diff line number Diff line
@@ -1697,9 +1697,8 @@ static void loop_queue_work(struct kthread_work *work) 
	loop_handle_cmd(cmd);

}



static int loop_init_request(void *data, struct request *rq,

		unsigned int hctx_idx, unsigned int request_idx,

		unsigned int numa_node)

static int loop_init_request(struct blk_mq_tag_set *set, struct request *rq,

		unsigned int hctx_idx, unsigned int numa_node)

{

	struct loop_cmd *cmd = blk_mq_rq_to_pdu(rq);

drivers/block/mtip32xx/mtip32xx.c

+6 −14
Original line number Diff line number Diff line
@@ -3818,10 +3818,10 @@ static int mtip_queue_rq(struct blk_mq_hw_ctx *hctx, 
	return BLK_MQ_RQ_QUEUE_ERROR;

}



static void mtip_free_cmd(void *data, struct request *rq,

			  unsigned int hctx_idx, unsigned int request_idx)

static void mtip_free_cmd(struct blk_mq_tag_set *set, struct request *rq,

			  unsigned int hctx_idx)

{

	struct driver_data *dd = data;

	struct driver_data *dd = set->driver_data;

	struct mtip_cmd *cmd = blk_mq_rq_to_pdu(rq);



	if (!cmd->command)
@@ -3831,20 +3831,12 @@ static void mtip_free_cmd(void *data, struct request *rq, 
				cmd->command, cmd->command_dma);

}



static int mtip_init_cmd(void *data, struct request *rq, unsigned int hctx_idx,

			 unsigned int request_idx, unsigned int numa_node)

static int mtip_init_cmd(struct blk_mq_tag_set *set, struct request *rq,

			 unsigned int hctx_idx, unsigned int numa_node)

{

	struct driver_data *dd = data;

	struct driver_data *dd = set->driver_data;

	struct mtip_cmd *cmd = blk_mq_rq_to_pdu(rq);



	/*

	 * For flush requests, request_idx starts at the end of the

	 * tag space.  Since we don't support FLUSH/FUA, simply return

	 * 0 as there's nothing to be done.

	 */

	if (request_idx >= MTIP_MAX_COMMAND_SLOTS)

		return 0;



	cmd->command = dmam_alloc_coherent(&dd->pdev->dev, CMD_DMA_ALLOC_SZ,

			&cmd->command_dma, GFP_KERNEL);

	if (!cmd->command)

drivers/block/nbd.c

+3 −4
Original line number Diff line number Diff line
@@ -1396,12 +1396,11 @@ static void nbd_dbg_close(void) 


#endif



static int nbd_init_request(void *data, struct request *rq,

			    unsigned int hctx_idx, unsigned int request_idx,

			    unsigned int numa_node)

static int nbd_init_request(struct blk_mq_tag_set *set, struct request *rq,

			    unsigned int hctx_idx, unsigned int numa_node)

{

	struct nbd_cmd *cmd = blk_mq_rq_to_pdu(rq);

	cmd->nbd = data;

	cmd->nbd = set->driver_data;

	return 0;

}

drivers/block/rbd.c

+2 −3
Original line number Diff line number Diff line
@@ -4307,9 +4307,8 @@ static int rbd_dev_refresh(struct rbd_device *rbd_dev) 
	return ret;

}



static int rbd_init_request(void *data, struct request *rq,

		unsigned int hctx_idx, unsigned int request_idx,

		unsigned int numa_node)

static int rbd_init_request(struct blk_mq_tag_set *set, struct request *rq,

		unsigned int hctx_idx, unsigned int numa_node)

{

	struct work_struct *work = blk_mq_rq_to_pdu(rq);