From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9EA71C25B74 for ; Thu, 16 May 2024 14:57:17 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s7cXP-0007Di-0C; Thu, 16 May 2024 10:56:55 -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 1s7cXM-0007DQ-Lo for qemu-devel@nongnu.org; Thu, 16 May 2024 10:56:52 -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 1s7cXK-00068I-EA for qemu-devel@nongnu.org; Thu, 16 May 2024 10:56:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1715871405; 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=FlbiHTkHc8Eggdq/nz7Z+ezJmw+CtAGBp9KLwELawOE=; b=XOlQJJ4jhx+RLhH5BtGjrW9gyqKTgzu7WijPxN8B1Wx24koQZuj8mNWUihBlWZ7n20N0At GB89CgqSWUIRp8IJjneQc/2nzGfftJu8MsNe/arJFUEjr/RDF82LZeeZQCdJHeHtJXfDcc uJ/z3C/izgq6JOlPVlxSHwNRdi8rQh0= Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-343-zoPX0N2SPAWy8l-8NY8wmw-1; Thu, 16 May 2024 10:56:43 -0400 X-MC-Unique: zoPX0N2SPAWy8l-8NY8wmw-1 Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-792c26500adso1082769885a.0 for ; Thu, 16 May 2024 07:56:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715871402; x=1716476202; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=FlbiHTkHc8Eggdq/nz7Z+ezJmw+CtAGBp9KLwELawOE=; b=eFQs2oxg61lDdtrS9oKNfc/feExVcUbY8eLSH7gB30zHu1nqpqrcKuKwshk2M4Nz/j 7WV0TTqp+OPy+ihW73hUnJzJNIdNvZWdlY02jk0HH4eL9EOAXdNEFesL91URvs+gejpk 6dTEeIscbu8NKNGHDvSkxyWNOU3VG8GX+og/f33kgpJ3jJq90eGhb//ucXQz1YyuUrRp bjQVo75htD/1mSLeeUnwXNovKqczX5PE0Gmr5vExTLD1IHzzmcC+H3oUn98z7zuGaZTT /lQ6ThtsMivPjL0CzSqzQPW8qz4wolbXGNt2YljPSdwf/JVNPkQjwXCaC4RkVjaXXQZN NALA== X-Gm-Message-State: AOJu0YymN3SbmFcLDO9CZqpoYFvO6GOQywlN0CnhBP63g9UCm9c8U7wO QFwxsyMKepLLSXI97lGvXX7ltjzBcfX1JIfe9SPGAUnw72qFxzifx4rbXkX2AU7+a1bUdozUZ2w 95iVpLLYCZcc4FtvKemNqy8uFO00kFB8DRmdMf8+Zisyba9jhFM9gOdMyki/fdr7ZhdsAt0pWe6 9D/YSJDzCxzVAFOTqg1tbgaGph5fm7Eg== X-Received: by 2002:a05:622a:1808:b0:43a:ca31:8617 with SMTP id d75a77b69052e-43dfdb47b9bmr211367391cf.44.1715871402436; Thu, 16 May 2024 07:56:42 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHovY4FGIg1dnscaZrHFEr6eycrKW4l2pxxr0V1zisIV1jBLR40INQFTg59KG1mepXg9K0shw== X-Received: by 2002:a05:622a:1808:b0:43a:ca31:8617 with SMTP id d75a77b69052e-43dfdb47b9bmr211366971cf.44.1715871401651; Thu, 16 May 2024 07:56:41 -0700 (PDT) Received: from ?IPV6:2a01:e0a:280:24f0:9db0:474c:ff43:9f5c? ([2a01:e0a:280:24f0:9db0:474c:ff43:9f5c]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-43df56ddd77sm96889061cf.92.2024.05.16.07.56.40 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 16 May 2024 07:56:41 -0700 (PDT) Message-ID: Date: Thu, 16 May 2024 16:56:37 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v7 8/9] vfio: Add Error** argument to .get_dirty_bitmap() handler To: qemu-devel@nongnu.org Cc: Peter Xu , Fabiano Rosas , Alex Williamson , Avihai Horon , Eric Auger , =?UTF-8?Q?Philippe_Mathieu-Daud=C3=A9?= , Markus Armbruster References: <20240516124658.850504-1-clg@redhat.com> <20240516124658.850504-9-clg@redhat.com> Content-Language: en-US, fr From: =?UTF-8?Q?C=C3=A9dric_Le_Goater?= In-Reply-To: <20240516124658.850504-9-clg@redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.129.124; envelope-from=clg@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.022, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On 5/16/24 14:46, Cédric Le Goater wrote: > Let the callers do the error reporting. Add documentation while at it. > > Reviewed-by: Eric Auger > Reviewed-by: Avihai Horon > Signed-off-by: Cédric Le Goater > --- > > Changes in v7: > > - Fixed even more line wrapping of *dirty_bitmap() routines (Avihai) > - vfio_sync_dirty_bitmap() > Fixed return when vfio_sync_ram_discard_listener_dirty_bitmap() is called (Avihai) > > include/hw/vfio/vfio-common.h | 5 +-- > include/hw/vfio/vfio-container-base.h | 19 +++++++-- > hw/vfio/common.c | 60 +++++++++++++++++---------- > hw/vfio/container-base.c | 6 +-- > hw/vfio/container.c | 14 ++++--- > 5 files changed, 67 insertions(+), 37 deletions(-) > > diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h > index 3ff633ad3b395e953a55683f5f0308bca50af3dd..b6ac24953667bc5f72f28480a6bf0f4722069cb9 100644 > --- a/include/hw/vfio/vfio-common.h > +++ b/include/hw/vfio/vfio-common.h > @@ -273,10 +273,9 @@ vfio_devices_all_running_and_mig_active(const VFIOContainerBase *bcontainer); > bool > vfio_devices_all_device_dirty_tracking(const VFIOContainerBase *bcontainer); > int vfio_devices_query_dirty_bitmap(const VFIOContainerBase *bcontainer, > - VFIOBitmap *vbmap, hwaddr iova, > - hwaddr size); > + VFIOBitmap *vbmap, hwaddr iova, hwaddr size, Error **errp); > int vfio_get_dirty_bitmap(const VFIOContainerBase *bcontainer, uint64_t iova, > - uint64_t size, ram_addr_t ram_addr); > + uint64_t size, ram_addr_t ram_addr, Error **errp); > > /* Returns 0 on success, or a negative errno. */ > int vfio_device_get_name(VFIODevice *vbasedev, Error **errp); > diff --git a/include/hw/vfio/vfio-container-base.h b/include/hw/vfio/vfio-container-base.h > index 326ceea52a2030eec9dad289a9845866c4a8c090..b04057ad1aff73d974ecec718d0fe45f7a930b59 100644 > --- a/include/hw/vfio/vfio-container-base.h > +++ b/include/hw/vfio/vfio-container-base.h > @@ -84,8 +84,7 @@ void vfio_container_del_section_window(VFIOContainerBase *bcontainer, > int vfio_container_set_dirty_page_tracking(VFIOContainerBase *bcontainer, > bool start, Error **errp); > int vfio_container_query_dirty_bitmap(const VFIOContainerBase *bcontainer, > - VFIOBitmap *vbmap, > - hwaddr iova, hwaddr size); > + VFIOBitmap *vbmap, hwaddr iova, hwaddr size, Error **errp); > > void vfio_container_init(VFIOContainerBase *bcontainer, > VFIOAddressSpace *space, > @@ -138,9 +137,21 @@ struct VFIOIOMMUClass { > */ > int (*set_dirty_page_tracking)(const VFIOContainerBase *bcontainer, > bool start, Error **errp); > + /** > + * @query_dirty_bitmap > + * > + * Get bitmap of dirty pages from container > + * > + * @bcontainer: #VFIOContainerBase from which to get dirty pages > + * @vbmap: #VFIOBitmap internal bitmap structure > + * @iova: iova base address > + * @size: size of iova range > + * @errp: pointer to Error*, to store an error if it happens. > + * > + * Returns zero to indicate success and negative for error > + */ > int (*query_dirty_bitmap)(const VFIOContainerBase *bcontainer, > - VFIOBitmap *vbmap, > - hwaddr iova, hwaddr size); > + VFIOBitmap *vbmap, hwaddr iova, hwaddr size, Error **errp); > /* PCI specific */ > int (*pci_hot_reset)(VFIODevice *vbasedev, bool single); > > diff --git a/hw/vfio/common.c b/hw/vfio/common.c > index 7313043f1d161ed0326b5ba3fa1085608eaf6740..21910802c0c58a0efdb07d31c5a709660e89e328 100644 > --- a/hw/vfio/common.c > +++ b/hw/vfio/common.c > @@ -1140,8 +1140,7 @@ static int vfio_device_dma_logging_report(VFIODevice *vbasedev, hwaddr iova, > } > > int vfio_devices_query_dirty_bitmap(const VFIOContainerBase *bcontainer, > - VFIOBitmap *vbmap, hwaddr iova, > - hwaddr size) > + VFIOBitmap *vbmap, hwaddr iova, hwaddr size, Error **errp) > { > VFIODevice *vbasedev; > int ret; > @@ -1150,10 +1149,10 @@ int vfio_devices_query_dirty_bitmap(const VFIOContainerBase *bcontainer, > ret = vfio_device_dma_logging_report(vbasedev, iova, size, > vbmap->bitmap); > if (ret) { > - error_report("%s: Failed to get DMA logging report, iova: " > - "0x%" HWADDR_PRIx ", size: 0x%" HWADDR_PRIx > - ", err: %d (%s)", > - vbasedev->name, iova, size, ret, strerror(-ret)); > + error_setg_errno(errp, -ret, > + "%s: Failed to get DMA logging report, iova: " > + "0x%" HWADDR_PRIx ", size: 0x%" HWADDR_PRIx, > + vbasedev->name, iova, size); > > return ret; > } > @@ -1163,7 +1162,7 @@ int vfio_devices_query_dirty_bitmap(const VFIOContainerBase *bcontainer, > } > > int vfio_get_dirty_bitmap(const VFIOContainerBase *bcontainer, uint64_t iova, > - uint64_t size, ram_addr_t ram_addr) > + uint64_t size, ram_addr_t ram_addr, Error **errp) > { > bool all_device_dirty_tracking = > vfio_devices_all_device_dirty_tracking(bcontainer); > @@ -1180,13 +1179,17 @@ int vfio_get_dirty_bitmap(const VFIOContainerBase *bcontainer, uint64_t iova, > > ret = vfio_bitmap_alloc(&vbmap, size); > if (ret) { > + error_setg_errno(errp, -ret, > + "Failed to allocate dirty tracking bitmap"); > return ret; > } > > if (all_device_dirty_tracking) { > - ret = vfio_devices_query_dirty_bitmap(bcontainer, &vbmap, iova, size); > + ret = vfio_devices_query_dirty_bitmap(bcontainer, &vbmap, iova, size, > + errp); > } else { > - ret = vfio_container_query_dirty_bitmap(bcontainer, &vbmap, iova, size); > + ret = vfio_container_query_dirty_bitmap(bcontainer, &vbmap, iova, size, > + errp); > } > > if (ret) { > @@ -1234,12 +1237,13 @@ static void vfio_iommu_map_dirty_notify(IOMMUNotifier *n, IOMMUTLBEntry *iotlb) > } > > ret = vfio_get_dirty_bitmap(bcontainer, iova, iotlb->addr_mask + 1, > - translated_addr); > + translated_addr, &local_err); > if (ret) { > - error_report("vfio_iommu_map_dirty_notify(%p, 0x%"HWADDR_PRIx", " > - "0x%"HWADDR_PRIx") = %d (%s)", > - bcontainer, iova, iotlb->addr_mask + 1, ret, > - strerror(-ret)); > + error_prepend(&local_err, > + "vfio_iommu_map_dirty_notify(%p, 0x%"HWADDR_PRIx", " > + "0x%"HWADDR_PRIx") failed - ", bcontainer, iova, > + iotlb->addr_mask + 1); > + error_report_err(local_err); > } > > out_unlock: > @@ -1259,12 +1263,19 @@ static int vfio_ram_discard_get_dirty_bitmap(MemoryRegionSection *section, > const ram_addr_t ram_addr = memory_region_get_ram_addr(section->mr) + > section->offset_within_region; > VFIORamDiscardListener *vrdl = opaque; > + Error *local_err = NULL; > + int ret; > > /* > * Sync the whole mapped region (spanning multiple individual mappings) > * in one go. > */ > - return vfio_get_dirty_bitmap(vrdl->bcontainer, iova, size, ram_addr); > + ret = vfio_get_dirty_bitmap(vrdl->bcontainer, iova, size, ram_addr, > + &local_err); > + if (ret) { > + error_report_err(local_err); > + } > + return ret; > } > > static int > @@ -1296,7 +1307,7 @@ vfio_sync_ram_discard_listener_dirty_bitmap(VFIOContainerBase *bcontainer, > } > > static int vfio_sync_dirty_bitmap(VFIOContainerBase *bcontainer, > - MemoryRegionSection *section) > + MemoryRegionSection *section, Error **errp) > { > ram_addr_t ram_addr; > > @@ -1327,7 +1338,14 @@ static int vfio_sync_dirty_bitmap(VFIOContainerBase *bcontainer, > } > return 0; > } else if (memory_region_has_ram_discard_manager(section->mr)) { > - return vfio_sync_ram_discard_listener_dirty_bitmap(bcontainer, section); > + int ret; > + > + ret = vfio_sync_ram_discard_listener_dirty_bitmap(bcontainer, section); > + if (ret) { > + error_setg(errp, > + "Failed to sync dirty bitmap with RAM discard listener"); > + return ret; sigh. I missed that change, although I said it was done in the commit log :/ Hopefully I caught it and will fix inline. Sorry about that. Thanks, C. > + } > } > > ram_addr = memory_region_get_ram_addr(section->mr) + > @@ -1335,7 +1353,7 @@ static int vfio_sync_dirty_bitmap(VFIOContainerBase *bcontainer, > > return vfio_get_dirty_bitmap(bcontainer, > REAL_HOST_PAGE_ALIGN(section->offset_within_address_space), > - int128_get64(section->size), ram_addr); > + int128_get64(section->size), ram_addr, errp); > } > > static void vfio_listener_log_sync(MemoryListener *listener, > @@ -1344,16 +1362,16 @@ static void vfio_listener_log_sync(MemoryListener *listener, > VFIOContainerBase *bcontainer = container_of(listener, VFIOContainerBase, > listener); > int ret; > + Error *local_err = NULL; > > if (vfio_listener_skipped_section(section)) { > return; > } > > if (vfio_devices_all_dirty_tracking(bcontainer)) { > - ret = vfio_sync_dirty_bitmap(bcontainer, section); > + ret = vfio_sync_dirty_bitmap(bcontainer, section, &local_err); > if (ret) { > - error_report("vfio: Failed to sync dirty bitmap, err: %d (%s)", ret, > - strerror(-ret)); > + error_report_err(local_err); > vfio_set_migration_error(ret); > } > } > diff --git a/hw/vfio/container-base.c b/hw/vfio/container-base.c > index 7c0764121d24b02b6c4e66e368d7dff78a6d65aa..26f4bb464a720c9895b35c7c9e01c84d6322c3c9 100644 > --- a/hw/vfio/container-base.c > +++ b/hw/vfio/container-base.c > @@ -64,11 +64,11 @@ int vfio_container_set_dirty_page_tracking(VFIOContainerBase *bcontainer, > } > > int vfio_container_query_dirty_bitmap(const VFIOContainerBase *bcontainer, > - VFIOBitmap *vbmap, > - hwaddr iova, hwaddr size) > + VFIOBitmap *vbmap, hwaddr iova, hwaddr size, Error **errp) > { > g_assert(bcontainer->ops->query_dirty_bitmap); > - return bcontainer->ops->query_dirty_bitmap(bcontainer, vbmap, iova, size); > + return bcontainer->ops->query_dirty_bitmap(bcontainer, vbmap, iova, size, > + errp); > } > > void vfio_container_init(VFIOContainerBase *bcontainer, VFIOAddressSpace *space, > diff --git a/hw/vfio/container.c b/hw/vfio/container.c > index c35221fbe7dc5453050f97cd186fc958e24f28f7..9534120d4ac835bb58e37667dad8d39205404c08 100644 > --- a/hw/vfio/container.c > +++ b/hw/vfio/container.c > @@ -130,6 +130,7 @@ static int vfio_legacy_dma_unmap(const VFIOContainerBase *bcontainer, > }; > bool need_dirty_sync = false; > int ret; > + Error *local_err = NULL; > > if (iotlb && vfio_devices_all_running_and_mig_active(bcontainer)) { > if (!vfio_devices_all_device_dirty_tracking(bcontainer) && > @@ -165,8 +166,9 @@ static int vfio_legacy_dma_unmap(const VFIOContainerBase *bcontainer, > > if (need_dirty_sync) { > ret = vfio_get_dirty_bitmap(bcontainer, iova, size, > - iotlb->translated_addr); > + iotlb->translated_addr, &local_err); > if (ret) { > + error_report_err(local_err); > return ret; > } > } > @@ -235,8 +237,7 @@ vfio_legacy_set_dirty_page_tracking(const VFIOContainerBase *bcontainer, > } > > static int vfio_legacy_query_dirty_bitmap(const VFIOContainerBase *bcontainer, > - VFIOBitmap *vbmap, > - hwaddr iova, hwaddr size) > + VFIOBitmap *vbmap, hwaddr iova, hwaddr size, Error **errp) > { > const VFIOContainer *container = container_of(bcontainer, VFIOContainer, > bcontainer); > @@ -264,9 +265,10 @@ static int vfio_legacy_query_dirty_bitmap(const VFIOContainerBase *bcontainer, > ret = ioctl(container->fd, VFIO_IOMMU_DIRTY_PAGES, dbitmap); > if (ret) { > ret = -errno; > - error_report("Failed to get dirty bitmap for iova: 0x%"PRIx64 > - " size: 0x%"PRIx64" err: %d", (uint64_t)range->iova, > - (uint64_t)range->size, errno); > + error_setg_errno(errp, errno, > + "Failed to get dirty bitmap for iova: 0x%"PRIx64 > + " size: 0x%"PRIx64, (uint64_t)range->iova, > + (uint64_t)range->size); > } > > g_free(dbitmap);