falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rdma: bug fixes 

1. Fix small memory leak in parsing inet address from command line in data_init()
2. Fix ibv_post_send() return value check and pass error code back up correctly.
3. Fix rdma_destroy_qp() segfault after failure to connect to destination.

Reported-by: frank.yangjie@gmail.com
Reported-by: dgilbert@redhat.com
Signed-off-by: Michael R. Hines <mrhines@us.ibm.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
(cherry picked from commit e325b49a32)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
This commit is contained in:
Michael R. Hines 2014-02-18 10:34:06 +08:00 committed by Michael Roth
parent 23dbc56d22
commit 63bf1e0ea5
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
migration-rdma.c
View File

@ -1589,13 +1589,11 @@ static int qemu_rdma_post_send_control(RDMAContext *rdma, uint8_t *buf,
} }
if (ibv_post_send(rdma->qp, &send_wr, &bad_wr)) { ret = ibv_post_send(rdma->qp, &send_wr, &bad_wr);
return -1;
}
if (ret < 0) { if (ret > 0) {
fprintf(stderr, "Failed to use post IB SEND for control!\n"); fprintf(stderr, "Failed to use post IB SEND for control!\n");
return ret; return -ret;
} }
ret = qemu_rdma_block_for_wrid(rdma, RDMA_WRID_SEND_CONTROL, NULL); ret = qemu_rdma_block_for_wrid(rdma, RDMA_WRID_SEND_CONTROL, NULL);
@ -2237,10 +2235,6 @@ static void qemu_rdma_cleanup(RDMAContext *rdma)
} }
} }
if (rdma->qp) {
rdma_destroy_qp(rdma->cm_id);
rdma->qp = NULL;
}
if (rdma->cq) { if (rdma->cq) {
ibv_destroy_cq(rdma->cq); ibv_destroy_cq(rdma->cq);
rdma->cq = NULL; rdma->cq = NULL;
@ -2258,6 +2252,10 @@ static void qemu_rdma_cleanup(RDMAContext *rdma)
rdma->listen_id = NULL; rdma->listen_id = NULL;
} }
if (rdma->cm_id) { if (rdma->cm_id) {
if (rdma->qp) {
rdma_destroy_qp(rdma->cm_id);
rdma->qp = NULL;
}
rdma_destroy_id(rdma->cm_id); rdma_destroy_id(rdma->cm_id);
rdma->cm_id = NULL; rdma->cm_id = NULL;
} }
@ -2512,8 +2510,10 @@ static void *qemu_rdma_data_init(const char *host_port, Error **errp)
} else { } else {
ERROR(errp, "bad RDMA migration address '%s'", host_port); ERROR(errp, "bad RDMA migration address '%s'", host_port);
g_free(rdma); g_free(rdma);
return NULL; rdma = NULL;
} }
qapi_free_InetSocketAddress(addr);
} }
return rdma; return rdma;