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

nvme-pci: split nvme_alloc_admin_tags 



Split nvme_alloc_admin_tags into a helper to actually allocate the
tag set, and one that just restarts the admin queue.  Add a local
variable for the tag_set to clean up the code a bit.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarKeith Busch <kbusch@kernel.org>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 86141440

drivers/nvme/host/pci.c

+31 −29
Original line number Original line Diff line number Diff line
@@ -1766,26 +1766,27 @@ static void nvme_dev_remove_admin(struct nvme_dev *dev) 
	}

	}

}

}





static int nvme_alloc_admin_tags(struct nvme_dev *dev)

static int nvme_pci_alloc_admin_tag_set(struct nvme_dev *dev)

{

{

	if (!dev->ctrl.admin_q) {

	struct blk_mq_tag_set *set = &dev->admin_tagset;

		dev->admin_tagset.ops = &nvme_mq_admin_ops;



		dev->admin_tagset.nr_hw_queues = 1;

	set->ops = &nvme_mq_admin_ops;

	set->nr_hw_queues = 1;





		dev->admin_tagset.queue_depth = NVME_AQ_MQ_TAG_DEPTH;

	set->queue_depth = NVME_AQ_MQ_TAG_DEPTH;

		dev->admin_tagset.timeout = NVME_ADMIN_TIMEOUT;

	set->timeout = NVME_ADMIN_TIMEOUT;

		dev->admin_tagset.numa_node = dev->ctrl.numa_node;

	set->numa_node = dev->ctrl.numa_node;

		dev->admin_tagset.cmd_size = sizeof(struct nvme_iod);

	set->cmd_size = sizeof(struct nvme_iod);

		dev->admin_tagset.flags = BLK_MQ_F_NO_SCHED;

	set->flags = BLK_MQ_F_NO_SCHED;

		dev->admin_tagset.driver_data = dev;

	set->driver_data = dev;





		if (blk_mq_alloc_tag_set(&dev->admin_tagset))

	if (blk_mq_alloc_tag_set(set))

		return -ENOMEM;

		return -ENOMEM;

		dev->ctrl.admin_tagset = &dev->admin_tagset;

	dev->ctrl.admin_tagset = set;





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

	dev->ctrl.admin_q = blk_mq_init_queue(set);

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

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

			blk_mq_free_tag_set(&dev->admin_tagset);

		blk_mq_free_tag_set(set);

		dev->ctrl.admin_q = NULL;

		dev->ctrl.admin_q = NULL;

		return -ENOMEM;

		return -ENOMEM;

	}

	}
@@ -1794,9 +1795,6 @@ static int nvme_alloc_admin_tags(struct nvme_dev *dev) 
		dev->ctrl.admin_q = NULL;

		dev->ctrl.admin_q = NULL;

		return -ENODEV;

		return -ENODEV;

	}

	}

	} else

		nvme_start_admin_queue(&dev->ctrl);



	return 0;

	return 0;

}

}
@@ -2841,9 +2839,13 @@ static void nvme_reset_work(struct work_struct *work) 
	if (result)

	if (result)

		goto out_unlock;

		goto out_unlock;





	result = nvme_alloc_admin_tags(dev);

	if (!dev->ctrl.admin_q) {

		result = nvme_pci_alloc_admin_tag_set(dev);

		if (result)

		if (result)

			goto out_unlock;

			goto out_unlock;

	} else {

		nvme_start_admin_queue(&dev->ctrl);

	}





	/*

	/*

	 * Limit the max command size to prevent iod->sg allocations going

	 * Limit the max command size to prevent iod->sg allocations going