From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60367) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WJ3Xw-0000jW-Rf for qemu-devel@nongnu.org; Thu, 27 Feb 2014 11:10:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WJ3Xr-0005tx-1x for qemu-devel@nongnu.org; Thu, 27 Feb 2014 11:10:52 -0500 Sender: fluxion Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Roth In-Reply-To: <1C381906198A694CBA79144D39E761752E745BF0@SACEXCMBX01-PRD.hq.netapp.com> References: <1392690846-30926-1-git-send-email-mrhines@linux.vnet.ibm.com> <20140227154905.28890.19569@loki> <1C381906198A694CBA79144D39E761752E745BF0@SACEXCMBX01-PRD.hq.netapp.com> Message-ID: <20140227161044.28890.89971@loki> Date: Thu, 27 Feb 2014 10:10:44 -0600 Subject: Re: [Qemu-devel] [Qemu-stable] [PATCH] rdma: bug fixes List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Wahlstrom, Pelle" , "mrhines@linux.vnet.ibm.com" , "qemu-devel@nongnu.org" Cc: "quintela@redhat.com" , "hinesmr@cn.ibm.com" , "Michael R. Hines" , "qemu-stable@nongnu.org" Quoting Wahlstrom, Pelle (2014-02-27 09:57:33) > I think that's correct. It doesn't meet cold filter criteria. Not sure I understand, what criteria are you referring to? > = > Pelle > = > -----Original Message----- > From: qemu-stable-bounces+pelle=3Dnetapp.com@nongnu.org [mailto:qemu-stab= le-bounces+pelle=3Dnetapp.com@nongnu.org] On Behalf Of Michael Roth > Sent: Thursday, February 27, 2014 10:49 AM > To: mrhines@linux.vnet.ibm.com; qemu-devel@nongnu.org > Cc: Michael R. Hines; hinesmr@cn.ibm.com; qemu-stable@nongnu.org; quintel= a@redhat.com > Subject: Re: [Qemu-stable] [PATCH] rdma: bug fixes > = > 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 d= ata_init() > > 2. Fix ibv_post_send() return value check and pass error code back up c= orrectly. > > 3. Fix rdma_destroy_qp() segfault after failure to connect to destinati= on. > > = > > 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) > = > > --- > > 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(RDMACont= ext *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, NUL= L); > > @@ -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 *hos= t_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