From: Himanshu Madhani <himanshu.madhani@oracle.com>
To: James Smart <jsmart2021@gmail.com>, linux-nvme@lists.infradead.org
Cc: martin.petersen@oracle.com
Subject: Re: [PATCH 06/29] nvme-fcloop: Fix deallocation of working context
Date: Thu, 26 Mar 2020 11:35:22 -0500 [thread overview]
Message-ID: <08681e8f-1d17-ce21-c1f9-22d0be3d09c2@oracle.com> (raw)
In-Reply-To: <20200205183753.25959-7-jsmart2021@gmail.com>
On 2/5/2020 12:37 PM, James Smart wrote:
> There's been a longstanding bug of LS completions which freed ls
> op's, particularly the disconnect LS, while executing on a work
> context that is in the memory being free. Not a good thing to do.
>
> Rework LS handling to make callbacks in the rport context
> rather than the ls_request context.
>
> Signed-off-by: James Smart <jsmart2021@gmail.com>
> ---
> drivers/nvme/target/fcloop.c | 76 ++++++++++++++++++++++++++++++--------------
> 1 file changed, 52 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/nvme/target/fcloop.c b/drivers/nvme/target/fcloop.c
> index 130932a5db0c..6533f4196005 100644
> --- a/drivers/nvme/target/fcloop.c
> +++ b/drivers/nvme/target/fcloop.c
> @@ -198,10 +198,13 @@ struct fcloop_lport_priv {
> };
>
> struct fcloop_rport {
> - struct nvme_fc_remote_port *remoteport;
> - struct nvmet_fc_target_port *targetport;
> - struct fcloop_nport *nport;
> - struct fcloop_lport *lport;
> + struct nvme_fc_remote_port *remoteport;
> + struct nvmet_fc_target_port *targetport;
> + struct fcloop_nport *nport;
> + struct fcloop_lport *lport;
> + spinlock_t lock;
> + struct list_head ls_list;
> + struct work_struct ls_work;
> };
>
> struct fcloop_tport {
> @@ -224,11 +227,10 @@ struct fcloop_nport {
> };
>
> struct fcloop_lsreq {
> - struct fcloop_tport *tport;
> struct nvmefc_ls_req *lsreq;
> - struct work_struct work;
> struct nvmefc_ls_rsp ls_rsp;
> int status;
> + struct list_head ls_list; /* fcloop_rport->ls_list */
> };
>
> struct fcloop_rscn {
> @@ -292,21 +294,32 @@ fcloop_delete_queue(struct nvme_fc_local_port *localport,
> {
> }
>
> -
> -/*
> - * Transmit of LS RSP done (e.g. buffers all set). call back up
> - * initiator "done" flows.
> - */
> static void
> -fcloop_tgt_lsrqst_done_work(struct work_struct *work)
> +fcloop_rport_lsrqst_work(struct work_struct *work)
> {
> - struct fcloop_lsreq *tls_req =
> - container_of(work, struct fcloop_lsreq, work);
> - struct fcloop_tport *tport = tls_req->tport;
> - struct nvmefc_ls_req *lsreq = tls_req->lsreq;
> + struct fcloop_rport *rport =
> + container_of(work, struct fcloop_rport, ls_work);
> + struct fcloop_lsreq *tls_req;
>
> - if (!tport || tport->remoteport)
> - lsreq->done(lsreq, tls_req->status);
> + spin_lock(&rport->lock);
> + for (;;) {
> + tls_req = list_first_entry_or_null(&rport->ls_list,
> + struct fcloop_lsreq, ls_list);
> + if (!tls_req)
> + break;
> +
> + list_del(&tls_req->ls_list);
> + spin_unlock(&rport->lock);
> +
> + tls_req->lsreq->done(tls_req->lsreq, tls_req->status);
> + /*
> + * callee may free memory containing tls_req.
> + * do not reference lsreq after this.
> + */
> +
> + spin_lock(&rport->lock);
> + }
> + spin_unlock(&rport->lock);
> }
>
> static int
> @@ -319,17 +332,18 @@ fcloop_ls_req(struct nvme_fc_local_port *localport,
> int ret = 0;
>
> tls_req->lsreq = lsreq;
> - INIT_WORK(&tls_req->work, fcloop_tgt_lsrqst_done_work);
> + INIT_LIST_HEAD(&tls_req->ls_list);
>
> if (!rport->targetport) {
> tls_req->status = -ECONNREFUSED;
> - tls_req->tport = NULL;
> - schedule_work(&tls_req->work);
> + spin_lock(&rport->lock);
> + list_add_tail(&rport->ls_list, &tls_req->ls_list);
> + spin_unlock(&rport->lock);
> + schedule_work(&rport->ls_work);
> return ret;
> }
>
> tls_req->status = 0;
> - tls_req->tport = rport->targetport->private;
> ret = nvmet_fc_rcv_ls_req(rport->targetport, NULL, &tls_req->ls_rsp,
> lsreq->rqstaddr, lsreq->rqstlen);
>
> @@ -337,18 +351,28 @@ fcloop_ls_req(struct nvme_fc_local_port *localport,
> }
>
> static int
> -fcloop_xmt_ls_rsp(struct nvmet_fc_target_port *tport,
> +fcloop_xmt_ls_rsp(struct nvmet_fc_target_port *targetport,
> struct nvmefc_ls_rsp *lsrsp)
> {
> struct fcloop_lsreq *tls_req = ls_rsp_to_lsreq(lsrsp);
> struct nvmefc_ls_req *lsreq = tls_req->lsreq;
> + struct fcloop_tport *tport = targetport->private;
> + struct nvme_fc_remote_port *remoteport = tport->remoteport;
> + struct fcloop_rport *rport;
>
> memcpy(lsreq->rspaddr, lsrsp->rspbuf,
> ((lsreq->rsplen < lsrsp->rsplen) ?
> lsreq->rsplen : lsrsp->rsplen));
> +
> lsrsp->done(lsrsp);
>
> - schedule_work(&tls_req->work);
> + if (remoteport) {
> + rport = remoteport->private;
> + spin_lock(&rport->lock);
> + list_add_tail(&rport->ls_list, &tls_req->ls_list);
> + spin_unlock(&rport->lock);
> + schedule_work(&rport->ls_work);
> + }
>
> return 0;
> }
> @@ -834,6 +858,7 @@ fcloop_remoteport_delete(struct nvme_fc_remote_port *remoteport)
> {
> struct fcloop_rport *rport = remoteport->private;
>
> + flush_work(&rport->ls_work);
> fcloop_nport_put(rport->nport);
> }
>
> @@ -1136,6 +1161,9 @@ fcloop_create_remote_port(struct device *dev, struct device_attribute *attr,
> rport->nport = nport;
> rport->lport = nport->lport;
> nport->rport = rport;
> + spin_lock_init(&rport->lock);
> + INIT_WORK(&rport->ls_work, fcloop_rport_lsrqst_work);
> + INIT_LIST_HEAD(&rport->ls_list);
>
> return count;
> }
>
Looks Good.
Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
--
- Himanshu
_______________________________________________
linux-nvme mailing list
linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme
next prev parent reply other threads:[~2020-03-26 16:35 UTC|newest]
Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-05 18:37 [PATCH 00/29] nvme-fc/nvmet-fc: Add FC-NVME-2 disconnect association support James Smart
2020-02-05 18:37 ` [PATCH 01/29] nvme-fc: Sync header to FC-NVME-2 rev 1.08 James Smart
2020-02-28 20:36 ` Sagi Grimberg
2020-03-06 8:16 ` Hannes Reinecke
2020-03-26 16:10 ` Himanshu Madhani
2020-02-05 18:37 ` [PATCH 02/29] nvmet-fc: fix typo in comment James Smart
2020-02-28 20:36 ` Sagi Grimberg
2020-03-06 8:17 ` Hannes Reinecke
2020-03-26 16:10 ` Himanshu Madhani
2020-02-05 18:37 ` [PATCH 03/29] nvme-fc and nvmet-fc: revise LLDD api for LS reception and LS request James Smart
2020-02-28 20:38 ` Sagi Grimberg
2020-03-06 8:19 ` Hannes Reinecke
2020-03-26 16:16 ` Himanshu Madhani
2020-02-05 18:37 ` [PATCH 04/29] nvme-fc nvmet_fc nvme_fcloop: adapt code to changed names in api header James Smart
2020-02-28 20:40 ` Sagi Grimberg
2020-03-06 8:21 ` Hannes Reinecke
2020-03-26 16:26 ` Himanshu Madhani
2020-02-05 18:37 ` [PATCH 05/29] lpfc: " James Smart
2020-02-28 20:40 ` Sagi Grimberg
2020-03-06 8:25 ` Hannes Reinecke
2020-03-26 16:30 ` Himanshu Madhani
2020-02-05 18:37 ` [PATCH 06/29] nvme-fcloop: Fix deallocation of working context James Smart
2020-02-28 20:43 ` Sagi Grimberg
2020-03-06 8:34 ` Hannes Reinecke
2020-03-26 16:35 ` Himanshu Madhani [this message]
2020-02-05 18:37 ` [PATCH 07/29] nvme-fc nvmet-fc: refactor for common LS definitions James Smart
2020-03-06 8:35 ` Hannes Reinecke
2020-03-26 16:36 ` Himanshu Madhani
2020-02-05 18:37 ` [PATCH 08/29] nvmet-fc: Better size LS buffers James Smart
2020-02-28 21:04 ` Sagi Grimberg
2020-03-06 8:36 ` Hannes Reinecke
2020-02-05 18:37 ` [PATCH 09/29] nvme-fc: Ensure private pointers are NULL if no data James Smart
2020-02-28 21:05 ` Sagi Grimberg
2020-03-06 8:44 ` Hannes Reinecke
2020-03-26 16:39 ` Himanshu Madhani
2020-02-05 18:37 ` [PATCH 10/29] nvmefc: Use common definitions for LS names, formatting, and validation James Smart
2020-03-06 8:44 ` Hannes Reinecke
2020-03-26 16:41 ` Himanshu Madhani
2020-02-05 18:37 ` [PATCH 11/29] nvme-fc: convert assoc_active flag to atomic James Smart
2020-02-28 21:08 ` Sagi Grimberg
2020-03-06 8:47 ` Hannes Reinecke
2020-03-26 19:16 ` Himanshu Madhani
2020-02-05 18:37 ` [PATCH 12/29] nvme-fc: Add Disconnect Association Rcv support James Smart
2020-03-06 9:00 ` Hannes Reinecke
2020-02-05 18:37 ` [PATCH 13/29] nvmet-fc: add LS failure messages James Smart
2020-03-06 9:01 ` Hannes Reinecke
2020-02-05 18:37 ` [PATCH 14/29] nvmet-fc: perform small cleanups on unneeded checks James Smart
2020-03-06 9:01 ` Hannes Reinecke
2020-02-05 18:37 ` [PATCH 15/29] nvmet-fc: track hostport handle for associations James Smart
2020-03-06 9:02 ` Hannes Reinecke
2020-02-05 18:37 ` [PATCH 16/29] nvmet-fc: rename ls_list to ls_rcv_list James Smart
2020-03-06 9:03 ` Hannes Reinecke
2020-02-05 18:37 ` [PATCH 17/29] nvmet-fc: Add Disconnect Association Xmt support James Smart
2020-03-06 9:04 ` Hannes Reinecke
2020-02-05 18:37 ` [PATCH 18/29] nvme-fcloop: refactor to enable target to host LS James Smart
2020-03-06 9:06 ` Hannes Reinecke
2020-02-05 18:37 ` [PATCH 19/29] nvme-fcloop: add target to host LS request support James Smart
2020-03-06 9:07 ` Hannes Reinecke
2020-02-05 18:37 ` [PATCH 20/29] lpfc: Refactor lpfc nvme headers James Smart
2020-03-06 9:18 ` Hannes Reinecke
2020-02-05 18:37 ` [PATCH 21/29] lpfc: Refactor nvmet_rcv_ctx to create lpfc_async_xchg_ctx James Smart
2020-03-06 9:19 ` Hannes Reinecke
2020-02-05 18:37 ` [PATCH 22/29] lpfc: Commonize lpfc_async_xchg_ctx state and flag definitions James Smart
2020-03-06 9:19 ` Hannes Reinecke
2020-02-05 18:37 ` [PATCH 23/29] lpfc: Refactor NVME LS receive handling James Smart
2020-03-06 9:20 ` Hannes Reinecke
2020-02-05 18:37 ` [PATCH 24/29] lpfc: Refactor Send LS Request support James Smart
2020-03-06 9:20 ` Hannes Reinecke
2020-02-05 18:37 ` [PATCH 25/29] lpfc: Refactor Send LS Abort support James Smart
2020-03-06 9:21 ` Hannes Reinecke
2020-02-05 18:37 ` [PATCH 26/29] lpfc: Refactor Send LS Response support James Smart
2020-03-06 9:21 ` Hannes Reinecke
2020-02-05 18:37 ` [PATCH 27/29] lpfc: nvme: Add Receive LS Request and Send LS Response support to nvme James Smart
2020-03-06 9:23 ` Hannes Reinecke
2020-02-05 18:37 ` [PATCH 28/29] lpfc: nvmet: Add support for NVME LS request hosthandle James Smart
2020-03-06 9:23 ` Hannes Reinecke
2020-02-05 18:37 ` [PATCH 29/29] lpfc: nvmet: Add Send LS Request and Abort LS Request support James Smart
2020-03-06 9:24 ` Hannes Reinecke
2020-03-06 9:26 ` [PATCH 00/29] nvme-fc/nvmet-fc: Add FC-NVME-2 disconnect association support Hannes Reinecke
2020-03-31 14:29 ` Christoph Hellwig
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=08681e8f-1d17-ce21-c1f9-22d0be3d09c2@oracle.com \
--to=himanshu.madhani@oracle.com \
--cc=jsmart2021@gmail.com \
--cc=linux-nvme@lists.infradead.org \
--cc=martin.petersen@oracle.com \
/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;
as well as URLs for NNTP newsgroup(s).