Skip to content

perftest: Fix seg-fault during clean-up for cm retry flow #378

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sshaulnv merged 1 commit into from
Mar 23, 2026
+40 −13
Merged

perftest: Fix seg-fault during clean-up for cm retry flow #378

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 40 additions & 13 deletions src/perftest_resources.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1481,15 +1481,21 @@ int destroy_ctx(struct pingpong_context *ctx,
(user_param->tst == LAT || user_param->machine == CLIENT || user_param->duplex)) ||
(user_param->connection_type == SRD && (user_param->verb == READ || user_param->verb == WRITE || user_param->verb == WRITE_IMM))) {

if (user_param->ah_allocated == 1 && ctx->ah && ctx->ah[i] && ibv_destroy_ah(ctx->ah[i])) {
fprintf(stderr, "Failed to destroy AH\n");
test_result = 1;
if (user_param->ah_allocated == 1 && ctx->ah && ctx->ah[i]) {
if (ibv_destroy_ah(ctx->ah[i])) {
fprintf(stderr, "Failed to destroy AH\n");
test_result = 1;
}
ctx->ah[i] = NULL;
}
}
if (user_param->work_rdma_cm == OFF) {
if (ctx->qp && ctx->qp[i] && ibv_destroy_qp(ctx->qp[i])) {
fprintf(stderr, "Couldn't destroy QP - %s\n", strerror(errno));
test_result = 1;
if (ctx->qp && ctx->qp[i]) {
if (ibv_destroy_qp(ctx->qp[i])) {
fprintf(stderr, "Couldn't destroy QP - %s\n", strerror(errno));
test_result = 1;
}
ctx->qp[i] = NULL;
}
}
}
Expand Down Expand Up @@ -1621,30 +1627,35 @@ int destroy_ctx(struct pingpong_context *ctx,
}

if (user_param->use_rdma_cm == OFF) {

if (ibv_close_device(ctx->context)) {
fprintf(stderr, "Failed to close device context\n");
test_result = 1;
}
}

free(ctx->qp);
ctx->qp = NULL;

#ifdef HAVE_IBV_WR_API
free(ctx->qpx);
ctx->qpx = NULL;
free(ctx->r_dctn);
ctx->r_dctn = NULL;
#ifdef HAVE_DCS
free(ctx->dci_stream_id);
ctx->dci_stream_id = NULL;
#endif
#endif
#ifdef HAVE_AES_XTS
if(user_param->aes_xts) {
free(ctx->dek);
ctx->dek = NULL;
free(ctx->mkey);
ctx->mkey = NULL;
}
#endif

if ((user_param->tst == BW || user_param->tst == LAT_BY_BW ) && (user_param->machine == CLIENT || user_param->duplex)) {

free(user_param->tposted);
free(user_param->tcompleted);
free(ctx->my_addr);
Expand Down Expand Up @@ -1678,6 +1689,9 @@ int destroy_ctx(struct pingpong_context *ctx,
}

if (user_param->work_rdma_cm == ON) {
for (i = 0; i < user_param->num_of_qps; i++) {
ctx->cma_master.nodes[i].connected = 0;
}
rdma_cm_destroy_cma(ctx, user_param);
rdma_cm_destroy_master(ctx);
}
Expand Down Expand Up @@ -6897,9 +6911,12 @@ void rdma_cm_destroy_qps(struct pingpong_context *ctx,

for (i = 0; i < user_param->num_of_qps; i++) {
struct cma_node *cm_node = &ctx->cma_master.nodes[i];
if (cm_node->cma_id->qp) {
if (cm_node->cma_id && cm_node->cma_id->qp) {
rdma_destroy_qp(cm_node->cma_id);
}
if (ctx->qp && ctx->qp[i]) {
ctx->qp[i] = NULL;
}
}
}

Expand All @@ -6920,11 +6937,24 @@ int rdma_cm_destroy_cma(struct pingpong_context *ctx,
if (cm_node->connected) {
continue;
}
if (ctx->qp && ctx->qp[i]) {
if (cm_node->cma_id->qp) {
rdma_destroy_qp(cm_node->cma_id);
} else {
ibv_destroy_qp(ctx->qp[i]);
}
ctx->qp[i] = NULL;
}
if (user_param->ah_allocated && ctx->ah && ctx->ah[i]) {
ibv_destroy_ah(ctx->ah[i]);
ctx->ah[i] = NULL;
}

rc = rdma_destroy_id(cm_node->cma_id);
if (rc) {
sprintf(error_message,
"Failed to destroy RDMA CM ID number %d.", i);
goto error;
return error_handler(error_message);
}
cm_node->cma_id = NULL;
}
Expand All @@ -6938,9 +6968,6 @@ int rdma_cm_destroy_cma(struct pingpong_context *ctx,
}
ctx->cma_master.connects_left = user_param->num_of_qps - connected_count;
return rc;

error:
return error_handler(error_message);
}

int error_handler(char *error_message)
Expand Down
Loading