From: Hou Pu <houpu.main@gmail.com>
To: elad.grupi@dell.com
Cc: linux-nvme@lists.infradead.org, sagi@grimberg.me, houpu.main@gmail.com
Subject: RE: [PATCH] nvmet-tcp: fix a segmentation fault during io parsing error
Date: Fri, 19 Mar 2021 11:52:57 +0800 [thread overview]
Message-ID: <20210319035257.96267-1-houpu.main@gmail.com> (raw)
In-Reply-To: <20210318125518.27121-1-elad.grupi@dell.com>
> diff --git a/drivers/nvme/target/tcp.c b/drivers/nvme/target/tcp.c
> index 70cc507d1565..5650293acaec 100644
> --- a/drivers/nvme/target/tcp.c
> +++ b/drivers/nvme/target/tcp.c
> @@ -702,6 +702,17 @@ static int nvmet_tcp_try_send_one(struct nvmet_tcp_queue *queue,
> return 0;
> }
>
> + if (unlikely((cmd->flags & NVMET_TCP_F_INIT_FAILED) &&
> + nvmet_tcp_has_data_in(cmd) &&
> + nvmet_tcp_has_inline_data(cmd))) {
> + /*
> + * wait for inline data before processing the response
> + * so the iov will not be freed
> + */
> + queue->snd_cmd = NULL;
> + goto done_send;
> + }
> +
Hi Elad,
Although this works, I think Sagi would prefer not adding this to the
response queue in nvmet_tcp_queue_response().
> if (cmd->state == NVMET_TCP_SEND_DATA_PDU) {
> ret = nvmet_try_send_data_pdu(cmd);
> if (ret <= 0)
> @@ -1106,7 +1117,9 @@ static int nvmet_tcp_try_recv_data(struct nvmet_tcp_queue *queue)
> if (!(cmd->flags & NVMET_TCP_F_INIT_FAILED) &&
> cmd->rbytes_done == cmd->req.transfer_len) {
> cmd->req.execute(&cmd->req);
> - }
> + } else if ((cmd->flags & NVMET_TCP_F_INIT_FAILED) &&
> + cmd->rbytes_done == cmd->req.transfer_len)
> + nvmet_tcp_queue_response(&cmd->req);
>
> nvmet_prepare_receive_pdu(queue);
> return 0;
> @@ -1146,6 +1159,8 @@ static int nvmet_tcp_try_recv_ddgst(struct nvmet_tcp_queue *queue)
> if (!(cmd->flags & NVMET_TCP_F_INIT_FAILED) &&
> cmd->rbytes_done == cmd->req.transfer_len)
> cmd->req.execute(&cmd->req);
> + else if ((cmd->flags & NVMET_TCP_F_INIT_FAILED))
> + nvmet_tcp_queue_response(&cmd->req);
Here we also need to check cmd->rbytes_done == cmd->req.transfer_len as
we could get multiple data pdu.
(BTW, did you forget to add [PATCH v2] to the subject line?)
Thanks,
Hou
_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme
next prev parent reply other threads:[~2021-03-19 3:54 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-18 12:55 [PATCH] nvmet-tcp: fix a segmentation fault during io parsing error elad.grupi
2021-03-19 3:52 ` Hou Pu [this message]
2021-03-19 17:26 ` Grupi, Elad
2021-03-22 4:06 ` Hou Pu
-- strict thread matches above, loose matches on Subject: below --
2021-03-25 22:49 elad.grupi
2021-03-26 10:26 ` Hou Pu
2021-03-26 18:00 ` Grupi, Elad
2021-03-18 8:28 elad.grupi
2021-03-18 11:13 ` Hou Pu
2021-03-18 13:08 ` Hou Pu
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=20210319035257.96267-1-houpu.main@gmail.com \
--to=houpu.main@gmail.com \
--cc=elad.grupi@dell.com \
--cc=linux-nvme@lists.infradead.org \
--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