[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v4 3/6] migration/rdma: fix qemu_rdma_block_for_
From: |
Peter Xu |
Subject: |
Re: [Qemu-devel] [PATCH v4 3/6] migration/rdma: fix qemu_rdma_block_for_wrid error paths |
Date: |
Tue, 18 Jul 2017 09:20:42 +0800 |
User-agent: |
Mutt/1.5.24 (2015-08-30) |
On Mon, Jul 17, 2017 at 12:09:33PM +0100, Dr. David Alan Gilbert (git) wrote:
> From: "Dr. David Alan Gilbert" <address@hidden>
>
> The two places that 'goto err_block_for_wrid' weren't setting ret
> and so would end up returning 0 even though we've failed.
>
> Signed-off-by: Dr. David Alan Gilbert <address@hidden>
> ---
> migration/rdma.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/migration/rdma.c b/migration/rdma.c
> index 6111e10c70..59810aec2e 100644
> --- a/migration/rdma.c
> +++ b/migration/rdma.c
> @@ -1521,14 +1521,16 @@ static int qemu_rdma_block_for_wrid(RDMAContext
> *rdma, int wrid_requested,
> yield_until_fd_readable(rdma->comp_channel->fd);
> }
>
> - if (ibv_get_cq_event(rdma->comp_channel, &cq, &cq_ctx)) {
> + ret = ibv_get_cq_event(rdma->comp_channel, &cq, &cq_ctx);
> + if (ret) {
> perror("ibv_get_cq_event");
> goto err_block_for_wrid;
> }
>
> num_cq_events++;
>
> - if (ibv_req_notify_cq(cq, 0)) {
> + ret = -ibv_req_notify_cq(cq, 0);
(I didn't really notice that it is returning a positive value for
error...)
Reviewed-by: Peter Xu <address@hidden>
> + if (ret) {
> goto err_block_for_wrid;
> }
>
> @@ -1564,6 +1566,8 @@ err_block_for_wrid:
> if (num_cq_events) {
> ibv_ack_cq_events(cq, num_cq_events);
> }
> +
> + rdma->error_state = ret;
> return ret;
> }
>
> --
> 2.13.0
>
--
Peter Xu
- [Qemu-devel] [PATCH v4 0/6] A bunch of RDMA fixes, Dr. David Alan Gilbert (git), 2017/07/17
- [Qemu-devel] [PATCH v4 1/6] migration/rdma: Fix race on source, Dr. David Alan Gilbert (git), 2017/07/17
- [Qemu-devel] [PATCH v4 3/6] migration/rdma: fix qemu_rdma_block_for_wrid error paths, Dr. David Alan Gilbert (git), 2017/07/17
- Re: [Qemu-devel] [PATCH v4 3/6] migration/rdma: fix qemu_rdma_block_for_wrid error paths,
Peter Xu <=
- [Qemu-devel] [PATCH v4 2/6] migration: Close file on failed migration load, Dr. David Alan Gilbert (git), 2017/07/17
- [Qemu-devel] [PATCH v4 4/6] migration/rdma: Allow cancelling while waiting for wrid, Dr. David Alan Gilbert (git), 2017/07/17
- [Qemu-devel] [PATCH v4 5/6] migration/rdma: Safely convert control types, Dr. David Alan Gilbert (git), 2017/07/17
- [Qemu-devel] [PATCH v4 6/6] migration/rdma: Send error during cancelling, Dr. David Alan Gilbert (git), 2017/07/17