[PATCH 3/7] nvme: add err_work attribute to nvme ctrl

[Himanshu Madhani]

> On Oct 18, 2021, at 8:40 AM, Max Gurtovoy <mgurtovoy at nvidia.com> wrote:
> 
> This structure is duplicated for RDMA/TCP fabric controllers. Move it to
> common code.
> 
> FC controllers might use this attribute in the future instead of a local
> ioerr_work attribute.
> 
> Reviewed-by: Chaitanya Kulkarni <kch at nvidia.com>
> Reviewed-by: Israel Rukshin <israelr at nvidia.com>
> Signed-off-by: Max Gurtovoy <mgurtovoy at nvidia.com>
> ---
> drivers/nvme/host/nvme.h |  1 +
> drivers/nvme/host/rdma.c |  9 ++++-----
> drivers/nvme/host/tcp.c  | 12 +++++-------
> 3 files changed, 10 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
> index 81ca5dd9b7f9..f9e1ce93d61d 100644
> --- a/drivers/nvme/host/nvme.h
> +++ b/drivers/nvme/host/nvme.h
> @@ -344,6 +344,7 @@ struct nvme_ctrl {
> #define NVME_CTRL_FAILFAST_EXPIRED	0
> 	struct nvmf_ctrl_options *opts;
> 	struct delayed_work connect_work;
> +	struct work_struct err_work;
> 
> 	struct page *discard_page;
> 	unsigned long discard_page_busy;
> diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
> index f31a56d8fd73..da7f61a5fac4 100644
> --- a/drivers/nvme/host/rdma.c
> +++ b/drivers/nvme/host/rdma.c
> @@ -106,7 +106,6 @@ struct nvme_rdma_ctrl {
> 
> 	/* other member variables */
> 	struct blk_mq_tag_set	tag_set;
> -	struct work_struct	err_work;
> 
> 	struct nvme_rdma_qe	async_event_sqe;
> 
> @@ -1168,7 +1167,7 @@ static void nvme_rdma_reconnect_ctrl_work(struct work_struct *work)
> static void nvme_rdma_error_recovery_work(struct work_struct *work)
> {
> 	struct nvme_rdma_ctrl *ctrl = container_of(work,
> -			struct nvme_rdma_ctrl, err_work);
> +			struct nvme_rdma_ctrl, ctrl.err_work);
> 
> 	nvme_stop_keep_alive(&ctrl->ctrl);
> 	nvme_rdma_teardown_io_queues(ctrl, false);
> @@ -1192,7 +1191,7 @@ static void nvme_rdma_error_recovery(struct nvme_rdma_ctrl *ctrl)
> 		return;
> 
> 	dev_warn(ctrl->ctrl.device, "starting error recovery\n");
> -	queue_work(nvme_reset_wq, &ctrl->err_work);
> +	queue_work(nvme_reset_wq, &ctrl->ctrl.err_work);
> }
> 
> static void nvme_rdma_end_request(struct nvme_rdma_request *req)
> @@ -2208,7 +2207,7 @@ 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_work_sync(&ctrl->ctrl.err_work);
> 	cancel_delayed_work_sync(&ctrl->ctrl.connect_work);
> 
> 	nvme_rdma_teardown_io_queues(ctrl, shutdown);
> @@ -2339,7 +2338,7 @@ static struct nvme_ctrl *nvme_rdma_create_ctrl(struct device *dev,
> 
> 	INIT_DELAYED_WORK(&ctrl->ctrl.connect_work,
> 			nvme_rdma_reconnect_ctrl_work);
> -	INIT_WORK(&ctrl->err_work, nvme_rdma_error_recovery_work);
> +	INIT_WORK(&ctrl->ctrl.err_work, nvme_rdma_error_recovery_work);
> 	INIT_WORK(&ctrl->ctrl.reset_work, nvme_rdma_reset_ctrl_work);
> 
> 	ctrl->ctrl.queue_count = opts->nr_io_queues + opts->nr_write_queues +
> diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c
> index 530ff76d4ac9..07a9cc4f2274 100644
> --- a/drivers/nvme/host/tcp.c
> +++ b/drivers/nvme/host/tcp.c
> @@ -126,7 +126,6 @@ struct nvme_tcp_ctrl {
> 	struct sockaddr_storage src_addr;
> 	struct nvme_ctrl	ctrl;
> 
> -	struct work_struct	err_work;
> 	struct nvme_tcp_request async_req;
> 	u32			io_queues[HCTX_MAX_TYPES];
> };
> @@ -486,7 +485,7 @@ static void nvme_tcp_error_recovery(struct nvme_ctrl *ctrl)
> 		return;
> 
> 	dev_warn(ctrl->device, "starting error recovery\n");
> -	queue_work(nvme_reset_wq, &to_tcp_ctrl(ctrl)->err_work);
> +	queue_work(nvme_reset_wq, &ctrl->err_work);
> }
> 
> static int nvme_tcp_process_nvme_cqe(struct nvme_tcp_queue *queue,
> @@ -2068,9 +2067,8 @@ static void nvme_tcp_reconnect_ctrl_work(struct work_struct *work)
> 
> static void nvme_tcp_error_recovery_work(struct work_struct *work)
> {
> -	struct nvme_tcp_ctrl *tcp_ctrl = container_of(work,
> -				struct nvme_tcp_ctrl, err_work);
> -	struct nvme_ctrl *ctrl = &tcp_ctrl->ctrl;
> +	struct nvme_ctrl *ctrl = container_of(work,
> +				struct nvme_ctrl, err_work);
> 
> 	nvme_stop_keep_alive(ctrl);
> 	nvme_tcp_teardown_io_queues(ctrl, false);
> @@ -2091,7 +2089,7 @@ static void nvme_tcp_error_recovery_work(struct work_struct *work)
> 
> static void nvme_tcp_teardown_ctrl(struct nvme_ctrl *ctrl, bool shutdown)
> {
> -	cancel_work_sync(&to_tcp_ctrl(ctrl)->err_work);
> +	cancel_work_sync(&ctrl->err_work);
> 	cancel_delayed_work_sync(&ctrl->connect_work);
> 
> 	nvme_tcp_teardown_io_queues(ctrl, shutdown);
> @@ -2494,7 +2492,7 @@ static struct nvme_ctrl *nvme_tcp_create_ctrl(struct device *dev,
> 
> 	INIT_DELAYED_WORK(&ctrl->ctrl.connect_work,
> 			nvme_tcp_reconnect_ctrl_work);
> -	INIT_WORK(&ctrl->err_work, nvme_tcp_error_recovery_work);
> +	INIT_WORK(&ctrl->ctrl.err_work, nvme_tcp_error_recovery_work);
> 	INIT_WORK(&ctrl->ctrl.reset_work, nvme_reset_ctrl_work);
> 
> 	if (!(opts->mask & NVMF_OPT_TRSVCID)) {
> -- 
> 2.18.1
> 
> 

Reviewed-by: Himanshu Madhani <himanshu.madhani at oracle.com>

--
Himanshu Madhani	 Oracle Linux Engineering