Skip to contentSkip to conversation

nvme: cancel async events before freeing event struct

PATCH Applied David Milburn 4 participants 7 messages Sep 2, 2020 – Sep 8, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

v3 cover nvme: cancel async events before freeing event struct

Cancel async event work in case async event has been queued up, and transport trys to submit event after it has been freed.

David Milburn (3):
nvme-rdma: cancel async events before freeing event struct
nvme-tcp: cancel async events before freeing event struct
nvme-fc: cancel async events before freeing event struct

 drivers/nvme/host/fc.c   | 1 +
 drivers/nvme/host/rdma.c | 1 +
 drivers/nvme/host/tcp.c  | 1 +
 3 files changed, 3 insertions(+)
Signature · 7 lines
2.18.1


_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme
#1 lore raw

PATCH v3 1/3 nvme-rdma: cancel async events before freeing event struct

Cancel async event work in case async event has been queued up, and nvme_rdma_submit_async_event() runs after event has been freed.

---
 drivers/nvme/host/rdma.c | 1 +
 1 file changed, 1 insertion(+)
drivers/nvme/host/rdma.c +1 -0
index 8e5ffe2f117d..9e378d0a0c01 100644
@@ -835,6 +835,7 @@ static void nvme_rdma_destroy_admin_queue(struct nvme_rdma_ctrl *ctrl,
 		blk_mq_free_tag_set(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;
Signature · 7 lines
2.18.1


_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme
#2 lore raw

PATCH v3 2/3 nvme-tcp: cancel async events before freeing event struct

In reply to David Milburn

Cancel async event work in case async event has been queued up, and nvme_tcp_submit_async_event() runs after event has been freed.

---
 drivers/nvme/host/tcp.c | 1 +
 1 file changed, 1 insertion(+)
drivers/nvme/host/tcp.c +1 -0
index 16851ae3bddf..8f4f29f18b8c 100644
@@ -1596,6 +1596,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;
 	}
Signature · 7 lines
2.18.1


_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme
#3 lore raw

PATCH v3 3/3 nvme-fc: cancel async events before freeing event struct

In reply to David Milburn

Cancel async event work in case async event has been queued up, and nvme_fc_submit_async_event() runs after event has been freed.

---
 drivers/nvme/host/fc.c | 1 +
 1 file changed, 1 insertion(+)
drivers/nvme/host/fc.c +1 -0
index a7f474ddfff7..e8ef42b9d50c 100644
@@ -2160,6 +2160,7 @@ nvme_fc_term_aen_ops(struct nvme_fc_ctrl *ctrl)
 	struct nvme_fc_fcp_op *aen_op;
 	int i;
 
+	cancel_work_sync(&ctrl->ctrl.async_event_work);
 	aen_op = ctrl->aen_ops;
 	for (i = 0; i < NVME_NR_AEN_COMMANDS; i++, aen_op++) {
 		__nvme_fc_exit_request(ctrl, aen_op);
Signature · 7 lines
2.18.1


_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme
maintainer Reviewed-by on the v3 series
#4 lore raw
In reply to David Milburn
Quoted 2 lines · David Milburn

Cancel async event work in case async event has been queued up, and transport trys to submit event after it has been freed.

Looks good to me.

Quoted 9 lines

David Milburn (3):
nvme-rdma: cancel async events before freeing event struct
nvme-tcp: cancel async events before freeing event struct
nvme-fc: cancel async events before freeing event struct

 drivers/nvme/host/fc.c   | 1 +
 drivers/nvme/host/rdma.c | 1 +
 drivers/nvme/host/tcp.c  | 1 +
 3 files changed, 3 insertions(+)

_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme