From nobody Mon May 12 13:25:29 2025 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1695048534; cv=none; d=zohomail.com; s=zohoarc; b=Gd/KM9msS92NDSWBKuSFWPCoSCbF/H9X8qc5yCXgPJKUHiVGvPcU49a3obhC/tis5w9QoFi2UC2W0kBiRtGpGX0jObgu7b1Ky54gEcFSWniZdF2rB9/5G3ueMnG4wCWq8NOzDQijCnh9rm3pW60fXP0GPFivsjqXRpXf6tCs9Co= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695048534; 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=rwH8QnP++s+4eSMvIgUbs1Tl/BaN4sBzdF4fSv77DHc=; b=LmBJPKkr3M7KcpcLagtV4ENKTlmnTUwMggDgMqjaj+qt1GTgNsstG4oWgl0ZNPrPw+k3L3MsSsSjukjyT7BH0Rlnz1bDZfgTBmW+RIeIcIA7fFttCqiSazO1wU6+Rvi+jAlaPtJYeNyyWVzUKxCnr/Z2fLSp/uwzqdK8LQ3rc+Q= 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+importer2=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 1695048534186779.1706621562325; Mon, 18 Sep 2023 07:48:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiFT1-0003HE-C5; Mon, 18 Sep 2023 10:43:16 -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 1qiFSP-00032C-UZ for qemu-devel@nongnu.org; Mon, 18 Sep 2023 10:42:37 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiFS2-0002c6-TB for qemu-devel@nongnu.org; Mon, 18 Sep 2023 10:42:37 -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-58-BxhD0-aOOCe3gjOQfqSi8w-1; Mon, 18 Sep 2023 10:42:11 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (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 54B263800BAA for ; Mon, 18 Sep 2023 14:42:11 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.127]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 16543140E950 for ; Mon, 18 Sep 2023 14:42:11 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 4E85A21E6897; 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=1695048133; 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=rwH8QnP++s+4eSMvIgUbs1Tl/BaN4sBzdF4fSv77DHc=; b=aN/nSdO0tamBUAumPzvoPqmao2XLcU+HPuFA+OYT4BxYeQWw1nyiADQV4Oo0Y88xPfMyao om3XCuqOwPKs9kqxH+f2mJzX/ojh3tlDjcUHOT6pCm/tOO42oRaJp7hn+8e1LdIWqc+OY/ 61GcQfl/KFaWguDMtoufto0qEOIDcEM= X-MC-Unique: BxhD0-aOOCe3gjOQfqSi8w-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: quintela@redhat.com, peterx@redhat.com, leobras@redhat.com Subject: [PATCH 35/52] migration/rdma: Convert qemu_rdma_exchange_send() to Error Date: Mon, 18 Sep 2023 16:41:49 +0200 Message-ID: <20230918144206.560120-36-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.7 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.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_H3=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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695048534820100005 Content-Type: text/plain; charset="utf-8" Functions that use an Error **errp parameter to return errors should not also report them to the user, because reporting is the caller's job. When the caller does, the error is reported twice. When it doesn't (because it recovered from the error), there is no error to report, i.e. the report is bogus. qio_channel_rdma_writev() violates this principle: it calls error_report() via qemu_rdma_exchange_send(). I elected not to investigate how callers handle the error, i.e. precise impact is not known. Clean this up by converting qemu_rdma_exchange_send() to Error. Necessitates setting an error when qemu_rdma_post_recv_control(), callback(), or qemu_rdma_exchange_get_response() failed. Since these errors will go away later in this series, simply use "FIXME temporary error message" there. Signed-off-by: Markus Armbruster Reviewed-by: Li Zhijian --- migration/rdma.c | 40 +++++++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/migration/rdma.c b/migration/rdma.c index 50546b3a27..c1bfc20824 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -518,7 +518,8 @@ static void network_to_result(RDMARegisterResult *resul= t) static int qemu_rdma_exchange_send(RDMAContext *rdma, RDMAControlHeader *h= ead, uint8_t *data, RDMAControlHeader *resp, int *resp_idx, - int (*callback)(RDMAContext *rdma)); + int (*callback)(RDMAContext *rdma), + Error **errp); =20 static inline uint64_t ram_chunk_index(const uint8_t *start, const uint8_t *host) @@ -1365,6 +1366,8 @@ static int qemu_rdma_reg_control(RDMAContext *rdma, i= nt idx) */ static int qemu_rdma_unregister_waiting(RDMAContext *rdma) { + Error *err =3D NULL; + while (rdma->unregistrations[rdma->unregister_current]) { int ret; uint64_t wr_id =3D rdma->unregistrations[rdma->unregister_current]; @@ -1422,8 +1425,9 @@ static int qemu_rdma_unregister_waiting(RDMAContext *= rdma) reg.key.chunk =3D chunk; register_to_network(rdma, ®); ret =3D qemu_rdma_exchange_send(rdma, &head, (uint8_t *) ®, - &resp, NULL, NULL); + &resp, NULL, NULL, &err); if (ret < 0) { + error_report_err(err); return -1; } =20 @@ -1872,7 +1876,8 @@ static void qemu_rdma_move_header(RDMAContext *rdma, = int idx, static int qemu_rdma_exchange_send(RDMAContext *rdma, RDMAControlHeader *h= ead, uint8_t *data, RDMAControlHeader *resp, int *resp_idx, - int (*callback)(RDMAContext *rdma)) + int (*callback)(RDMAContext *rdma), + Error **errp) { int ret; =20 @@ -1885,6 +1890,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) { + error_setg(errp, "FIXME temporary error message"); return -1; } } @@ -1895,7 +1901,7 @@ static int qemu_rdma_exchange_send(RDMAContext *rdma,= RDMAControlHeader *head, if (resp) { ret =3D qemu_rdma_post_recv_control(rdma, RDMA_WRID_DATA); if (ret < 0) { - error_report("rdma migration: error posting" + error_setg(errp, "rdma migration: error posting" " extra control recv for anticipated result!"); return -1; } @@ -1906,7 +1912,7 @@ static int qemu_rdma_exchange_send(RDMAContext *rdma,= RDMAControlHeader *head, */ ret =3D qemu_rdma_post_recv_control(rdma, RDMA_WRID_READY); if (ret < 0) { - error_report("rdma migration: error posting first control recv!"); + error_setg(errp, "rdma migration: error posting first control recv= !"); return -1; } =20 @@ -1916,7 +1922,7 @@ static int qemu_rdma_exchange_send(RDMAContext *rdma,= RDMAControlHeader *head, ret =3D qemu_rdma_post_send_control(rdma, data, head); =20 if (ret < 0) { - error_report("Failed to send control buffer!"); + error_setg(errp, "Failed to send control buffer!"); return -1; } =20 @@ -1928,6 +1934,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) { + error_setg(errp, "FIXME temporary error message"); return -1; } } @@ -1937,6 +1944,7 @@ static int qemu_rdma_exchange_send(RDMAContext *rdma,= RDMAControlHeader *head, resp->type, RDMA_WRID_DATA); =20 if (ret < 0) { + error_setg(errp, "FIXME temporary error message"); return -1; } =20 @@ -2011,6 +2019,7 @@ static int qemu_rdma_write_one(QEMUFile *f, RDMAConte= xt *rdma, int current_index, uint64_t current_addr, uint64_t length) { + Error *err =3D NULL; struct ibv_sge sge; struct ibv_send_wr send_wr =3D { 0 }; struct ibv_send_wr *bad_wr; @@ -2096,9 +2105,10 @@ retry: =20 compress_to_network(rdma, &comp); ret =3D qemu_rdma_exchange_send(rdma, &head, - (uint8_t *) &comp, NULL, NULL, NULL); + (uint8_t *) &comp, NULL, NULL, NULL, &err); =20 if (ret < 0) { + error_report_err(err); return -1; } =20 @@ -2124,8 +2134,9 @@ retry: =20 register_to_network(rdma, ®); ret =3D qemu_rdma_exchange_send(rdma, &head, (uint8_t *) ®, - &resp, ®_result_idx, NULL); + &resp, ®_result_idx, NULL, &err); if (ret < 0) { + error_report_err(err); return -1; } =20 @@ -2815,11 +2826,11 @@ static ssize_t qio_channel_rdma_writev(QIOChannel *= ioc, head.len =3D len; head.type =3D RDMA_CONTROL_QEMU_FILE; =20 - ret =3D qemu_rdma_exchange_send(rdma, &head, data, NULL, NULL,= NULL); + ret =3D qemu_rdma_exchange_send(rdma, &head, + data, NULL, NULL, NULL, errp); =20 if (ret < 0) { rdma->errored =3D true; - error_setg(errp, "qemu_rdma_exchange_send failed"); return -1; } =20 @@ -3886,6 +3897,7 @@ static int qemu_rdma_registration_stop(QEMUFile *f, uint64_t flags, void *data) { QIOChannelRDMA *rioc =3D QIO_CHANNEL_RDMA(qemu_file_get_ioc(f)); + Error *err =3D NULL; RDMAContext *rdma; RDMAControlHeader head =3D { .len =3D 0, .repeat =3D 1 }; int ret; @@ -3929,9 +3941,10 @@ static int qemu_rdma_registration_stop(QEMUFile *f, */ ret =3D qemu_rdma_exchange_send(rdma, &head, NULL, &resp, ®_result_idx, rdma->pin_all ? - qemu_rdma_reg_whole_ram_blocks : NULL); + qemu_rdma_reg_whole_ram_blocks : NULL, + &err); if (ret < 0) { - fprintf(stderr, "receiving remote info!"); + error_report_err(err); return -1; } =20 @@ -3982,9 +3995,10 @@ static int qemu_rdma_registration_stop(QEMUFile *f, trace_qemu_rdma_registration_stop(flags); =20 head.type =3D RDMA_CONTROL_REGISTER_FINISHED; - ret =3D qemu_rdma_exchange_send(rdma, &head, NULL, NULL, NULL, NULL); + ret =3D qemu_rdma_exchange_send(rdma, &head, NULL, NULL, NULL, NULL, &= err); =20 if (ret < 0) { + error_report_err(err); goto err; } =20 --=20 2.41.0