Commit 80b262e1 authored by Padmanabh Ratnakar's avatar Padmanabh Ratnakar Committed by Juan Quintela
Browse files

rdma: Fix cleanup in error paths 



As part of commit e325b49a,
order in which resources are destroyed was changed for fixing
a seg fault. Due to this change, CQ will never get destroyed as
CQ should be destroyed after QP destruction. Seg fault is caused
improper cleanup when connection fails. Fixing cleanup after
connection failure and order in which resources are destroyed
in qemu_rdma_cleanup() routine.

Signed-off-by: default avatarMeghana Cheripady <meghana.cheripady@emulex.com>
Signed-off-by: default avatarPadmanabh Ratnakar <padmanabh.ratnakar@emulex.com>
Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
parent 7c76235a

migration/rdma.c

+8 −14
Original line number Diff line number Diff line
@@ -2194,6 +2194,10 @@ static void qemu_rdma_cleanup(RDMAContext *rdma) 
        }

    }



    if (rdma->qp) {

        rdma_destroy_qp(rdma->cm_id);

        rdma->qp = NULL;

    }

    if (rdma->cq) {

        ibv_destroy_cq(rdma->cq);

        rdma->cq = NULL;
@@ -2206,18 +2210,14 @@ static void qemu_rdma_cleanup(RDMAContext *rdma) 
        ibv_dealloc_pd(rdma->pd);

        rdma->pd = NULL;

    }

    if (rdma->listen_id) {

        rdma_destroy_id(rdma->listen_id);

        rdma->listen_id = NULL;

    }

    if (rdma->cm_id) {

        if (rdma->qp) {

            rdma_destroy_qp(rdma->cm_id);

            rdma->qp = NULL;

        }

        rdma_destroy_id(rdma->cm_id);

        rdma->cm_id = NULL;

    }

    if (rdma->listen_id) {

        rdma_destroy_id(rdma->listen_id);

        rdma->listen_id = NULL;

    }

    if (rdma->channel) {

        rdma_destroy_event_channel(rdma->channel);

        rdma->channel = NULL;
@@ -2309,8 +2309,6 @@ static int qemu_rdma_connect(RDMAContext *rdma, Error **errp) 
    if (ret) {

        perror("rdma_connect");

        ERROR(errp, "connecting to destination!");

        rdma_destroy_id(rdma->cm_id);

        rdma->cm_id = NULL;

        goto err_rdma_source_connect;

    }
@@ -2319,8 +2317,6 @@ static int qemu_rdma_connect(RDMAContext *rdma, Error **errp) 
        perror("rdma_get_cm_event after rdma_connect");

        ERROR(errp, "connecting to destination!");

        rdma_ack_cm_event(cm_event);

        rdma_destroy_id(rdma->cm_id);

        rdma->cm_id = NULL;

        goto err_rdma_source_connect;

    }
@@ -2328,8 +2324,6 @@ static int qemu_rdma_connect(RDMAContext *rdma, Error **errp) 
        perror("rdma_get_cm_event != EVENT_ESTABLISHED after rdma_connect");

        ERROR(errp, "connecting to destination!");

        rdma_ack_cm_event(cm_event);

        rdma_destroy_id(rdma->cm_id);

        rdma->cm_id = NULL;

        goto err_rdma_source_connect;

    }

    rdma->connected = true;