[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [Qemu-stable] [PATCH] rdma: bug fixes
From: |
Wahlstrom, Pelle |
Subject: |
Re: [Qemu-devel] [Qemu-stable] [PATCH] rdma: bug fixes |
Date: |
Thu, 27 Feb 2014 15:57:33 +0000 |
I think that's correct. It doesn't meet cold filter criteria.
Pelle
-----Original Message-----
From: address@hidden [mailto:address@hidden On Behalf Of Michael Roth
Sent: Thursday, February 27, 2014 10:49 AM
To: address@hidden; address@hidden
Cc: Michael R. Hines; address@hidden; address@hidden; address@hidden
Subject: Re: [Qemu-stable] [PATCH] rdma: bug fixes
Quoting address@hidden (2014-02-17 20:34:06)
> From: "Michael R. Hines" <address@hidden>
>
> 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: address@hidden
> Reported-by: address@hidden
> Signed-off-by: Michael R. Hines <address@hidden>
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(RDMAContext
> *rdma, uint8_t *buf,
> }
>
>
> - if (ibv_post_send(rdma->qp, &send_wr, &bad_wr)) {
> - return -1;
> - }
> + ret = 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 = 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) {
> ibv_destroy_cq(rdma->cq);
> rdma->cq = NULL;
> @@ -2258,6 +2252,10 @@ static void qemu_rdma_cleanup(RDMAContext *rdma)
> 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;
> }
> @@ -2512,8 +2510,10 @@ static void *qemu_rdma_data_init(const char
> *host_port, Error **errp)
> } else {
> ERROR(errp, "bad RDMA migration address '%s'", host_port);
> g_free(rdma);
> - return NULL;
> + rdma = NULL;
> }
> +
> + qapi_free_InetSocketAddress(addr);
> }
>
> return rdma;
> --
> 1.8.1.2