nvme-tcp: cancel async events before freeing event struct

David Milburn · Christoph Hellwig · commit ceb1e0874dba · 2020-09-08T19:46:29.000+02:00
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 &lt;dmilburn@redhat.com&gt;
Reviewed-by: Keith Busch &lt;kbusch@kernel.org&gt;
Reviewed-by: Sagi Grimberg &lt;sagi@grimberg.me&gt;
Signed-off-by: Christoph Hellwig &lt;hch@lst.de&gt;
diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c
@@ -1597,6 +1597,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;
 	}

Original file line number	Diff line number	Diff line change
`@@ -1597,6 +1597,7 @@ static struct blk_mq_tag_set nvme_tcp_alloc_tagset(struct nvme_ctrl nctrl,`
`1597`	`1597`	`static void nvme_tcp_free_admin_queue(struct nvme_ctrl *ctrl)`
`1598`	`1598`	`{`
`1599`	`1599`	`if (to_tcp_ctrl(ctrl)->async_req.pdu) {`
	`1600`	`+ cancel_work_sync(&ctrl->async_event_work);`
`1600`	`1601`	`nvme_tcp_free_async_req(to_tcp_ctrl(ctrl));`
`1601`	`1602`	`to_tcp_ctrl(ctrl)->async_req.pdu = NULL;`
`1602`	`1603`	`}`