avoid request double completion for concurrent nvme_rdma(tcp)_timeout
v2 cover avoid request double completion for concurrent nvme_rdma(tcp)_timeout
Concurrent nvme_rdma(tcp)_timeout may cause: complete request before the qp is fully drained(the io work is completely canceled) may lead to a use-after-free condition.
The patch sets fix it.
Chao Leng (2):
nvme-rdma: avoid request double completion for concurrent
nvme_rdma_timeout
nvme-tcp: avoid request double completion for concurrent
nvme_tcp_timeout
drivers/nvme/host/rdma.c | 15 +++++++++++---- drivers/nvme/host/tcp.c | 14 ++++++++++---- 2 files changed, 21 insertions(+), 8 deletions(-)
Signature · 7 lines
2.16.4 _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
PATCH v2 1/2 nvme-rdma: avoid request double completion for concurrent nvme_rdma_timeout
A crash happens when inject completing request long time(nearly 30s). Each name space has a request queue, when inject completing request long time, multi request queues may have time out requests at the same time, nvme_rdma_timeout will execute concurrently. Multi requests in different request queues may be queued in the same rdma queue, multi nvme_rdma_timeout may call nvme_rdma_stop_queue at the same time. The first nvme_rdma_timeout will clear NVME_RDMA_Q_LIVE and continue stopping the rdma queue(drain qp), but the others check NVME_RDMA_Q_LIVE is already cleared, and then directly complete the requests, complete request before the qp is fully drained may lead to a use-after-free condition.
Add a multex lock to serialize nvme_rdma_stop_queue.
--- drivers/nvme/host/rdma.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
drivers/nvme/host/rdma.c +11 -4
@@ -97,6 +97,7 @@ struct nvme_rdma_queue {struct completion cm_done;bool pi_support;int cq_size; +struct mutex queue_lock; };struct nvme_rdma_ctrl {
@@ -579,6 +580,7 @@ static int nvme_rdma_alloc_queue(struct nvme_rdma_ctrl *ctrl,int ret; queue = &ctrl->queues[idx]; +mutex_init (&queue->queue_lock); queue->ctrl = ctrl;if (idx && ctrl->ctrl.max_integrity_segments) queue->pi_support = true;
@@ -598,7 +600,8 @@ static int nvme_rdma_alloc_queue(struct nvme_rdma_ctrl *ctrl,if (IS_ERR (queue->cm_id)) {dev_info (ctrl->ctrl.device,"failed to create CM ID: %ld\n" ,PTR_ERR (queue->cm_id)); -return PTR_ERR (queue->cm_id); + ret =PTR_ERR (queue->cm_id); + goto out_destroy_mutex; }if (ctrl->ctrl.opts->mask &NVMF_OPT_HOST_TRADDR )
@@ -628,6 +631,8 @@ static int nvme_rdma_alloc_queue(struct nvme_rdma_ctrl *ctrl, out_destroy_cm_id:rdma_destroy_id (queue->cm_id);nvme_rdma_destroy_queue_ib (queue); +out_destroy_mutex: +mutex_destroy (&queue->queue_lock);return ret; }
@@ -639,9 +644,10 @@ static void __nvme_rdma_stop_queue(struct nvme_rdma_queue *queue)static void nvme_rdma_stop_queue (struct nvme_rdma_queue *queue) { -if (!test_and_clear_bit (NVME_RDMA_Q_LIVE , &queue->flags)) -return ; -__nvme_rdma_stop_queue (queue); +mutex_lock (&queue->queue_lock); +if (test_and_clear_bit (NVME_RDMA_Q_LIVE , &queue->flags)) +__nvme_rdma_stop_queue (queue); +mutex_unlock (&queue->queue_lock); }static void nvme_rdma_free_queue (struct nvme_rdma_queue *queue)
@@ -651,6 +657,7 @@ static void nvme_rdma_free_queue(struct nvme_rdma_queue *queue)nvme_rdma_destroy_queue_ib (queue);rdma_destroy_id (queue->cm_id); +mutex_destroy (&queue->queue_lock); }static void nvme_rdma_free_io_queues (struct nvme_rdma_ctrl *ctrl)
Signature · 7 lines
2.16.4 _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
Re: [PATCH v2 1/2] nvme-rdma: avoid request double completion for concurrent nvme_rdma_timeout
Quoted 12 lines · Chao Leng
A crash happens when inject completing request long time(nearly 30s). Each name space has a request queue, when inject completing request long time, multi request queues may have time out requests at the same time,
nvme_rdma_timeoutwill execute concurrently. Multi requests in different request queues may be queued in the same rdma queue, multinvme_rdma_timeoutmay callnvme_rdma_stop_queueat the same time. The firstnvme_rdma_timeoutwill clearNVME_RDMA_Q_LIVEand continue stopping the rdma queue(drain qp), but the others checkNVME_RDMA_Q_LIVEis already cleared, and then directly complete the requests, complete request before the qp is fully drained may lead to a use-after-free condition.
Quoted 1 line
Add a multex lock to serialize
nvme_rdma_stop_queue.
Looks good to me.
I tested this patch at our regression.
_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme
PATCH v2 2/2 nvme-tcp: avoid request double completion for concurrent nvme_tcp_timeout
In reply to Chao LengEach name space has a request queue, if complete request long time, multi request queues may have time out requests at the same time, nvme_tcp_timeout will execute concurrently. Multi requests in different request queues may be queued in the same tcp queue, multi nvme_tcp_timeout may call nvme_tcp_stop_queue at the same time. The first nvme_tcp_stop_queue will clear NVME_TCP_Q_LIVE and continue stopping the tcp queue(cancel io_work), but the others check NVME_TCP_Q_LIVE is already cleared, and then directly complete the requests, complete request before the io work is completely canceled may lead to a use-after-free condition.
Add a multex lock to serialize nvme_tcp_stop_queue.
--- drivers/nvme/host/tcp.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
drivers/nvme/host/tcp.c +10 -4
@@ -76,6 +76,7 @@ struct nvme_tcp_queue {struct work_struct io_work;int io_cpu; +struct mutex queue_lock;struct mutex send_mutex;struct llist_head req_list;struct list_head send_list;
@@ -1209,6 +1210,7 @@ static void nvme_tcp_free_queue(struct nvme_ctrl *nctrl, int qid)sock_release (queue->sock);kfree (queue->pdu); +mutex_destroy (&queue->queue_lock); }static int nvme_tcp_init_connection (struct nvme_tcp_queue *queue)
@@ -1370,6 +1372,7 @@ static int nvme_tcp_alloc_queue(struct nvme_ctrl *nctrl,struct nvme_tcp_queue *queue = &ctrl->queues[qid];int ret, rcv_pdu_size; +mutex_init (&queue->queue_lock); queue->ctrl = ctrl;init_llist_head (&queue->req_list);INIT_LIST_HEAD (&queue->send_list);
@@ -1388,7 +1391,7 @@ static int nvme_tcp_alloc_queue(struct nvme_ctrl *nctrl,if (ret) {dev_err (nctrl->device,"failed to create socket: %d\n" , ret); -return ret; + goto err_destroy_mutex; }/* Single syn retry */
@@ -1497,6 +1500,8 @@ static int nvme_tcp_alloc_queue(struct nvme_ctrl *nctrl, err_sock:sock_release (queue->sock); queue->sock =NULL ; +err_destroy_mutex: +mutex_destroy (&queue->queue_lock);return ret; }
@@ -1524,9 +1529,10 @@ static void nvme_tcp_stop_queue(struct nvme_ctrl *nctrl, int qid)struct nvme_tcp_ctrl *ctrl =to_tcp_ctrl (nctrl);struct nvme_tcp_queue *queue = &ctrl->queues[qid]; -if (!test_and_clear_bit (NVME_TCP_Q_LIVE , &queue->flags)) -return ; -__nvme_tcp_stop_queue (queue); +mutex_lock (&queue->queue_lock); +if (test_and_clear_bit (NVME_TCP_Q_LIVE , &queue->flags)) +__nvme_tcp_stop_queue (queue); +mutex_unlock (&queue->queue_lock); }static int nvme_tcp_start_queue (struct nvme_ctrl *nctrl,int idx)
Signature · 7 lines
2.16.4 _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
Thanks,
applied to nvme-5.11.
_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme