Received: by 2002:adf:ef42:0:0:0:0:0 with SMTP id c2csp3628926wrp; Tue, 24 Sep 2019 01:26:27 -0700 (PDT) X-Google-Smtp-Source: APXvYqyQ/E2F8bD5qYqUpdCmyr+om+VHWCofbrr9oFeY0OHsv6s0TVk98rE0DTKdjx/Os4aBiyfD X-Received: by 2002:a05:6402:13cd:: with SMTP id a13mr1361837edx.6.1569313587326; Tue, 24 Sep 2019 01:26:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569313587; cv=none; d=google.com; s=arc-20160816; b=jFPf9fLFFyaJ6SugCw7sk+zRt07Z8hWxf0y4cfPu1HrNyRth/VkFfUCEkI+lrPmvLG tEK/xDWm12Lw0bagJ6rxNX2l9yG/IAwgTFTOARinM4+hMdNukF2yST5lH3AEIcm7ghXI 5z0JmnK5MW7y3aYgiDKkqJpRLr3xpbdk26pggtA3ksZ/l1zJ22iDPEuTT+05BvWRDUpj k6cZEiTKD4rrsoyJ8DaJwv9EHS83D06Sr0JsE7zoEswM1qDtPYRc9a3yH1zG2ocdGPR/ +NwZYvjIb2u+hVJijxWfWnO9+CWnsnhyk/Gj6YFt4jkVsycfT/VKy0RNtd+EsLQTV2gd kNhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from; bh=/XubTthtEZo0SoFtuzWqgidV2bfraC/OzAxdRbp3WC8=; b=YJZpU5o7iPFP17g2WPia8hms3gG45hLLBVD3xpWn969byyRvkG9VFcWKIq6iMTP2HZ cgBVs2DjE93GpvpVwPlJ2PuqJjgwnfZJjQZvNHTflfzsqia5pOWNSE0RsV017MGGMX9m cNEz+pd3VWJhd+x2bVYAtzjJGeO5Hh5WluWIRygU01BMuuGfpwYjzcqYkLdFvOSG5h61 +WhIkOEP8TVdODjtfElhu/eCkkJVQixyDkfmidEGcrPQKLqgE6DjO3yV9PVK/DBj9qRC FtEAA+8TVLMwblv7E/6KBoDm+fCy8ImuV9P3GEjUB+9V2rieeAknohv5FnlGzBy8UDq/ 4xqA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id n17si588280edo.143.2019.09.24.01.26.27 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Sep 2019 01:26:27 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:42492 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCg9S-0000fk-4J for alex.bennee@linaro.org; Tue, 24 Sep 2019 04:26:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46847) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCg8e-0000fM-LY for qemu-arm@nongnu.org; Tue, 24 Sep 2019 04:25:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iCg8c-0006sW-Tj for qemu-arm@nongnu.org; Tue, 24 Sep 2019 04:25:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56858) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iCg8a-0006sB-Sc; Tue, 24 Sep 2019 04:25:34 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5DB873082133; Tue, 24 Sep 2019 08:25:31 +0000 (UTC) Received: from laptop.redhat.com (ovpn-116-30.ams2.redhat.com [10.36.116.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id F232460603; Tue, 24 Sep 2019 08:25:28 +0000 (UTC) From: Eric Auger To: eric.auger.pro@gmail.com, eric.auger@redhat.com, qemu-devel@nongnu.org, qemu-arm@nongnu.org, peter.maydell@linaro.org, pbonzini@redhat.com, alex.williamson@redhat.com, peterx@redhat.com, aik@ozlabs.ru, david@gibson.dropbear.id.au Subject: [PATCH v4 1/2] vfio: Turn the container error into an Error handle Date: Tue, 24 Sep 2019 10:25:16 +0200 Message-Id: <20190924082517.13724-2-eric.auger@redhat.com> In-Reply-To: <20190924082517.13724-1-eric.auger@redhat.com> References: <20190924082517.13724-1-eric.auger@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Tue, 24 Sep 2019 08:25:31 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: 6vAWpCZUpGqE The container error integer field is currently used to store the first error potentially encountered during any vfio_listener_region_add() call. However this fails to propagate detailed error messages up to the vfio_connect_container caller. Instead of using an integer, let's use an Error handle. Messages are slightly reworded to accomodate the propagation. Signed-off-by: Eric Auger --- v3 -> v4: - remove ret useless assignments and restore hw_error() - remove mr local variable - trace [start, end] instead of [start, size] and improve the message for overalp with existing DMA host window --- hw/vfio/common.c | 43 +++++++++++++++++++++++------------ hw/vfio/spapr.c | 4 +++- include/hw/vfio/vfio-common.h | 2 +- 3 files changed, 32 insertions(+), 17 deletions(-) diff --git a/hw/vfio/common.c b/hw/vfio/common.c index 3e03c495d8..cebbb1c28a 100644 --- a/hw/vfio/common.c +++ b/hw/vfio/common.c @@ -509,6 +509,7 @@ static void vfio_listener_region_add(MemoryListener *= listener, int ret; VFIOHostDMAWindow *hostwin; bool hostwin_found; + Error *err =3D NULL; =20 if (vfio_listener_skipped_section(section)) { trace_vfio_listener_region_add_skip( @@ -543,13 +544,20 @@ static void vfio_listener_region_add(MemoryListener= *listener, hostwin->max_iova - hostwin->min_iova + 1= , section->offset_within_address_space, int128_get64(section->size))) { - ret =3D -1; + error_setg(&err, + "region [0x%"PRIx64",0x%"PRIx64"] overlaps with exis= ting" + "host DMA window [0x%"PRIx64",0x%"PRIx64"]", + section->offset_within_address_space, + section->offset_within_address_space + + int128_get64(section->size) - 1, + hostwin->min_iova, hostwin->max_iova); goto fail; } } =20 ret =3D vfio_spapr_create_window(container, section, &pgsize); if (ret) { + error_setg_errno(&err, -ret, "Failed to create SPAPR window"= ); goto fail; } =20 @@ -594,10 +602,8 @@ static void vfio_listener_region_add(MemoryListener = *listener, } =20 if (!hostwin_found) { - error_report("vfio: IOMMU container %p can't map guest IOVA regi= on" - " 0x%"HWADDR_PRIx"..0x%"HWADDR_PRIx, - container, iova, end); - ret =3D -EFAULT; + error_setg(&err, "Container %p can't map guest IOVA region" + " 0x%"HWADDR_PRIx"..0x%"HWADDR_PRIx, container, iova,= end); goto fail; } =20 @@ -664,11 +670,12 @@ static void vfio_listener_region_add(MemoryListener= *listener, ret =3D vfio_dma_map(container, iova, int128_get64(llsize), vaddr, section->readonly); if (ret) { - error_report("vfio_dma_map(%p, 0x%"HWADDR_PRIx", " - "0x%"HWADDR_PRIx", %p) =3D %d (%m)", - container, iova, int128_get64(llsize), vaddr, ret); + error_setg(&err, "vfio_dma_map(%p, 0x%"HWADDR_PRIx", " + "0x%"HWADDR_PRIx", %p) =3D %d (%m)", + container, iova, int128_get64(llsize), vaddr, ret); if (memory_region_is_ram_device(section->mr)) { /* Allow unexpected mappings not to be fatal for RAM devices= */ + error_report_err(err); return; } goto fail; @@ -688,9 +695,14 @@ fail: */ if (!container->initialized) { if (!container->error) { - container->error =3D ret; + error_propagate_prepend(&container->error, err, + "Region %s: ", + memory_region_name(section->mr)); + } else { + error_free(err); } } else { + error_report_err(err); hw_error("vfio: DMA mapping failed, unable to continue"); } } @@ -1251,6 +1263,7 @@ static int vfio_connect_container(VFIOGroup *group,= AddressSpace *as, container =3D g_malloc0(sizeof(*container)); container->space =3D space; container->fd =3D fd; + container->error =3D NULL; QLIST_INIT(&container->giommu_list); QLIST_INIT(&container->hostwin_list); =20 @@ -1308,9 +1321,9 @@ static int vfio_connect_container(VFIOGroup *group,= AddressSpace *as, &address_space_memory); if (container->error) { memory_listener_unregister(&container->prereg_listener); - ret =3D container->error; - error_setg(errp, - "RAM memory listener initialization failed for conta= iner"); + ret =3D -1; + error_propagate_prepend(errp, container->error, + "RAM memory listener initialization failed: "); goto free_container_exit; } } @@ -1365,9 +1378,9 @@ static int vfio_connect_container(VFIOGroup *group,= AddressSpace *as, memory_listener_register(&container->listener, container->space->as)= ; =20 if (container->error) { - ret =3D container->error; - error_setg_errno(errp, -ret, - "memory listener initialization failed for cont= ainer"); + ret =3D -1; + error_propagate_prepend(errp, container->error, + "memory listener initialization failed: "); goto listener_release_exit; } =20 diff --git a/hw/vfio/spapr.c b/hw/vfio/spapr.c index 96c0ad9d9b..e853eebe11 100644 --- a/hw/vfio/spapr.c +++ b/hw/vfio/spapr.c @@ -17,6 +17,7 @@ #include "hw/hw.h" #include "exec/ram_addr.h" #include "qemu/error-report.h" +#include "qapi/error.h" #include "trace.h" =20 static bool vfio_prereg_listener_skipped_section(MemoryRegionSection *se= ction) @@ -85,7 +86,8 @@ static void vfio_prereg_listener_region_add(MemoryListe= ner *listener, */ if (!container->initialized) { if (!container->error) { - container->error =3D ret; + error_setg_errno(&container->error, -ret, + "Memory registering failed"); } } else { hw_error("vfio: Memory registering failed, unable to continu= e"); diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.= h index 9107bd41c0..fd564209ac 100644 --- a/include/hw/vfio/vfio-common.h +++ b/include/hw/vfio/vfio-common.h @@ -71,7 +71,7 @@ typedef struct VFIOContainer { MemoryListener listener; MemoryListener prereg_listener; unsigned iommu_type; - int error; + Error *error; bool initialized; unsigned long pgsizes; QLIST_HEAD(, VFIOGuestIOMMU) giommu_list; --=20 2.20.1