From: Sagi Grimberg <sagi@grimberg.me>
To: elad.grupi@dell.com, linux-nvme@lists.infradead.org
Subject: Re: [PATCH] nvme-tcp: fix a segmentation fault during io parsing error
Date: Wed, 13 Jan 2021 14:47:18 -0800 [thread overview]
Message-ID: <ad9f038b-9920-21da-755c-85f4e2228a22@grimberg.me> (raw)
In-Reply-To: <20210113115152.69692-1-elad.grupi@dell.com>
Hey Elad,
> From: Elad Grupi <elad.grupi@dell.com>
>
> In case there is an io that contains inline data and it goes to
> parsing error flow, command response will free command and iov
> before clearing the data on the socket buffer.
> This will delay the command response until receive flow is completed.
>
> Signed-off-by: Elad Grupi <elad.grupi@dell.com>
> ---
> drivers/nvme/target/tcp.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/nvme/target/tcp.c b/drivers/nvme/target/tcp.c
> index d535080b781f..dea94da4c9ba 100644
> --- a/drivers/nvme/target/tcp.c
> +++ b/drivers/nvme/target/tcp.c
> @@ -146,6 +146,7 @@ static struct workqueue_struct *nvmet_tcp_wq;
> static struct nvmet_fabrics_ops nvmet_tcp_ops;
> static void nvmet_tcp_free_cmd(struct nvmet_tcp_cmd *c);
> static void nvmet_tcp_finish_cmd(struct nvmet_tcp_cmd *cmd);
> +static void nvmet_tcp_queue_response(struct nvmet_req *req);
>
> static inline u16 nvmet_tcp_cmd_tag(struct nvmet_tcp_queue *queue,
> struct nvmet_tcp_cmd *cmd)
> @@ -476,7 +477,11 @@ static struct nvmet_tcp_cmd *nvmet_tcp_fetch_cmd(struct nvmet_tcp_queue *queue)
> nvmet_setup_c2h_data_pdu(queue->snd_cmd);
> else if (nvmet_tcp_need_data_in(queue->snd_cmd))
> nvmet_setup_r2t_pdu(queue->snd_cmd);
> - else
> + else if (nvmet_tcp_has_data_in(queue->snd_cmd) &&
> + nvmet_tcp_has_inline_data(queue->snd_cmd)) {
This deserves a comment I think.
Did you get a chance to look into what I sent you guys?
> + nvmet_tcp_queue_response(&queue->snd_cmd->req);
> + queue->snd_cmd = NULL;
> + } else
> nvmet_setup_response_pdu(queue->snd_cmd);
>
> return queue->snd_cmd;
>
_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme
next prev parent reply other threads:[~2021-01-13 22:47 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-13 11:51 [PATCH] nvme-tcp: fix a segmentation fault during io parsing error elad.grupi
2021-01-13 22:47 ` Sagi Grimberg [this message]
2021-01-14 11:51 ` Grupi, Elad
2021-01-14 21:18 ` Sagi Grimberg
2021-01-14 21:41 ` Grupi, Elad
2021-01-16 1:19 ` Sagi Grimberg
2021-01-17 9:46 ` Grupi, Elad
2021-01-31 15:48 ` Grupi, Elad
2021-03-16 9:35 ` Hou Pu
2021-03-16 15:52 ` Grupi, Elad
2021-03-17 4:11 ` Hou Pu
2021-03-18 8:31 ` Grupi, Elad
2021-03-16 6:21 ` Sagi Grimberg
2021-03-16 15:45 ` Grupi, Elad
2021-03-18 8:31 ` Grupi, Elad
-- strict thread matches above, loose matches on Subject: below --
2021-01-14 13:04 elad.grupi
2021-01-12 14:00 elad.grupi
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=ad9f038b-9920-21da-755c-85f4e2228a22@grimberg.me \
--to=sagi@grimberg.me \
--cc=elad.grupi@dell.com \
--cc=linux-nvme@lists.infradead.org \
/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).