ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvme_rdma: Clean up releasing poller from poll group

Browse Source 
We have two cases to call nvme_rdma_poll_group_put_poller().
For consistency, make the two cases the same sequence.

This will make the next patch easier. The next patch will release
poller from poll group when qpair is actually disconnected as
possible as we can.

Signed-off-by: Shuhei Matsumoto <smatsumoto@nvidia.com>
Change-Id: I4178113d5277240e287e83a57e97cf32fd0f7457
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/14252
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@nvidia.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Shuhei Matsumoto 2022-08-30 10:42:46 +09:00 committed by Tomasz Zawadzki
parent 70c2bd8858
commit 80d75fda06
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/nvme/nvme_rdma.c
View File

@ -2165,14 +2165,15 @@ nvme_rdma_stale_conn_retry(struct nvme_rdma_qpair *rqpair)
SPDK_NOTICELOG("%d times, retry stale connnection to qpair (cntlid:%u, qid:%u).\n",
rqpair->stale_conn_retry_count, qpair->ctrlr->cntlid, qpair->id);
if (qpair->poll_group) {
if (rqpair->poller) {
struct nvme_rdma_poll_group *group;
assert(qpair->poll_group);
group = nvme_rdma_poll_group(qpair->poll_group);
if (rqpair->poller) {
nvme_rdma_poll_group_put_poller(group, rqpair->poller);
rqpair->poller = NULL;
}
nvme_rdma_poll_group_put_poller(group, rqpair->poller);
rqpair->poller = NULL;
rqpair->cq = NULL;
}
@ -2970,12 +2971,14 @@ nvme_rdma_poll_group_disconnect_qpair(struct spdk_nvme_qpair *qpair)
struct nvme_rdma_qpair *rqpair = nvme_rdma_qpair(qpair);
struct nvme_rdma_poll_group *group;
group = nvme_rdma_poll_group(qpair->poll_group);
if (rqpair->poller) {
group = nvme_rdma_poll_group(qpair->poll_group);
nvme_rdma_poll_group_put_poller(group, rqpair->poller);
rqpair->poller = NULL;
rqpair->cq = NULL;
}
rqpair->cq = NULL;
return 0;
}