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

Commit 9b6f9da9 authored by Sagi Grimberg's avatar Sagi Grimberg Committed by Greg Kroah-Hartman
Browse files

nvme-rdma: handle cpu unplug when re-establishing the controller 




[ Upstream commit c248c64387fac5a6b31b343d9acb78f478e8619c ]

If a cpu unplug event has occured, we need to take the minimum
of the provided nr_io_queues and the number of online cpus,
otherwise we won't be able to connect them as blk-mq mapping
won't dispatch to those queues.

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 67e8be27

drivers/nvme/host/rdma.c

+14 −14
Original line number Diff line number Diff line
@@ -337,8 +337,6 @@ static int __nvme_rdma_init_request(struct nvme_rdma_ctrl *ctrl, 
	struct ib_device *ibdev = dev->dev;

	int ret;



	BUG_ON(queue_idx >= ctrl->queue_count);



	ret = nvme_rdma_alloc_qe(ibdev, &req->sqe, sizeof(struct nvme_command),

			DMA_TO_DEVICE);

	if (ret)
@@ -643,8 +641,22 @@ static int nvme_rdma_connect_io_queues(struct nvme_rdma_ctrl *ctrl) 


static int nvme_rdma_init_io_queues(struct nvme_rdma_ctrl *ctrl)

{

	struct nvmf_ctrl_options *opts = ctrl->ctrl.opts;

	unsigned int nr_io_queues;

	int i, ret;



	nr_io_queues = min(opts->nr_io_queues, num_online_cpus());

	ret = nvme_set_queue_count(&ctrl->ctrl, &nr_io_queues);

	if (ret)

		return ret;



	ctrl->queue_count = nr_io_queues + 1;

	if (ctrl->queue_count < 2)

		return 0;



	dev_info(ctrl->ctrl.device,

		"creating %d I/O queues.\n", nr_io_queues);



	for (i = 1; i < ctrl->queue_count; i++) {

		ret = nvme_rdma_init_queue(ctrl, i,

					   ctrl->ctrl.opts->queue_size);
@@ -1795,20 +1807,8 @@ static const struct nvme_ctrl_ops nvme_rdma_ctrl_ops = { 


static int nvme_rdma_create_io_queues(struct nvme_rdma_ctrl *ctrl)

{

	struct nvmf_ctrl_options *opts = ctrl->ctrl.opts;

	int ret;



	ret = nvme_set_queue_count(&ctrl->ctrl, &opts->nr_io_queues);

	if (ret)

		return ret;



	ctrl->queue_count = opts->nr_io_queues + 1;

	if (ctrl->queue_count < 2)

		return 0;



	dev_info(ctrl->ctrl.device,

		"creating %d I/O queues.\n", opts->nr_io_queues);



	ret = nvme_rdma_init_io_queues(ctrl);

	if (ret)

		return ret;