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 4.19 13/19] nvme-rdma: cancel async events before freeing event struct
Date: Mon, 14 Sep 2020 09:04:56 -0400 [thread overview]
Message-ID: <20200914130502.1804708-13-sashal@kernel.org> (raw)
In-Reply-To: <20200914130502.1804708-1-sashal@kernel.org>
From: David Milburn <dmilburn@redhat.com>
[ Upstream commit 925dd04c1f9825194b9e444c12478084813b2b5d ]
Cancel async event work in case async event has been queued up, and
nvme_rdma_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/rdma.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
index f393a6193252e..8a11e26d17683 100644
--- a/drivers/nvme/host/rdma.c
+++ b/drivers/nvme/host/rdma.c
@@ -739,6 +739,7 @@ static void nvme_rdma_destroy_admin_queue(struct nvme_rdma_ctrl *ctrl,
nvme_rdma_free_tagset(&ctrl->ctrl, ctrl->ctrl.admin_tagset);
}
if (ctrl->async_event_sqe.data) {
+ cancel_work_sync(&ctrl->ctrl.async_event_work);
nvme_rdma_free_qe(ctrl->device->dev, &ctrl->async_event_sqe,
sizeof(struct nvme_command), DMA_TO_DEVICE);
ctrl->async_event_sqe.data = NULL;
--
2.25.1
next prev parent reply other threads:[~2020-09-14 14:30 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-14 13:04 [PATCH AUTOSEL 4.19 01/19] NFSv4.1 handle ERR_DELAY error reclaiming locking state on delegation recall Sasha Levin
2020-09-14 13:04 ` [PATCH AUTOSEL 4.19 02/19] scsi: pm8001: Fix memleak in pm8001_exec_internal_task_abort Sasha Levin
2020-09-14 13:04 ` [PATCH AUTOSEL 4.19 03/19] scsi: libfc: Fix for double free() Sasha Levin
2020-09-14 13:04 ` [PATCH AUTOSEL 4.19 04/19] scsi: lpfc: Fix FLOGI/PLOGI receive race condition in pt2pt discovery Sasha Levin
2020-09-14 13:04 ` [PATCH AUTOSEL 4.19 05/19] regulator: pwm: Fix machine constraints application Sasha Levin
2020-09-14 13:04 ` [PATCH AUTOSEL 4.19 06/19] spi: spi-loopback-test: Fix out-of-bounds read Sasha Levin
2020-09-14 13:04 ` [PATCH AUTOSEL 4.19 07/19] NFS: Zero-stateid SETATTR should first return delegation Sasha Levin
2020-09-14 13:04 ` [PATCH AUTOSEL 4.19 08/19] SUNRPC: stop printk reading past end of string Sasha Levin
2020-09-14 13:04 ` [PATCH AUTOSEL 4.19 09/19] rapidio: Replace 'select' DMAENGINES 'with depends on' Sasha Levin
2020-09-14 13:04 ` [PATCH AUTOSEL 4.19 10/19] kobject: Drop unneeded conditional in __kobject_del() Sasha Levin
2020-09-14 13:04 ` [PATCH AUTOSEL 4.19 11/19] openrisc: Fix cache API compile issue when not inlining Sasha Levin
2020-09-14 13:04 ` [PATCH AUTOSEL 4.19 12/19] nvme-fc: cancel async events before freeing event struct Sasha Levin
2020-09-14 13:04 ` Sasha Levin [this message]
2020-09-14 13:04 ` [PATCH AUTOSEL 4.19 14/19] f2fs: fix indefinite loop scanning for free nid Sasha Levin
2020-09-14 13:04 ` [PATCH AUTOSEL 4.19 15/19] f2fs: Return EOF on unaligned end of file DIO read Sasha Levin
2020-09-14 13:04 ` [PATCH AUTOSEL 4.19 16/19] i2c: algo: pca: Reapply i2c bus settings after reset Sasha Levin
2020-09-14 13:05 ` [PATCH AUTOSEL 4.19 17/19] spi: Fix memory leak on splited transfers Sasha Levin
2020-09-14 13:05 ` [PATCH AUTOSEL 4.19 18/19] gcov: add support for GCC 10.1 Sasha Levin
2020-09-14 13:05 ` [PATCH AUTOSEL 4.19 19/19] 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=20200914130502.1804708-13-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