Commit 49811586 authored by Nilay Shroff's avatar Nilay Shroff Committed by Jens Axboe
Browse files

block: move elevator queue allocation logic into blk_mq_init_sched 



In preparation for allocating sched_tags before freezing the request
queue and acquiring ->elevator_lock, move the elevator queue allocation
logic from the elevator ops ->init_sched callback into blk_mq_init_sched.
As elevator_alloc is now only invoked from block layer core, we don't
need to export it, so unexport elevator_alloc function.

This refactoring provides a centralized location for elevator queue
initialization, which makes it easier to store pre-allocated sched_tags
in the struct elevator_queue during later changes.

Reviewed-by: default avatarMing Lei <ming.lei@redhat.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarNilay Shroff <nilay@linux.ibm.com>
Link: https://lore.kernel.org/r/20250730074614.2537382-2-nilay@linux.ibm.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 5421681b

block/bfq-iosched.c

+3 −10
Original line number Diff line number Diff line
@@ -7218,22 +7218,16 @@ static void bfq_init_root_group(struct bfq_group *root_group, 
	root_group->sched_data.bfq_class_idle_last_service = jiffies;

}



static int bfq_init_queue(struct request_queue *q, struct elevator_type *e)

static int bfq_init_queue(struct request_queue *q, struct elevator_queue *eq)

{

	struct bfq_data *bfqd;

	struct elevator_queue *eq;

	unsigned int i;

	struct blk_independent_access_ranges *ia_ranges = q->disk->ia_ranges;



	eq = elevator_alloc(q, e);

	if (!eq)

		return -ENOMEM;



	bfqd = kzalloc_node(sizeof(*bfqd), GFP_KERNEL, q->node);

	if (!bfqd) {

		kobject_put(&eq->kobj);

	if (!bfqd)

		return -ENOMEM;

	}



	eq->elevator_data = bfqd;



	spin_lock_irq(&q->queue_lock);
@@ -7391,7 +7385,6 @@ static int bfq_init_queue(struct request_queue *q, struct elevator_type *e) 


out_free:

	kfree(bfqd);

	kobject_put(&eq->kobj);

	return -ENOMEM;

}

block/blk-mq-sched.c

+8 −3
Original line number Diff line number Diff line
@@ -475,10 +475,14 @@ int blk_mq_init_sched(struct request_queue *q, struct elevator_type *e) 
	q->nr_requests = 2 * min_t(unsigned int, q->tag_set->queue_depth,

				   BLKDEV_DEFAULT_RQ);



	eq = elevator_alloc(q, e);

	if (!eq)

		return -ENOMEM;



	if (blk_mq_is_shared_tags(flags)) {

		ret = blk_mq_init_sched_shared_tags(q);

		if (ret)

			return ret;

			goto err_put_elevator;

	}



	queue_for_each_hw_ctx(q, hctx, i) {
@@ -487,7 +491,7 @@ int blk_mq_init_sched(struct request_queue *q, struct elevator_type *e) 
			goto err_free_map_and_rqs;

	}



	ret = e->ops.init_sched(q, e);

	ret = e->ops.init_sched(q, eq);

	if (ret)

		goto err_free_map_and_rqs;
@@ -508,7 +512,8 @@ int blk_mq_init_sched(struct request_queue *q, struct elevator_type *e) 
err_free_map_and_rqs:

	blk_mq_sched_free_rqs(q);

	blk_mq_sched_tags_teardown(q, flags);



err_put_elevator:

	kobject_put(&eq->kobj);

	q->elevator = NULL;

	return ret;

}

block/elevator.c

+0 −1
Original line number Diff line number Diff line
@@ -148,7 +148,6 @@ struct elevator_queue *elevator_alloc(struct request_queue *q, 


	return eq;

}

EXPORT_SYMBOL(elevator_alloc);



static void elevator_release(struct kobject *kobj)

{

block/elevator.h

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ struct blk_mq_alloc_data; 
struct blk_mq_hw_ctx;



struct elevator_mq_ops {

	int (*init_sched)(struct request_queue *, struct elevator_type *);

	int (*init_sched)(struct request_queue *, struct elevator_queue *);

	void (*exit_sched)(struct elevator_queue *);

	int (*init_hctx)(struct blk_mq_hw_ctx *, unsigned int);

	void (*exit_hctx)(struct blk_mq_hw_ctx *, unsigned int);

block/kyber-iosched.c

+2 −9
Original line number Diff line number Diff line
@@ -402,20 +402,13 @@ static struct kyber_queue_data *kyber_queue_data_alloc(struct request_queue *q) 
	return ERR_PTR(ret);

}



static int kyber_init_sched(struct request_queue *q, struct elevator_type *e)

static int kyber_init_sched(struct request_queue *q, struct elevator_queue *eq)

{

	struct kyber_queue_data *kqd;

	struct elevator_queue *eq;



	eq = elevator_alloc(q, e);

	if (!eq)

		return -ENOMEM;



	kqd = kyber_queue_data_alloc(q);

	if (IS_ERR(kqd)) {

		kobject_put(&eq->kobj);

	if (IS_ERR(kqd))

		return PTR_ERR(kqd);

	}



	blk_stat_enable_accounting(q);