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

Commit c5017e85 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

nvme: move controller deletion to common code 



Move the ->delete_work and the associated helpers to common code instead
of duplicating them in every driver.  This also adds the missing reference
get/put for the loop driver.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarJames Smart <james.smart@broadcom.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 29c09648

drivers/nvme/host/core.c

+37 −1
Original line number Diff line number Diff line
@@ -97,6 +97,41 @@ static int nvme_reset_ctrl_sync(struct nvme_ctrl *ctrl) 
	return ret;

}



static void nvme_delete_ctrl_work(struct work_struct *work)

{

	struct nvme_ctrl *ctrl =

		container_of(work, struct nvme_ctrl, delete_work);



	ctrl->ops->delete_ctrl(ctrl);

}



int nvme_delete_ctrl(struct nvme_ctrl *ctrl)

{

	if (!nvme_change_ctrl_state(ctrl, NVME_CTRL_DELETING))

		return -EBUSY;

	if (!queue_work(nvme_wq, &ctrl->delete_work))

		return -EBUSY;

	return 0;

}

EXPORT_SYMBOL_GPL(nvme_delete_ctrl);



int nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl)

{

	int ret = 0;



	/*

	 * Keep a reference until the work is flushed since ->delete_ctrl

	 * can free the controller.

	 */

	nvme_get_ctrl(ctrl);

	ret = nvme_delete_ctrl(ctrl);

	if (!ret)

		flush_work(&ctrl->delete_work);

	nvme_put_ctrl(ctrl);

	return ret;

}

EXPORT_SYMBOL_GPL(nvme_delete_ctrl_sync);



static blk_status_t nvme_error_status(struct request *req)

{

	switch (nvme_req(req)->status & 0x7ff) {
@@ -2122,7 +2157,7 @@ static ssize_t nvme_sysfs_delete(struct device *dev, 
	struct nvme_ctrl *ctrl = dev_get_drvdata(dev);



	if (device_remove_file_self(dev, attr))

		ctrl->ops->delete_ctrl(ctrl);

		nvme_delete_ctrl_sync(ctrl);

	return count;

}

static DEVICE_ATTR(delete_controller, S_IWUSR, NULL, nvme_sysfs_delete);
@@ -2702,6 +2737,7 @@ int nvme_init_ctrl(struct nvme_ctrl *ctrl, struct device *dev, 
	INIT_WORK(&ctrl->scan_work, nvme_scan_work);

	INIT_WORK(&ctrl->async_event_work, nvme_async_event_work);

	INIT_WORK(&ctrl->fw_act_work, nvme_fw_act_work);

	INIT_WORK(&ctrl->delete_work, nvme_delete_ctrl_work);



	ret = ida_simple_get(&nvme_instance_ida, 0, 0, GFP_KERNEL);

	if (ret < 0)

drivers/nvme/host/fabrics.c

+1 −1
Original line number Diff line number Diff line
@@ -887,7 +887,7 @@ nvmf_create_ctrl(struct device *dev, const char *buf, size_t count) 
			"controller returned incorrect NQN: \"%s\".\n",

			ctrl->subnqn);

		up_read(&nvmf_transports_rwsem);

		ctrl->ops->delete_ctrl(ctrl);

		nvme_delete_ctrl_sync(ctrl);

		return ERR_PTR(-EINVAL);

	}

drivers/nvme/host/fc.c

+5 −37
Original line number Diff line number Diff line
@@ -157,7 +157,6 @@ struct nvme_fc_ctrl { 
	struct blk_mq_tag_set	admin_tag_set;

	struct blk_mq_tag_set	tag_set;



	struct work_struct	delete_work;

	struct delayed_work	connect_work;



	struct kref		ref;
@@ -223,7 +222,6 @@ static struct device *fc_udev_device; 


/* *********************** FC-NVME Port Management ************************ */



static int __nvme_fc_del_ctrl(struct nvme_fc_ctrl *);

static void __nvme_fc_delete_hw_queue(struct nvme_fc_ctrl *,

			struct nvme_fc_queue *, unsigned int);
@@ -662,7 +660,7 @@ nvme_fc_unregister_remoteport(struct nvme_fc_remote_port *portptr) 


	/* tear down all associations to the remote port */

	list_for_each_entry(ctrl, &rport->ctrl_list, ctrl_list)

		__nvme_fc_del_ctrl(ctrl);

		nvme_delete_ctrl(&ctrl->ctrl);



	spin_unlock_irqrestore(&rport->lock, flags);
@@ -2636,10 +2634,9 @@ nvme_fc_delete_association(struct nvme_fc_ctrl *ctrl) 
}



static void

nvme_fc_delete_ctrl_work(struct work_struct *work)

nvme_fc_delete_ctrl(struct nvme_ctrl *nctrl)

{

	struct nvme_fc_ctrl *ctrl =

		container_of(work, struct nvme_fc_ctrl, delete_work);

	struct nvme_fc_ctrl *ctrl = to_fc_ctrl(nctrl);



	cancel_work_sync(&ctrl->ctrl.reset_work);

	cancel_delayed_work_sync(&ctrl->connect_work);
@@ -2663,34 +2660,6 @@ nvme_fc_delete_ctrl_work(struct work_struct *work) 
	nvme_put_ctrl(&ctrl->ctrl);

}



static int

__nvme_fc_del_ctrl(struct nvme_fc_ctrl *ctrl)

{

	if (!nvme_change_ctrl_state(&ctrl->ctrl, NVME_CTRL_DELETING))

		return -EBUSY;

	if (!queue_work(nvme_wq, &ctrl->delete_work))

		return -EBUSY;

	return 0;

}



/*

 * Request from nvme core layer to delete the controller

 */

static int

nvme_fc_del_nvme_ctrl(struct nvme_ctrl *nctrl)

{

	struct nvme_fc_ctrl *ctrl = to_fc_ctrl(nctrl);

	int ret;



	nvme_get_ctrl(&ctrl->ctrl);

	ret = __nvme_fc_del_ctrl(ctrl);

	if (!ret)

		flush_work(&ctrl->delete_work);

	nvme_put_ctrl(&ctrl->ctrl);



	return ret;

}



static void

nvme_fc_reconnect_or_delete(struct nvme_fc_ctrl *ctrl, int status)

{
@@ -2716,7 +2685,7 @@ nvme_fc_reconnect_or_delete(struct nvme_fc_ctrl *ctrl, int status) 
				"NVME-FC{%d}: Max reconnect attempts (%d) "

				"reached. Removing controller\n",

				ctrl->cnum, ctrl->ctrl.nr_reconnects);

		WARN_ON(__nvme_fc_del_ctrl(ctrl));

		WARN_ON(nvme_delete_ctrl(&ctrl->ctrl));

	}

}
@@ -2748,7 +2717,7 @@ static const struct nvme_ctrl_ops nvme_fc_ctrl_ops = { 
	.reg_write32		= nvmf_reg_write32,

	.free_ctrl		= nvme_fc_nvme_ctrl_freed,

	.submit_async_event	= nvme_fc_submit_async_event,

	.delete_ctrl		= nvme_fc_del_nvme_ctrl,

	.delete_ctrl		= nvme_fc_delete_ctrl,

	.get_address		= nvmf_get_address,

	.reinit_request		= nvme_fc_reinit_request,

};
@@ -2851,7 +2820,6 @@ nvme_fc_init_ctrl(struct device *dev, struct nvmf_ctrl_options *opts, 
	get_device(ctrl->dev);

	kref_init(&ctrl->ref);



	INIT_WORK(&ctrl->delete_work, nvme_fc_delete_ctrl_work);

	INIT_WORK(&ctrl->ctrl.reset_work, nvme_fc_reset_ctrl_work);

	INIT_DELAYED_WORK(&ctrl->connect_work, nvme_fc_connect_ctrl_work);

	spin_lock_init(&ctrl->lock);

drivers/nvme/host/nvme.h

+4 −1
Original line number Diff line number Diff line
@@ -138,6 +138,7 @@ struct nvme_ctrl { 
	struct cdev cdev;

	struct ida ns_ida;

	struct work_struct reset_work;

	struct work_struct delete_work;



	struct opal_dev *opal_dev;
@@ -236,7 +237,7 @@ struct nvme_ctrl_ops { 
	int (*reg_read64)(struct nvme_ctrl *ctrl, u32 off, u64 *val);

	void (*free_ctrl)(struct nvme_ctrl *ctrl);

	void (*submit_async_event)(struct nvme_ctrl *ctrl, int aer_idx);

	int (*delete_ctrl)(struct nvme_ctrl *ctrl);

	void (*delete_ctrl)(struct nvme_ctrl *ctrl);

	int (*get_address)(struct nvme_ctrl *ctrl, char *buf, int size);

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

};
@@ -339,6 +340,8 @@ int nvme_set_queue_count(struct nvme_ctrl *ctrl, int *count); 
void nvme_start_keep_alive(struct nvme_ctrl *ctrl);

void nvme_stop_keep_alive(struct nvme_ctrl *ctrl);

int nvme_reset_ctrl(struct nvme_ctrl *ctrl);

int nvme_delete_ctrl(struct nvme_ctrl *ctrl);

int nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl);



#ifdef CONFIG_NVM

int nvme_nvm_register(struct nvme_ns *ns, char *disk_name, int node);

drivers/nvme/host/rdma.c

+6 −39
Original line number Diff line number Diff line
@@ -105,7 +105,6 @@ struct nvme_rdma_ctrl { 


	/* other member variables */

	struct blk_mq_tag_set	tag_set;

	struct work_struct	delete_work;

	struct work_struct	err_work;



	struct nvme_rdma_qe	async_event_sqe;
@@ -913,7 +912,7 @@ static void nvme_rdma_reconnect_or_remove(struct nvme_rdma_ctrl *ctrl) 
				ctrl->ctrl.opts->reconnect_delay * HZ);

	} else {

		dev_info(ctrl->ctrl.device, "Removing controller...\n");

		queue_work(nvme_wq, &ctrl->delete_work);

		queue_work(nvme_wq, &ctrl->ctrl.delete_work);

	}

}
@@ -1764,41 +1763,10 @@ static void nvme_rdma_remove_ctrl(struct nvme_rdma_ctrl *ctrl) 
	nvme_put_ctrl(&ctrl->ctrl);

}



static void nvme_rdma_del_ctrl_work(struct work_struct *work)

static void nvme_rdma_delete_ctrl(struct nvme_ctrl *ctrl)

{

	struct nvme_rdma_ctrl *ctrl = container_of(work,

				struct nvme_rdma_ctrl, delete_work);



	nvme_stop_ctrl(&ctrl->ctrl);

	nvme_rdma_remove_ctrl(ctrl);

}



static int __nvme_rdma_del_ctrl(struct nvme_rdma_ctrl *ctrl)

{

	if (!nvme_change_ctrl_state(&ctrl->ctrl, NVME_CTRL_DELETING))

		return -EBUSY;



	if (!queue_work(nvme_wq, &ctrl->delete_work))

		return -EBUSY;



	return 0;

}



static int nvme_rdma_del_ctrl(struct nvme_ctrl *nctrl)

{

	struct nvme_rdma_ctrl *ctrl = to_rdma_ctrl(nctrl);

	int ret = 0;



	/*

	 * Keep a reference until all work is flushed since

	 * __nvme_rdma_del_ctrl can free the ctrl mem

	 */

	nvme_get_ctrl(&ctrl->ctrl);

	ret = __nvme_rdma_del_ctrl(ctrl);

	if (!ret)

		flush_work(&ctrl->delete_work);

	nvme_put_ctrl(&ctrl->ctrl);

	return ret;

	nvme_stop_ctrl(ctrl);

	nvme_rdma_remove_ctrl(to_rdma_ctrl(ctrl));

}



static void nvme_rdma_reset_ctrl_work(struct work_struct *work)
@@ -1846,7 +1814,7 @@ static const struct nvme_ctrl_ops nvme_rdma_ctrl_ops = { 
	.reg_write32		= nvmf_reg_write32,

	.free_ctrl		= nvme_rdma_free_ctrl,

	.submit_async_event	= nvme_rdma_submit_async_event,

	.delete_ctrl		= nvme_rdma_del_ctrl,

	.delete_ctrl		= nvme_rdma_delete_ctrl,

	.get_address		= nvmf_get_address,

	.reinit_request		= nvme_rdma_reinit_request,

};
@@ -1977,7 +1945,6 @@ static struct nvme_ctrl *nvme_rdma_create_ctrl(struct device *dev, 
	INIT_DELAYED_WORK(&ctrl->reconnect_work,

			nvme_rdma_reconnect_ctrl_work);

	INIT_WORK(&ctrl->err_work, nvme_rdma_error_recovery_work);

	INIT_WORK(&ctrl->delete_work, nvme_rdma_del_ctrl_work);

	INIT_WORK(&ctrl->ctrl.reset_work, nvme_rdma_reset_ctrl_work);



	ctrl->ctrl.queue_count = opts->nr_io_queues + 1; /* +1 for admin queue */
@@ -2081,7 +2048,7 @@ static void nvme_rdma_remove_one(struct ib_device *ib_device, void *client_data) 
		dev_info(ctrl->ctrl.device,

			"Removing ctrl: NQN \"%s\", addr %pISp\n",

			ctrl->ctrl.opts->subsysnqn, &ctrl->addr);

		__nvme_rdma_del_ctrl(ctrl);

		nvme_delete_ctrl(&ctrl->ctrl);

	}

	mutex_unlock(&nvme_rdma_ctrl_mutex);