From: Max Gurtovoy <mgurtovoy@nvidia.com>
To: Sagi Grimberg <sagi@grimberg.me>,
"brookxu.cn" <brookxu.cn@gmail.com>,
kbusch@kernel.org, axboe@kernel.dk, hch@lst.de,
maxg@mellanox.com
Cc: linux-nvme@lists.infradead.org
Subject: Re: [PATCH] nvme: avoid double free special payload
Date: Tue, 11 Jun 2024 14:47:24 +0300 [thread overview]
Message-ID: <da056c53-cbed-40c7-afa4-e8b57c48e0b4@nvidia.com> (raw)
In-Reply-To: <c6b15807-dc35-453e-b162-982fca77443f@grimberg.me>
hi,
On 11/06/2024 13:53, Sagi Grimberg wrote:
> Looks reasonable.
>
> Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
>
>
> On 11/06/2024 13:02, brookxu.cn wrote:
>> From: Chunguang Xu <chunguang.xu@shopee.com>
>>
>> Now we may double free spacial payload for some requests, such as
>> discard. This will corrupt the memory and lead to kernel crash. Now we
>> will free special payload before retry it. If we disconnect device
>> before reconnect success, then we will fail request by
>> nvme_fail_nonready_command(), as a result we will double free
>> special payload. Here try to fix it, we may can clear RQF_SPECIAL_LOAD
>> bit after we cleanup command. This will not broken following clean
>> logic of blkmq, as nvme request will not be partial complete.
>>
>> Fixes: 16686f3a6c3c ("nvme: move common call to nvme_cleanup_cmd to
>> core layer")
I'm not sure that this commit caused the bug. The nvme_cleanup_cmd() was
called in this path also before this commit.
>> Signed-off-by: Chunguang Xu <chunguang.xu@shopee.com>
The fix looks fine to me, but the commit message can be improved a bit
to be more clear about the scenario.
Reviewed-by: Max Gurtovoy <mgurtovoy@nvidia.com>
>> ---
>> drivers/nvme/host/core.c | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
>> index f5d150c62955..c40930d10bd3 100644
>> --- a/drivers/nvme/host/core.c
>> +++ b/drivers/nvme/host/core.c
>> @@ -998,6 +998,7 @@ void nvme_cleanup_cmd(struct request *req)
>> clear_bit_unlock(0, &ctrl->discard_page_busy);
>> else
>> kfree(bvec_virt(&req->special_vec));
>> + req->rq_flags &= ~RQF_SPECIAL_PAYLOAD;
>> }
>> }
>> EXPORT_SYMBOL_GPL(nvme_cleanup_cmd);
>
next prev parent reply other threads:[~2024-06-11 11:47 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-11 10:02 [PATCH] nvme: avoid double free special payload brookxu.cn
2024-06-11 10:53 ` Sagi Grimberg
2024-06-11 11:47 ` Max Gurtovoy [this message]
2024-06-12 18:01 ` Keith Busch
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=da056c53-cbed-40c7-afa4-e8b57c48e0b4@nvidia.com \
--to=mgurtovoy@nvidia.com \
--cc=axboe@kernel.dk \
--cc=brookxu.cn@gmail.com \
--cc=hch@lst.de \
--cc=kbusch@kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=maxg@mellanox.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