From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55984) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WTBhd-00015P-Es for qemu-devel@nongnu.org; Thu, 27 Mar 2014 10:54:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WTBhU-0007Mn-15 for qemu-devel@nongnu.org; Thu, 27 Mar 2014 10:54:45 -0400 Received: from e36.co.us.ibm.com ([32.97.110.154]:36570) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WTBhT-0007LV-RA for qemu-devel@nongnu.org; Thu, 27 Mar 2014 10:54:35 -0400 Received: from /spool/local by e36.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 27 Mar 2014 08:54:33 -0600 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Roth In-Reply-To: <53339793.9070300@linux.vnet.ibm.com> References: <1392690846-30926-1-git-send-email-mrhines@linux.vnet.ibm.com> <20140227154905.28890.19569@loki> <53339793.9070300@linux.vnet.ibm.com> Message-ID: <20140327145430.22831.87582@loki> Date: Thu, 27 Mar 2014 09:54:30 -0500 Subject: Re: [Qemu-devel] [PATCH] rdma: bug fixes List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Michael R. Hines" , qemu-devel@nongnu.org Cc: "Michael R. Hines" , hinesmr@cn.ibm.com, qemu-stable@nongnu.org, quintela@redhat.com Quoting Michael R. Hines (2014-03-26 22:14:27) > On 02/27/2014 11:49 PM, Michael Roth wrote: > > Quoting mrhines@linux.vnet.ibm.com (2014-02-17 20:34:06) > >> From: "Michael R. Hines" > >> > >> 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 destinat= ion. > >> > >> Reported-by: frank.yangjie@gmail.com > >> Reported-by: dgilbert@redhat.com > >> Signed-off-by: Michael R. Hines > > Ping: last call for 1.7.1 (freeze today) > = > Is this ping for me or the maintainer? Did I miss anything? Just a ping for the maintainers, to try to get it committed upstream prior = to stable freeze. Ship has sailed for 1.7.1, but hopefully we can get it in for 1.7.2: ping :) > = > - Michael > = > >> --- > >> migration-rdma.c | 20 ++++++++++---------- > >> 1 file changed, 10 insertions(+), 10 deletions(-) > >> > >> diff --git a/migration-rdma.c b/migration-rdma.c > >> index f94f3b4..29351a6 100644 > >> --- a/migration-rdma.c > >> +++ b/migration-rdma.c > >> @@ -1589,13 +1589,11 @@ static int qemu_rdma_post_send_control(RDMACon= text *rdma, uint8_t *buf, > >> } > >> > >> > >> - if (ibv_post_send(rdma->qp, &send_wr, &bad_wr)) { > >> - return -1; > >> - } > >> + ret =3D ibv_post_send(rdma->qp, &send_wr, &bad_wr); > >> > >> - if (ret < 0) { > >> + if (ret > 0) { > >> fprintf(stderr, "Failed to use post IB SEND for control!\n"); > >> - return ret; > >> + return -ret; > >> } > >> > >> ret =3D qemu_rdma_block_for_wrid(rdma, RDMA_WRID_SEND_CONTROL, N= ULL); > >> @@ -2237,10 +2235,6 @@ static void qemu_rdma_cleanup(RDMAContext *rdma) > >> } > >> } > >> > >> - if (rdma->qp) { > >> - rdma_destroy_qp(rdma->cm_id); > >> - rdma->qp =3D NULL; > >> - } > >> if (rdma->cq) { > >> ibv_destroy_cq(rdma->cq); > >> rdma->cq =3D NULL; > >> @@ -2258,6 +2252,10 @@ static void qemu_rdma_cleanup(RDMAContext *rdma) > >> rdma->listen_id =3D NULL; > >> } > >> if (rdma->cm_id) { > >> + if (rdma->qp) { > >> + rdma_destroy_qp(rdma->cm_id); > >> + rdma->qp =3D NULL; > >> + } > >> rdma_destroy_id(rdma->cm_id); > >> rdma->cm_id =3D NULL; > >> } > >> @@ -2512,8 +2510,10 @@ static void *qemu_rdma_data_init(const char *ho= st_port, Error **errp) > >> } else { > >> ERROR(errp, "bad RDMA migration address '%s'", host_port= ); > >> g_free(rdma); > >> - return NULL; > >> + rdma =3D NULL; > >> } > >> + > >> + qapi_free_InetSocketAddress(addr); > >> } > >> > >> return rdma; > >> -- = > >> 1.8.1.2