From nobody Mon May 12 15:06:25 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=1695907863; cv=none; d=zohomail.com; s=zohoarc; b=b+CIm/lQmz44t3RCU0SpYz86WPf2kUiz9frmihkegNzm+xXxiQ7KPJyjA3OJLxB0j6f3hEZITCin9l44MQaHv1rD14lR3v5cpqmQFC26X5tRA8gL315a8m1o/BEcNGalQ2L82g9tEGH+f75B3bH0v1QYmKN/3BWSJBYhD+7/x0g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695907863; 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=puNVjsA5MWcd8I5pM9KDRUcm2ONy0UJkA9zAUt+v/PM=; b=iPYZqGl7afgH9uLTsq/i+L0JGq0qP5pO8CigVqeLAHjwQrLLp8ro+u1ocptmTfaqnWHkWd4giR/vHCJP0EqU/1e1adnasPvJv1kaXieGT3JPMR/ynopSPGVzVI7M4EXjn0nm6QiYpKhWe5h2MyD34hEq2+pSZUYQgc22q58oAmA= 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 1695907863363686.6832211478167; Thu, 28 Sep 2023 06:31:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qlr6A-0000JE-4G; Thu, 28 Sep 2023 09:30:34 -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 1qlr60-0008VG-Nu for qemu-devel@nongnu.org; Thu, 28 Sep 2023 09:30:26 -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 1qlr5y-0002Ac-HQ for qemu-devel@nongnu.org; Thu, 28 Sep 2023 09:30:24 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-183-ac36gt0UNaKxXvMF-gjOxw-1; Thu, 28 Sep 2023 09:30:18 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (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 425E18039CF; Thu, 28 Sep 2023 13:30:18 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.25]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1DE91178B5; Thu, 28 Sep 2023 13:30:18 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 5B2E321E68A5; Thu, 28 Sep 2023 15:20:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695907821; 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=puNVjsA5MWcd8I5pM9KDRUcm2ONy0UJkA9zAUt+v/PM=; b=RSGOHXhDvrvWyRovEFpHVsO51tH5I+ug4jqb3vAbDPahBeDZJ0DuGCnXkPYB56YWax3Iey 0w8V3mfU8HX1gBlezztiw65ot/Dbhi8s47Te1nb3KHa/oezrXY2PQ7Ucpf3wNn6wO8xX30 A+hLPIx8nDkkDY2kGF9+K8rIqnoVH8M= X-MC-Unique: ac36gt0UNaKxXvMF-gjOxw-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: quintela@redhat.com, peterx@redhat.com, leobras@redhat.com, farosas@suse.de, lizhijian@fujitsu.com, eblake@redhat.com Subject: [PATCH v2 49/53] migration/rdma: Silence qemu_rdma_block_for_wrid() Date: Thu, 28 Sep 2023 15:20:15 +0200 Message-ID: <20230928132019.2544702-50-armbru@redhat.com> In-Reply-To: <20230928132019.2544702-1-armbru@redhat.com> References: <20230928132019.2544702-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 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.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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1695907864490100003 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. qemu_rdma_post_send_control(), qemu_rdma_exchange_get_response(), and qemu_rdma_write_one() violate this principle: they call error_report(), fprintf(stderr, ...), and perror() via qemu_rdma_block_for_wrid(), qemu_rdma_poll(), and qemu_rdma_wait_comp_channel(). I elected not to investigate how callers handle the error, i.e. precise impact is not known. Clean this up by dropping the error reporting from qemu_rdma_poll(), qemu_rdma_wait_comp_channel(), and qemu_rdma_block_for_wrid(). I believe the callers' error reports suffice. If they don't, we need to convert to Error instead. Bonus: resolves a FIXME about problematic use of errno. Signed-off-by: Markus Armbruster Reviewed-by: Li Zhijian --- migration/rdma.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/migration/rdma.c b/migration/rdma.c index f4bb329671..6c63f9c269 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -1483,17 +1483,12 @@ static int qemu_rdma_poll(RDMAContext *rdma, struct= ibv_cq *cq, } =20 if (ret < 0) { - error_report("ibv_poll_cq failed"); return -1; } =20 wr_id =3D wc.wr_id & RDMA_WRID_TYPE_MASK; =20 if (wc.status !=3D IBV_WC_SUCCESS) { - fprintf(stderr, "ibv_poll_cq wc.status=3D%d %s!\n", - wc.status, ibv_wc_status_str(wc.status)); - fprintf(stderr, "ibv_poll_cq wrid=3D%" PRIu64 "!\n", wr_id); - return -1; } =20 @@ -1577,16 +1572,12 @@ static int qemu_rdma_wait_comp_channel(RDMAContext = *rdma, if (pfds[1].revents) { ret =3D rdma_get_cm_event(rdma->channel, &cm_event); if (ret < 0) { - error_report("failed to get cm event while wait " - "completion channel"); return -1; } =20 if (cm_event->event =3D=3D RDMA_CM_EVENT_DISCONNECTED = || cm_event->event =3D=3D RDMA_CM_EVENT_DEVICE_REMOVA= L) { rdma_ack_cm_event(cm_event); - error_report("receive cm event while wait comp cha= nnel," - "cm event is %d", cm_event->event); return -1; } rdma_ack_cm_event(cm_event); @@ -1599,7 +1590,6 @@ static int qemu_rdma_wait_comp_channel(RDMAContext *r= dma, default: /* Error of some type - * I don't trust errno from qemu_poll_ns */ - error_report("%s: poll failed", __func__); return -1; } =20 @@ -1683,12 +1673,6 @@ static int qemu_rdma_block_for_wrid(RDMAContext *rdm= a, =20 ret =3D ibv_get_cq_event(ch, &cq, &cq_ctx); if (ret < 0) { - /* - * FIXME perror() is problematic, because ibv_reg_mr() is - * not documented to set errno. Will go away later in - * this series. - */ - perror("ibv_get_cq_event"); goto err_block_for_wrid; } =20 --=20 2.41.0