From nobody Mon Sep 16 18:59:26 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1695048294; cv=none; d=zohomail.com; s=zohoarc; b=RtkyahWyHled0ZN9tvF9A3Wjs71zvmWgvWuGEk7TFskYJgWiOMwwS+4BRBjSGtRCPOm+nPT0Hlo4pVwoF1MSQc6yYisj0O2o3vxdA1eviuuuQknvKcGiwxIK2VGxszv0Qw5Ap3y+4qaNOrQ8HgLCst+AmcuWcn67SS0zLDilKGc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695048294; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=D+kR7wA8Z1+2AA5LRtU9j3o2Sy/Y0eHC9q/nH7PbZOs=; b=TvDBM/nHncr1eyAgFRjFQq2wN+sIjr8C0k7IqWDZkA6boU9Syf02Nyr3uir538JtUojkfxlCy2foLUJR11oecqUoed5RApdHzg/A0wNEM3bumWkqsIf90G07a6w3mBVEoA3mQsOj06zD+PPY1xWyhxPGKEOq5nLOBuysikuxBck= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1695048294120569.9496754919187; Mon, 18 Sep 2023 07:44:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiFTF-0003YT-FP; Mon, 18 Sep 2023 10:43:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiFSO-00030e-9I for qemu-devel@nongnu.org; Mon, 18 Sep 2023 10:42:36 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiFS2-0002bM-Qq for qemu-devel@nongnu.org; Mon, 18 Sep 2023 10:42:35 -0400 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-341-Y4zHFK4fP1Wea0tYiNIupw-1; Mon, 18 Sep 2023 10:42:10 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6A3DC29AA3BF for ; Mon, 18 Sep 2023 14:42:10 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.127]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2B72C4A9B13 for ; Mon, 18 Sep 2023 14:42:10 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 314CF21E6887; Mon, 18 Sep 2023 16:42:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695048132; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=D+kR7wA8Z1+2AA5LRtU9j3o2Sy/Y0eHC9q/nH7PbZOs=; b=Kv7xe1qR0csWGBQU1EIjXiEe1gqCq4yCYf0IoTezhDg41EDEIrxg6Y7QOldAl6yl6qHIpw k2YDvBlyiLOXbf9WWZtRbDMjITNzR8UNu+rWHJkXMfAFY3zjMr9Qs2tTehOHrke8YmOFYj vbCRXIvCSu/3CaXub0c4DNfJ3h0bMek= X-MC-Unique: Y4zHFK4fP1Wea0tYiNIupw-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: quintela@redhat.com, peterx@redhat.com, leobras@redhat.com Subject: [PATCH 25/52] migration/rdma: Dumb down remaining int error values to -1 Date: Mon, 18 Sep 2023 16:41:39 +0200 Message-ID: <20230918144206.560120-26-armbru@redhat.com> In-Reply-To: <20230918144206.560120-1-armbru@redhat.com> References: <20230918144206.560120-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695048295474100001 Content-Type: text/plain; charset="utf-8" This is just to make the error value more obvious. Callers don't mind. Signed-off-by: Markus Armbruster Reviewed-by: Li Zhijian --- migration/rdma.c | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/migration/rdma.c b/migration/rdma.c index d0af258468..ad314cc10a 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -1418,7 +1418,7 @@ static int qemu_rdma_unregister_waiting(RDMAContext *= rdma) ret =3D qemu_rdma_exchange_send(rdma, &head, (uint8_t *) ®, &resp, NULL, NULL); if (ret < 0) { - return ret; + return -1; } =20 trace_qemu_rdma_unregister_waiting_complete(chunk); @@ -1459,7 +1459,7 @@ static int qemu_rdma_poll(RDMAContext *rdma, struct i= bv_cq *cq, =20 if (ret < 0) { error_report("ibv_poll_cq failed"); - return ret; + return -1; } =20 wr_id =3D wc.wr_id & RDMA_WRID_TYPE_MASK; @@ -1633,7 +1633,7 @@ static int qemu_rdma_block_for_wrid(RDMAContext *rdma, while (wr_id !=3D wrid_requested) { ret =3D qemu_rdma_poll(rdma, poll_cq, &wr_id_in, byte_len); if (ret < 0) { - return ret; + return -1; } =20 wr_id =3D wr_id_in & RDMA_WRID_TYPE_MASK; @@ -1702,7 +1702,7 @@ err_block_for_wrid: } =20 rdma->error_state =3D ret; - return ret; + return -1; } =20 /* @@ -1757,9 +1757,10 @@ static int qemu_rdma_post_send_control(RDMAContext *= rdma, uint8_t *buf, ret =3D qemu_rdma_block_for_wrid(rdma, RDMA_WRID_SEND_CONTROL, NULL); if (ret < 0) { error_report("rdma migration: send polling control error"); + return -1; } =20 - return ret; + return 0; } =20 /* @@ -1801,7 +1802,7 @@ static int qemu_rdma_exchange_get_response(RDMAContex= t *rdma, =20 if (ret < 0) { error_report("rdma migration: recv polling control error!"); - return ret; + return -1; } =20 network_to_control((void *) rdma->wr_data[idx].control); @@ -1879,7 +1880,7 @@ static int qemu_rdma_exchange_send(RDMAContext *rdma,= RDMAControlHeader *head, ret =3D qemu_rdma_exchange_get_response(rdma, &resp, RDMA_CONTROL_READY, RDMA_WRID_R= EADY); if (ret < 0) { - return ret; + return -1; } } =20 @@ -1891,7 +1892,7 @@ static int qemu_rdma_exchange_send(RDMAContext *rdma,= RDMAControlHeader *head, if (ret) { error_report("rdma migration: error posting" " extra control recv for anticipated result!"); - return ret; + return -1; } } =20 @@ -1901,7 +1902,7 @@ static int qemu_rdma_exchange_send(RDMAContext *rdma,= RDMAControlHeader *head, ret =3D qemu_rdma_post_recv_control(rdma, RDMA_WRID_READY); if (ret) { error_report("rdma migration: error posting first control recv!"); - return ret; + return -1; } =20 /* @@ -1911,7 +1912,7 @@ static int qemu_rdma_exchange_send(RDMAContext *rdma,= RDMAControlHeader *head, =20 if (ret < 0) { error_report("Failed to send control buffer!"); - return ret; + return -1; } =20 /* @@ -1922,7 +1923,7 @@ static int qemu_rdma_exchange_send(RDMAContext *rdma,= RDMAControlHeader *head, trace_qemu_rdma_exchange_send_issue_callback(); ret =3D callback(rdma); if (ret < 0) { - return ret; + return -1; } } =20 @@ -1931,7 +1932,7 @@ static int qemu_rdma_exchange_send(RDMAContext *rdma,= RDMAControlHeader *head, resp->type, RDMA_WRID_DATA); =20 if (ret < 0) { - return ret; + return -1; } =20 qemu_rdma_move_header(rdma, RDMA_WRID_DATA, resp); @@ -1967,7 +1968,7 @@ static int qemu_rdma_exchange_recv(RDMAContext *rdma,= RDMAControlHeader *head, =20 if (ret < 0) { error_report("Failed to send control buffer!"); - return ret; + return -1; } =20 /* @@ -1977,7 +1978,7 @@ static int qemu_rdma_exchange_recv(RDMAContext *rdma,= RDMAControlHeader *head, expecting, RDMA_WRID_READY); =20 if (ret < 0) { - return ret; + return -1; } =20 qemu_rdma_move_header(rdma, RDMA_WRID_READY, head); @@ -1988,7 +1989,7 @@ static int qemu_rdma_exchange_recv(RDMAContext *rdma,= RDMAControlHeader *head, ret =3D qemu_rdma_post_recv_control(rdma, RDMA_WRID_READY); if (ret) { error_report("rdma migration: error posting second control recv!"); - return ret; + return -1; } =20 return 0; @@ -2061,7 +2062,7 @@ retry: "block %d chunk %" PRIu64 " current %" PRIu64 " len %" PRIu64 " %d", current_index, chunk, sge.addr, length, rdma->nb_sent); - return ret; + return -1; } } =20 @@ -2119,7 +2120,7 @@ retry: ret =3D qemu_rdma_exchange_send(rdma, &head, (uint8_t *) ®, &resp, ®_result_idx, NULL); if (ret < 0) { - return ret; + return -1; } =20 /* try to overlap this single registration with the one we sen= t. */ @@ -2193,7 +2194,7 @@ retry: if (ret < 0) { error_report("rdma migration: failed to make " "room in full send queue!"); - return ret; + return -1; } =20 goto retry; @@ -2230,7 +2231,7 @@ static int qemu_rdma_write_flush(QEMUFile *f, RDMACon= text *rdma) rdma->current_index, rdma->current_addr, rdma->current_length); =20 if (ret < 0) { - return ret; + return -1; } =20 if (ret =3D=3D 0) { @@ -2312,7 +2313,7 @@ static int qemu_rdma_write(QEMUFile *f, RDMAContext *= rdma, if (!qemu_rdma_buffer_mergable(rdma, current_addr, len)) { ret =3D qemu_rdma_write_flush(f, rdma); if (ret) { - return ret; + return -1; } rdma->current_length =3D 0; rdma->current_addr =3D current_addr; @@ -3485,7 +3486,7 @@ err_rdma_dest_wait: rdma->error_state =3D ret; qemu_rdma_cleanup(rdma); g_free(rdma_return_path); - return ret; + return -1; } =20 static int dest_ram_sort_func(const void *a, const void *b) --=20 2.41.0