From 7613e3fefb805c767bd89389441b494db16bfc01 Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Thu, 3 Mar 2022 18:12:12 +0900 Subject: [PATCH] nvmf/rdma: Add qpair to poll group after initialization succeeds nvmf_rdma_poll_group_add() added a rqpair to the poll_group->qpairs list before its initialization. If we change the poll_group->qpairs list from linked list to RB tree, the qpair can be added to the poll_group_qpairs list only after its initialization completes because QP number is necessary. As a preparation, change nvmf_rdma_poll_group_add() to add a rqpair to the poll_group->qpairs list after its initialization succeeds. Signed-off-by: Shuhei Matsumoto Change-Id: I42525f68c5efbd445f96da8f4f63d31f06f739e3 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/11800 Tested-by: SPDK CI Jenkins Community-CI: Broadcom CI Reviewed-by: Changpeng Liu Reviewed-by: Ben Walker Reviewed-by: Aleksey Marchuk --- lib/nvmf/rdma.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/nvmf/rdma.c b/lib/nvmf/rdma.c index bcb8ae363..4bfebef03 100644 --- a/lib/nvmf/rdma.c +++ b/lib/nvmf/rdma.c @@ -3480,16 +3480,19 @@ nvmf_rdma_poll_group_add(struct spdk_nvmf_transport_poll_group *group, return -1; } - TAILQ_INSERT_TAIL(&poller->qpairs, rqpair, link); rqpair->poller = poller; rqpair->srq = rqpair->poller->srq; rc = nvmf_rdma_qpair_initialize(qpair); if (rc < 0) { SPDK_ERRLOG("Failed to initialize nvmf_rdma_qpair with qpair=%p\n", qpair); + rqpair->poller = NULL; + rqpair->srq = NULL; return -1; } + TAILQ_INSERT_TAIL(&poller->qpairs, rqpair, link); + rc = nvmf_rdma_event_accept(rqpair->cm_id, rqpair); if (rc) { /* Try to reject, but we probably can't */