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

block: pass a queue_limits argument to blk_mq_init_queue 



Pass a queue_limits to blk_mq_init_queue and apply it if non-NULL.  This
will allow allocating queues with valid queue limits instead of setting
the values one at a time later.

Also rename the function to blk_mq_alloc_queue as that is a much better
name for a function that allocates a queue and always pass the queuedata
argument instead of having a separate version for the extra argument.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarKeith Busch <kbusch@kernel.org>
Reviewed-by: default avatarJohn Garry <john.g.garry@oracle.com>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: default avatarMing Lei <ming.lei@redhat.com>
Reviewed-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Link: https://lore.kernel.org/r/20240213073425.1621680-10-hch@lst.de


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

block/blk-mq.c

+8 −13
Original line number Diff line number Diff line
@@ -4083,14 +4083,14 @@ void blk_mq_release(struct request_queue *q) 
	blk_mq_sysfs_deinit(q);

}



static struct request_queue *blk_mq_init_queue_data(struct blk_mq_tag_set *set,

		void *queuedata)

struct request_queue *blk_mq_alloc_queue(struct blk_mq_tag_set *set,

		struct queue_limits *lim, void *queuedata)

{

	struct queue_limits lim = { };

	struct queue_limits default_lim = { };

	struct request_queue *q;

	int ret;



	q = blk_alloc_queue(&lim, set->numa_node);

	q = blk_alloc_queue(lim ? lim : &default_lim, set->numa_node);

	if (IS_ERR(q))

		return q;

	q->queuedata = queuedata;
@@ -4101,20 +4101,15 @@ static struct request_queue *blk_mq_init_queue_data(struct blk_mq_tag_set *set, 
	}

	return q;

}



struct request_queue *blk_mq_init_queue(struct blk_mq_tag_set *set)

{

	return blk_mq_init_queue_data(set, NULL);

}

EXPORT_SYMBOL(blk_mq_init_queue);

EXPORT_SYMBOL(blk_mq_alloc_queue);



/**

 * blk_mq_destroy_queue - shutdown a request queue

 * @q: request queue to shutdown

 *

 * This shuts down a request queue allocated by blk_mq_init_queue(). All future

 * This shuts down a request queue allocated by blk_mq_alloc_queue(). All future

 * requests will be failed with -ENODEV. The caller is responsible for dropping

 * the reference from blk_mq_init_queue() by calling blk_put_queue().

 * the reference from blk_mq_alloc_queue() by calling blk_put_queue().

 *

 * Context: can sleep

 */
@@ -4141,7 +4136,7 @@ struct gendisk *__blk_mq_alloc_disk(struct blk_mq_tag_set *set, void *queuedata, 
	struct request_queue *q;

	struct gendisk *disk;



	q = blk_mq_init_queue_data(set, queuedata);

	q = blk_mq_alloc_queue(set, NULL, queuedata);

	if (IS_ERR(q))

		return ERR_CAST(q);

block/bsg-lib.c

+1 −1
Original line number Diff line number Diff line
@@ -383,7 +383,7 @@ struct request_queue *bsg_setup_queue(struct device *dev, const char *name, 
	if (blk_mq_alloc_tag_set(set))

		goto out_tag_set;



	q = blk_mq_init_queue(set);

	q = blk_mq_alloc_queue(set, NULL, NULL);

	if (IS_ERR(q)) {

		ret = PTR_ERR(q);

		goto out_queue;

drivers/nvme/host/apple.c

+1 −1
Original line number Diff line number Diff line
@@ -1516,7 +1516,7 @@ static int apple_nvme_probe(struct platform_device *pdev) 
		goto put_dev;

	}



	anv->ctrl.admin_q = blk_mq_init_queue(&anv->admin_tagset);

	anv->ctrl.admin_q = blk_mq_alloc_queue(&anv->admin_tagset, NULL, NULL);

	if (IS_ERR(anv->ctrl.admin_q)) {

		ret = -ENOMEM;

		goto put_dev;

drivers/nvme/host/core.c

+3 −3
Original line number Diff line number Diff line
@@ -4372,14 +4372,14 @@ int nvme_alloc_admin_tag_set(struct nvme_ctrl *ctrl, struct blk_mq_tag_set *set, 
	if (ret)

		return ret;



	ctrl->admin_q = blk_mq_init_queue(set);

	ctrl->admin_q = blk_mq_alloc_queue(set, NULL, NULL);

	if (IS_ERR(ctrl->admin_q)) {

		ret = PTR_ERR(ctrl->admin_q);

		goto out_free_tagset;

	}



	if (ctrl->ops->flags & NVME_F_FABRICS) {

		ctrl->fabrics_q = blk_mq_init_queue(set);

		ctrl->fabrics_q = blk_mq_alloc_queue(set, NULL, NULL);

		if (IS_ERR(ctrl->fabrics_q)) {

			ret = PTR_ERR(ctrl->fabrics_q);

			goto out_cleanup_admin_q;
@@ -4443,7 +4443,7 @@ int nvme_alloc_io_tag_set(struct nvme_ctrl *ctrl, struct blk_mq_tag_set *set, 
		return ret;



	if (ctrl->ops->flags & NVME_F_FABRICS) {

		ctrl->connect_q = blk_mq_init_queue(set);

		ctrl->connect_q = blk_mq_alloc_queue(set, NULL, NULL);

        	if (IS_ERR(ctrl->connect_q)) {

			ret = PTR_ERR(ctrl->connect_q);

			goto out_free_tag_set;

drivers/scsi/scsi_scan.c

+1 −1
Original line number Diff line number Diff line
@@ -332,7 +332,7 @@ static struct scsi_device *scsi_alloc_sdev(struct scsi_target *starget, 


	sdev->sg_reserved_size = INT_MAX;



	q = blk_mq_init_queue(&sdev->host->tag_set);

	q = blk_mq_alloc_queue(&sdev->host->tag_set, NULL, NULL);

	if (IS_ERR(q)) {

		/* release fn is set up in scsi_sysfs_device_initialise, so

		 * have to free and put manually here */