From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: David Milburn <dmilburn@redhat.com>,
Keith Busch <kbusch@kernel.org>, Sagi Grimberg <sagi@grimberg.me>,
Christoph Hellwig <hch@lst.de>, Sasha Levin <sashal@kernel.org>,
linux-nvme@lists.infradead.org
Subject: [PATCH AUTOSEL 5.4 15/22] nvme-tcp: cancel async events before freeing event struct
Date: Mon, 14 Sep 2020 09:04:27 -0400 [thread overview]
Message-ID: <20200914130434.1804478-15-sashal@kernel.org> (raw)
In-Reply-To: <20200914130434.1804478-1-sashal@kernel.org>
From: David Milburn <dmilburn@redhat.com>
[ Upstream commit ceb1e0874dba5cbfc4e0b4145796a4bfb3716e6a ]
Cancel async event work in case async event has been queued up, and
nvme_tcp_submit_async_event() runs after event has been freed.
Signed-off-by: David Milburn <dmilburn@redhat.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/nvme/host/tcp.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c
index 0166ff0e4738e..26eccad043a20 100644
--- a/drivers/nvme/host/tcp.c
+++ b/drivers/nvme/host/tcp.c
@@ -1506,6 +1506,7 @@ static struct blk_mq_tag_set *nvme_tcp_alloc_tagset(struct nvme_ctrl *nctrl,
static void nvme_tcp_free_admin_queue(struct nvme_ctrl *ctrl)
{
if (to_tcp_ctrl(ctrl)->async_req.pdu) {
+ cancel_work_sync(&ctrl->async_event_work);
nvme_tcp_free_async_req(to_tcp_ctrl(ctrl));
to_tcp_ctrl(ctrl)->async_req.pdu = NULL;
}
--
2.25.1
next prev parent reply other threads:[~2020-09-14 14:45 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-14 13:04 [PATCH AUTOSEL 5.4 01/22] NFSv4.1 handle ERR_DELAY error reclaiming locking state on delegation recall Sasha Levin
2020-09-14 13:04 ` [PATCH AUTOSEL 5.4 02/22] scsi: pm8001: Fix memleak in pm8001_exec_internal_task_abort Sasha Levin
2020-09-14 13:04 ` [PATCH AUTOSEL 5.4 03/22] scsi: libfc: Fix for double free() Sasha Levin
2020-09-14 13:04 ` [PATCH AUTOSEL 5.4 04/22] scsi: lpfc: Fix FLOGI/PLOGI receive race condition in pt2pt discovery Sasha Levin
2020-09-14 13:04 ` [PATCH AUTOSEL 5.4 05/22] regulator: pwm: Fix machine constraints application Sasha Levin
2020-09-14 13:04 ` [PATCH AUTOSEL 5.4 06/22] spi: spi-loopback-test: Fix out-of-bounds read Sasha Levin
2020-09-14 13:04 ` [PATCH AUTOSEL 5.4 07/22] NFS: Zero-stateid SETATTR should first return delegation Sasha Levin
2020-09-14 13:04 ` [PATCH AUTOSEL 5.4 08/22] SUNRPC: stop printk reading past end of string Sasha Levin
2020-09-14 13:04 ` [PATCH AUTOSEL 5.4 09/22] rapidio: Replace 'select' DMAENGINES 'with depends on' Sasha Levin
2020-09-14 13:04 ` [PATCH AUTOSEL 5.4 10/22] cifs: fix DFS mount with cifsacl/modefromsid Sasha Levin
2020-09-14 13:04 ` [PATCH AUTOSEL 5.4 11/22] kobject: Drop unneeded conditional in __kobject_del() Sasha Levin
2020-09-14 13:04 ` [PATCH AUTOSEL 5.4 12/22] openrisc: Fix cache API compile issue when not inlining Sasha Levin
2020-09-14 13:04 ` [PATCH AUTOSEL 5.4 13/22] nvme-fc: cancel async events before freeing event struct Sasha Levin
2020-09-14 13:04 ` [PATCH AUTOSEL 5.4 14/22] nvme-rdma: " Sasha Levin
2020-09-14 13:04 ` Sasha Levin [this message]
2020-09-14 13:04 ` [PATCH AUTOSEL 5.4 16/22] block: only call sched requeue_request() for scheduled requests Sasha Levin
2020-09-14 13:04 ` [PATCH AUTOSEL 5.4 17/22] f2fs: fix indefinite loop scanning for free nid Sasha Levin
2020-09-14 13:04 ` [PATCH AUTOSEL 5.4 18/22] f2fs: Return EOF on unaligned end of file DIO read Sasha Levin
2020-09-14 13:04 ` [PATCH AUTOSEL 5.4 19/22] i2c: algo: pca: Reapply i2c bus settings after reset Sasha Levin
2020-09-14 13:04 ` [PATCH AUTOSEL 5.4 20/22] spi: Fix memory leak on splited transfers Sasha Levin
2020-09-14 13:04 ` [PATCH AUTOSEL 5.4 21/22] gcov: add support for GCC 10.1 Sasha Levin
2020-09-14 13:04 ` [PATCH AUTOSEL 5.4 22/22] KVM: MIPS: Change the definition of kvm type Sasha Levin
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=20200914130434.1804478-15-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=dmilburn@redhat.com \
--cc=hch@lst.de \
--cc=kbusch@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=sagi@grimberg.me \
--cc=stable@vger.kernel.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