From nobody Mon Sep 16 18:54:28 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=1695048443; cv=none; d=zohomail.com; s=zohoarc; b=Na1fnQxqGdSoi2rI93xXw+G4xOPxtIZgbFkSXpOWqc/b+DwahbICuIb1eXi3mQZV/QeNF9udINzO+pbjToEVixogSX/5Yav0FG44dkOD1/2S7c7DFXToh6GsSsxu/ds1a1I7LMdulz1+GdtNnoOhtuHX6b8MfM8Rm9MJIp4RsWM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695048443; 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=YI/OMHLXFF4aXnulbCN0A1lX7JYLV9NOHEBehNJYtCM=; b=PXIvRLSLDVN01ST6dINdHX/cQ0o/8hWaukYPPVkXYWyyOwKAnCq5g4zx3ovrgWqM3EvF2NIF1eQKN30/N06cgJwnp8tyiYxk8BWOAkIQBclSEVtFbwsCtsz4uZJ1Eb+AcE2EOExpBnDevXvtmi+kzWDzBbrBm4GXVs2cA6X84Qw= 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 169504844380864.73796967548242; Mon, 18 Sep 2023 07:47:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiFSQ-00032x-LJ; Mon, 18 Sep 2023 10:42:38 -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 1qiFSN-0002yI-Gk for qemu-devel@nongnu.org; Mon, 18 Sep 2023 10:42:35 -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-0002ch-O5 for qemu-devel@nongnu.org; Mon, 18 Sep 2023 10:42:33 -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-561-JW1Sz2MpNHWlyFZQ7QG9iA-1; Mon, 18 Sep 2023 10:42:12 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (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 7C2C53800BA6 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 3EB7C40C6EA8 for ; Mon, 18 Sep 2023 14:42:11 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 6547F21E689F; 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=1695048134; 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=YI/OMHLXFF4aXnulbCN0A1lX7JYLV9NOHEBehNJYtCM=; b=NtmLMFhYKXITGJQOBWae5iqjizfXvk9h5Xzgb0ByZs9chvzcaM81UgOe8a4tmCfvINCO2I jWC1YNNHl10A3SexCqq5V14ViY+lm2Wa6M0QecMyHt2et7CuTgA8n3X2vMHKEet4Hu0CZJ YdT9ubxn95jV563P+qYqeBMhfsvv890= X-MC-Unique: JW1Sz2MpNHWlyFZQ7QG9iA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: quintela@redhat.com, peterx@redhat.com, leobras@redhat.com Subject: [PATCH 43/52] migration/rdma: Convert qemu_rdma_alloc_pd_cq() to Error Date: Mon, 18 Sep 2023 16:41:57 +0200 Message-ID: <20230918144206.560120-44-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.2 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: 1695048446032100007 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_source_init() violates this principle: it calls error_report() via qemu_rdma_alloc_pd_cq(). I elected not to investigate how callers handle the error, i.e. precise impact is not known. Clean this up by converting qemu_rdma_alloc_pd_cq() to Error. Signed-off-by: Markus Armbruster Reviewed-by: Li Zhijian --- migration/rdma.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/migration/rdma.c b/migration/rdma.c index a727aa35d1..41f0ae4ddb 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -1046,19 +1046,19 @@ err_resolve_create_id: /* * Create protection domain and completion queues */ -static int qemu_rdma_alloc_pd_cq(RDMAContext *rdma) +static int qemu_rdma_alloc_pd_cq(RDMAContext *rdma, Error **errp) { /* allocate pd */ rdma->pd =3D ibv_alloc_pd(rdma->verbs); if (!rdma->pd) { - error_report("failed to allocate protection domain"); + error_setg(errp, "failed to allocate protection domain"); return -1; } =20 /* create receive completion channel */ rdma->recv_comp_channel =3D ibv_create_comp_channel(rdma->verbs); if (!rdma->recv_comp_channel) { - error_report("failed to allocate receive completion channel"); + error_setg(errp, "failed to allocate receive completion channel"); goto err_alloc_pd_cq; } =20 @@ -1068,21 +1068,21 @@ static int qemu_rdma_alloc_pd_cq(RDMAContext *rdma) rdma->recv_cq =3D ibv_create_cq(rdma->verbs, (RDMA_SIGNALED_SEND_MAX *= 3), NULL, rdma->recv_comp_channel, 0); if (!rdma->recv_cq) { - error_report("failed to allocate receive completion queue"); + error_setg(errp, "failed to allocate receive completion queue"); goto err_alloc_pd_cq; } =20 /* create send completion channel */ rdma->send_comp_channel =3D ibv_create_comp_channel(rdma->verbs); if (!rdma->send_comp_channel) { - error_report("failed to allocate send completion channel"); + error_setg(errp, "failed to allocate send completion channel"); goto err_alloc_pd_cq; } =20 rdma->send_cq =3D ibv_create_cq(rdma->verbs, (RDMA_SIGNALED_SEND_MAX *= 3), NULL, rdma->send_comp_channel, 0); if (!rdma->send_cq) { - error_report("failed to allocate send completion queue"); + error_setg(errp, "failed to allocate send completion queue"); goto err_alloc_pd_cq; } =20 @@ -2451,6 +2451,7 @@ static void qemu_rdma_cleanup(RDMAContext *rdma) =20 static int qemu_rdma_source_init(RDMAContext *rdma, bool pin_all, Error **= errp) { + ERRP_GUARD(); int ret, idx; =20 /* @@ -2464,12 +2465,12 @@ static int qemu_rdma_source_init(RDMAContext *rdma,= bool pin_all, Error **errp) goto err_rdma_source_init; } =20 - ret =3D qemu_rdma_alloc_pd_cq(rdma); + ret =3D qemu_rdma_alloc_pd_cq(rdma, errp); if (ret < 0) { - error_setg(errp, "RDMA ERROR: " - "rdma migration: error allocating pd and cq! Your mlock= ()" - " limits may be too low. Please check $ ulimit -a # and= " - "search for 'ulimit -l' in the output"); + error_append_hint(errp, + "Your mlock() limits may be too low. " + "Please check $ ulimit -a # and " + "search for 'ulimit -l' in the output\n"); goto err_rdma_source_init; } =20 @@ -3450,9 +3451,9 @@ static int qemu_rdma_accept(RDMAContext *rdma) =20 qemu_rdma_dump_id("dest_init", verbs); =20 - ret =3D qemu_rdma_alloc_pd_cq(rdma); + ret =3D qemu_rdma_alloc_pd_cq(rdma, &err); if (ret < 0) { - error_report("rdma migration: error allocating pd and cq!"); + error_report_err(err); goto err_rdma_dest_wait; } =20 --=20 2.41.0