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

blk-mq: Make blk_mq_reinit_tagset() calls easier to read 



Since blk_mq_ops.reinit_request is only called from inside
blk_mq_reinit_tagset(), make this function pointer an argument of
blk_mq_reinit_tagset() instead of a member of struct blk_mq_ops.
This patch does not change any functionality but makes
blk_mq_reinit_tagset() calls easier to read and to analyze.

Signed-off-by: default avatarBart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Sagi Grimberg <sagi@grimberg.me>
Cc: James Smart <james.smart@broadcom.com>
Cc: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 37f02e5f

block/blk-mq-tag.c

+5 −4
Original line number Diff line number Diff line
@@ -298,11 +298,12 @@ void blk_mq_tagset_busy_iter(struct blk_mq_tag_set *tagset, 
}

EXPORT_SYMBOL(blk_mq_tagset_busy_iter);



int blk_mq_reinit_tagset(struct blk_mq_tag_set *set)

int blk_mq_reinit_tagset(struct blk_mq_tag_set *set,

			 int (reinit_request)(void *, struct request *))

{

	int i, j, ret = 0;



	if (!set->ops->reinit_request)

	if (WARN_ON_ONCE(!reinit_request))

		goto out;



	for (i = 0; i < set->nr_hw_queues; i++) {
@@ -315,7 +316,7 @@ int blk_mq_reinit_tagset(struct blk_mq_tag_set *set) 
			if (!tags->static_rqs[j])

				continue;



			ret = set->ops->reinit_request(set->driver_data,

			ret = reinit_request(set->driver_data,

					     tags->static_rqs[j]);

			if (ret)

				goto out;

drivers/nvme/host/fc.c

+1 −3
Original line number Diff line number Diff line
@@ -2168,7 +2168,6 @@ static const struct blk_mq_ops nvme_fc_mq_ops = { 
	.complete	= nvme_fc_complete_rq,

	.init_request	= nvme_fc_init_request,

	.exit_request	= nvme_fc_exit_request,

	.reinit_request	= nvme_fc_reinit_request,

	.init_hctx	= nvme_fc_init_hctx,

	.poll		= nvme_fc_poll,

	.timeout	= nvme_fc_timeout,
@@ -2269,7 +2268,7 @@ nvme_fc_reinit_io_queues(struct nvme_fc_ctrl *ctrl) 


	nvme_fc_init_io_queues(ctrl);



	ret = blk_mq_reinit_tagset(&ctrl->tag_set);

	ret = blk_mq_reinit_tagset(&ctrl->tag_set, nvme_fc_reinit_request);

	if (ret)

		goto out_free_io_queues;
@@ -2655,7 +2654,6 @@ static const struct blk_mq_ops nvme_fc_admin_mq_ops = { 
	.complete	= nvme_fc_complete_rq,

	.init_request	= nvme_fc_init_request,

	.exit_request	= nvme_fc_exit_request,

	.reinit_request	= nvme_fc_reinit_request,

	.init_hctx	= nvme_fc_init_admin_hctx,

	.timeout	= nvme_fc_timeout,

};

drivers/nvme/host/rdma.c

+6 −5
Original line number Diff line number Diff line
@@ -704,14 +704,16 @@ static void nvme_rdma_reconnect_ctrl_work(struct work_struct *work) 
	if (ctrl->ctrl.queue_count > 1) {

		nvme_rdma_free_io_queues(ctrl);



		ret = blk_mq_reinit_tagset(&ctrl->tag_set);

		ret = blk_mq_reinit_tagset(&ctrl->tag_set,

					   nvme_rdma_reinit_request);

		if (ret)

			goto requeue;

	}



	nvme_rdma_stop_and_free_queue(&ctrl->queues[0]);



	ret = blk_mq_reinit_tagset(&ctrl->admin_tag_set);

	ret = blk_mq_reinit_tagset(&ctrl->admin_tag_set,

				   nvme_rdma_reinit_request);

	if (ret)

		goto requeue;
@@ -1503,7 +1505,6 @@ static const struct blk_mq_ops nvme_rdma_mq_ops = { 
	.complete	= nvme_rdma_complete_rq,

	.init_request	= nvme_rdma_init_request,

	.exit_request	= nvme_rdma_exit_request,

	.reinit_request	= nvme_rdma_reinit_request,

	.init_hctx	= nvme_rdma_init_hctx,

	.poll		= nvme_rdma_poll,

	.timeout	= nvme_rdma_timeout,
@@ -1514,7 +1515,6 @@ static const struct blk_mq_ops nvme_rdma_admin_mq_ops = { 
	.complete	= nvme_rdma_complete_rq,

	.init_request	= nvme_rdma_init_request,

	.exit_request	= nvme_rdma_exit_request,

	.reinit_request	= nvme_rdma_reinit_request,

	.init_hctx	= nvme_rdma_init_admin_hctx,

	.timeout	= nvme_rdma_timeout,

};
@@ -1712,7 +1712,8 @@ static void nvme_rdma_reset_ctrl_work(struct work_struct *work) 
	}



	if (ctrl->ctrl.queue_count > 1) {

		ret = blk_mq_reinit_tagset(&ctrl->tag_set);

		ret = blk_mq_reinit_tagset(&ctrl->tag_set,

					   nvme_rdma_reinit_request);

		if (ret)

			goto del_dead_ctrl;

include/linux/blk-mq.h

+2 −3
Original line number Diff line number Diff line
@@ -97,7 +97,6 @@ typedef int (init_request_fn)(struct blk_mq_tag_set *set, struct request *, 
		unsigned int, unsigned int);

typedef void (exit_request_fn)(struct blk_mq_tag_set *set, struct request *,

		unsigned int);

typedef int (reinit_request_fn)(void *, struct request *);



typedef void (busy_iter_fn)(struct blk_mq_hw_ctx *, struct request *, void *,

		bool);
@@ -143,7 +142,6 @@ struct blk_mq_ops { 
	 */

	init_request_fn		*init_request;

	exit_request_fn		*exit_request;

	reinit_request_fn	*reinit_request;

	/* Called from inside blk_get_request() */

	void (*initialize_rq_fn)(struct request *rq);
@@ -261,7 +259,8 @@ void blk_freeze_queue_start(struct request_queue *q); 
void blk_mq_freeze_queue_wait(struct request_queue *q);

int blk_mq_freeze_queue_wait_timeout(struct request_queue *q,

				     unsigned long timeout);

int blk_mq_reinit_tagset(struct blk_mq_tag_set *set);

int blk_mq_reinit_tagset(struct blk_mq_tag_set *set,

			 int (reinit_request)(void *, struct request *));



int blk_mq_map_queues(struct blk_mq_tag_set *set);

void blk_mq_update_nr_hw_queues(struct blk_mq_tag_set *set, int nr_hw_queues);

CRA Git | Maintained and supported by SUSTech CRA and CCSE