From: Himanshu Madhani <himanshu.madhani@oracle.com>
To: Max Gurtovoy <mgurtovoy@nvidia.com>
Cc: "linux-nvme@lists.infradead.org" <linux-nvme@lists.infradead.org>,
"hch@lst.de" <hch@lst.de>,
"kbusch@kernel.org" <kbusch@kernel.org>,
"sagi@grimberg.me" <sagi@grimberg.me>,
"chaitanyak@nvidia.com" <chaitanyak@nvidia.com>,
"israelr@nvidia.com" <israelr@nvidia.com>,
"oren@nvidia.com" <oren@nvidia.com>,
"jsmart2021@gmail.com" <jsmart2021@gmail.com>
Subject: Re: [PATCH 3/7] nvme: add err_work attribute to nvme ctrl
Date: Wed, 20 Oct 2021 13:34:22 +0000 [thread overview]
Message-ID: <094D3089-4F3A-48DF-BC2D-56ACBC16EA16@oracle.com> (raw)
In-Reply-To: <20211018134020.33838-4-mgurtovoy@nvidia.com>
> On Oct 18, 2021, at 8:40 AM, Max Gurtovoy <mgurtovoy@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@nvidia.com>
> Reviewed-by: Israel Rukshin <israelr@nvidia.com>
> Signed-off-by: Max Gurtovoy <mgurtovoy@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@oracle.com>
--
Himanshu Madhani Oracle Linux Engineering
next prev parent reply other threads:[~2021-10-20 13:34 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-18 13:40 [PATCH v1 0/7] Centrelize common fabrics code to core drivers Max Gurtovoy
2021-10-18 13:40 ` [PATCH 1/7] nvme: add connect_work attribute to nvme ctrl Max Gurtovoy
2021-10-19 12:32 ` Sagi Grimberg
2021-10-19 13:20 ` Hannes Reinecke
2021-10-20 13:34 ` Himanshu Madhani
2021-10-18 13:40 ` [PATCH 2/7] nvme-fabrics: introduce nvmf_reconnect_or_remove API Max Gurtovoy
2021-10-19 6:26 ` Chaitanya Kulkarni
2021-10-19 12:36 ` Sagi Grimberg
2021-10-19 12:58 ` Max Gurtovoy
2021-10-19 13:21 ` Hannes Reinecke
2021-10-20 13:34 ` Himanshu Madhani
2021-10-18 13:40 ` [PATCH 3/7] nvme: add err_work attribute to nvme ctrl Max Gurtovoy
2021-10-19 12:36 ` Sagi Grimberg
2021-10-20 13:34 ` Himanshu Madhani [this message]
2021-10-18 13:40 ` [PATCH 4/7] nvme-fabrics: introduce nvmf_error_recovery API Max Gurtovoy
2021-10-19 13:27 ` Hannes Reinecke
2021-10-20 13:34 ` Himanshu Madhani
2021-10-18 13:40 ` [PATCH 5/7] nvme/nvme-fabrics: introduce nvmf_error_recovery_work API Max Gurtovoy
2021-10-19 6:29 ` Chaitanya Kulkarni
2021-10-19 12:43 ` Sagi Grimberg
2021-10-19 13:17 ` Max Gurtovoy
2021-10-19 13:34 ` Hannes Reinecke
2021-10-18 13:40 ` [PATCH 6/7] nvme/nvme-fabrics: introduce nvmf_reconnect_ctrl_work API Max Gurtovoy
2021-10-19 6:29 ` Chaitanya Kulkarni
2021-10-19 12:44 ` Sagi Grimberg
2021-10-19 13:18 ` Max Gurtovoy
2021-10-19 13:41 ` Hannes Reinecke
2021-10-18 13:40 ` [PATCH 7/7] nvme-fabrics: add nvmf_init_ctrl/nvmf_teardown_ctrl API Max Gurtovoy
2021-10-19 12:46 ` Sagi Grimberg
2021-10-19 13:20 ` Max Gurtovoy
2021-10-18 14:08 ` [PATCH v1 0/7] Centrelize common fabrics code to core drivers James Smart
2021-10-19 5:36 ` Christoph Hellwig
2021-10-19 6:24 ` Chaitanya Kulkarni
2021-10-19 12:32 ` Sagi Grimberg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=094D3089-4F3A-48DF-BC2D-56ACBC16EA16@oracle.com \
--to=himanshu.madhani@oracle.com \
--cc=chaitanyak@nvidia.com \
--cc=hch@lst.de \
--cc=israelr@nvidia.com \
--cc=jsmart2021@gmail.com \
--cc=kbusch@kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=mgurtovoy@nvidia.com \
--cc=oren@nvidia.com \
--cc=sagi@grimberg.me \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox