From d238788bcc79c3a78603afdc2ac752508e52db49 Mon Sep 17 00:00:00 2001 From: Alexey Marchuk Date: Tue, 3 Dec 2019 20:10:36 +0300 Subject: [PATCH] rdma: Handle IBV_EVENT_QP_FATAL in asynchronous way Send a message to the qpair thread to avoid modifying qpair attributes in the acceptor poller thread which handles ibv events Signed-off-by: Alexey Marchuk Signed-off-by: Sasha Kotchubievsky Signed-off-by: Evgeniy Kochetov Change-Id: I8ea5658a2b226b0be9838eb375a8b80d15c456c5 Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/476714 Tested-by: SPDK CI Jenkins Reviewed-by: Ben Walker Reviewed-by: Seth Howell Reviewed-by: Jim Harris Reviewed-by: Shuhei Matsumoto Community-CI: Broadcom SPDK FC-NVMe CI Community-CI: SPDK CI Jenkins --- lib/nvmf/rdma.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/lib/nvmf/rdma.c b/lib/nvmf/rdma.c index aa11d5dcf..aa3417ad6 100644 --- a/lib/nvmf/rdma.c +++ b/lib/nvmf/rdma.c @@ -3038,6 +3038,13 @@ spdk_nvmf_process_cm_event(struct spdk_nvmf_transport *transport, new_qpair_fn c } } +static void +nvmf_rdma_handle_qp_fatal(struct spdk_nvmf_rdma_qpair *rqpair) +{ + spdk_nvmf_rdma_update_ibv_state(rqpair); + spdk_nvmf_rdma_start_disconnect(rqpair); +} + static void nvmf_rdma_handle_last_wqe_reached(struct spdk_nvmf_rdma_qpair *rqpair) { @@ -3104,8 +3111,10 @@ spdk_nvmf_process_ib_event(struct spdk_nvmf_rdma_device *device) SPDK_ERRLOG("Fatal event received for rqpair %p\n", rqpair); spdk_trace_record(TRACE_RDMA_IBV_ASYNC_EVENT, 0, 0, (uintptr_t)rqpair->cm_id, event.event_type); - spdk_nvmf_rdma_update_ibv_state(rqpair); - spdk_nvmf_rdma_start_disconnect(rqpair); + if (spdk_nvmf_rdma_send_qpair_async_event(rqpair, nvmf_rdma_handle_qp_fatal)) { + SPDK_ERRLOG("Failed to send QP_FATAL event for rqpair %p\n", rqpair); + nvmf_rdma_handle_qp_fatal(rqpair); + } break; case IBV_EVENT_QP_LAST_WQE_REACHED: /* This event only occurs for shared receive queues. */