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

Commit b435ecea authored by Nitzan Carmi's avatar Nitzan Carmi Committed by Jens Axboe
Browse files

nvme: Add .stop_ctrl to nvme ctrl ops 



For consistancy reasons, any fabric-specific works
(e.g error recovery/reconnect) should be canceled in
nvme_stop_ctrl, as for all other NVMe pending works
(e.g. scan, keep alive).

The patch aims to simplify the logic of the code, as
we now only rely on a vague demand from any fabric
to flush its private workqueues at the beginning of
.delete_ctrl op.

Signed-off-by: default avatarNitzan Carmi <nitzanc@mellanox.com>
Reviewed-by: default avatarMax Gurtovoy <maxg@mellanox.com>
Signed-off-by: default avatarKeith Busch <keith.busch@intel.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 187c0832

drivers/nvme/host/core.c

+2 −0
Original line number Diff line number Diff line
@@ -3370,6 +3370,8 @@ void nvme_stop_ctrl(struct nvme_ctrl *ctrl) 
	flush_work(&ctrl->async_event_work);

	flush_work(&ctrl->scan_work);

	cancel_work_sync(&ctrl->fw_act_work);

	if (ctrl->ops->stop_ctrl)

		ctrl->ops->stop_ctrl(ctrl);

}

EXPORT_SYMBOL_GPL(nvme_stop_ctrl);

drivers/nvme/host/nvme.h

+1 −0
Original line number Diff line number Diff line
@@ -313,6 +313,7 @@ struct nvme_ctrl_ops { 
	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);

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

};



#ifdef CONFIG_FAULT_INJECTION_DEBUG_FS

drivers/nvme/host/rdma.c

+9 −3
Original line number Diff line number Diff line
@@ -867,6 +867,14 @@ static int nvme_rdma_configure_io_queues(struct nvme_rdma_ctrl *ctrl, bool new) 
	return ret;

}



static void nvme_rdma_stop_ctrl(struct nvme_ctrl *nctrl)

{

	struct nvme_rdma_ctrl *ctrl = to_rdma_ctrl(nctrl);



	cancel_work_sync(&ctrl->err_work);

	cancel_delayed_work_sync(&ctrl->reconnect_work);

}



static void nvme_rdma_free_ctrl(struct nvme_ctrl *nctrl)

{

	struct nvme_rdma_ctrl *ctrl = to_rdma_ctrl(nctrl);
@@ -1718,9 +1726,6 @@ static const struct blk_mq_ops nvme_rdma_admin_mq_ops = { 


static void nvme_rdma_shutdown_ctrl(struct nvme_rdma_ctrl *ctrl, bool shutdown)

{

	cancel_work_sync(&ctrl->err_work);

	cancel_delayed_work_sync(&ctrl->reconnect_work);



	if (ctrl->ctrl.queue_count > 1) {

		nvme_stop_queues(&ctrl->ctrl);

		blk_mq_tagset_busy_iter(&ctrl->tag_set,
@@ -1798,6 +1803,7 @@ static const struct nvme_ctrl_ops nvme_rdma_ctrl_ops = { 
	.submit_async_event	= nvme_rdma_submit_async_event,

	.delete_ctrl		= nvme_rdma_delete_ctrl,

	.get_address		= nvmf_get_address,

	.stop_ctrl		= nvme_rdma_stop_ctrl,

};



static inline bool