From: "Cédric Le Goater" <clg@redhat.com>
To: Avihai Horon <avihaih@nvidia.com>, qemu-devel@nongnu.org
Cc: "Peter Xu" <peterx@redhat.com>, "Fabiano Rosas" <farosas@suse.de>,
"Alex Williamson" <alex.williamson@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Markus Armbruster" <armbru@redhat.com>
Subject: Re: [PATCH v5 10/10] vfio: Extend vfio_set_migration_error() with Error* argument
Date: Tue, 14 May 2024 13:20:12 +0200 [thread overview]
Message-ID: <d7122cae-8e84-4ea3-987b-107f44bee937@redhat.com> (raw)
In-Reply-To: <c06e8de4-a3ad-4044-a4ca-f45d404314fb@nvidia.com>
On 5/13/24 16:26, Avihai Horon wrote:
>
> On 06/05/2024 12:20, Cédric Le Goater wrote:
>> External email: Use caution opening links or attachments
>>
>>
>> vfio_set_migration_error() sets the 'return' error on the migration
>> stream if a migration is in progress. To improve error reporting, add
>> a new Error* argument to also set the Error object on the migration
>> stream, if a migration is progress.
>>
>> Signed-off-by: Cédric Le Goater <clg@redhat.com>
>> ---
>>
>> Changes in v5:
>>
>> - Rebased on 20c64c8a51a4 ("migration: migration_file_set_error")
>>
>> hw/vfio/common.c | 37 ++++++++++++++++++-------------------
>> 1 file changed, 18 insertions(+), 19 deletions(-)
>>
>> diff --git a/hw/vfio/common.c b/hw/vfio/common.c
>> index c3d82a9d6e434e33f361e4b96157bf912d5c3a2f..4cf3e13a8439bd1b9a032e9d4e75df676eba457b 100644
>> --- a/hw/vfio/common.c
>> +++ b/hw/vfio/common.c
>> @@ -147,10 +147,10 @@ bool vfio_viommu_preset(VFIODevice *vbasedev)
>> return vbasedev->bcontainer->space->as != &address_space_memory;
>> }
>>
>> -static void vfio_set_migration_error(int err)
>> +static void vfio_set_migration_error(int ret, Error *err)
>> {
>> if (migration_is_setup_or_active()) {
>> - migration_file_set_error(err, NULL);
>> + migration_file_set_error(ret, err);
>> }
>> }
>>
>> @@ -295,9 +295,10 @@ static void vfio_iommu_map_notify(IOMMUNotifier *n, IOMMUTLBEntry *iotlb)
>> iova, iova + iotlb->addr_mask);
>>
>> if (iotlb->target_as != &address_space_memory) {
>> - error_report("Wrong target AS \"%s\", only system memory is allowed",
>> - iotlb->target_as->name ? iotlb->target_as->name : "none");
>> - vfio_set_migration_error(-EINVAL);
>> + error_setg(&local_err,
>> + "Wrong target AS \"%s\", only system memory is allowed",
>> + iotlb->target_as->name ? iotlb->target_as->name : "none");
>> + vfio_set_migration_error(-EINVAL, local_err);
>> return;
>> }
>>
>> @@ -330,11 +331,12 @@ static void vfio_iommu_map_notify(IOMMUNotifier *n, IOMMUTLBEntry *iotlb)
>> ret = vfio_container_dma_unmap(bcontainer, iova,
>> iotlb->addr_mask + 1, iotlb);
>> if (ret) {
>> - error_report("vfio_container_dma_unmap(%p, 0x%"HWADDR_PRIx", "
>> - "0x%"HWADDR_PRIx") = %d (%s)",
>> - bcontainer, iova,
>> - iotlb->addr_mask + 1, ret, strerror(-ret));
>> - vfio_set_migration_error(ret);
>> + error_setg(&local_err,
>> + "vfio_container_dma_unmap(%p, 0x%"HWADDR_PRIx", "
>> + "0x%"HWADDR_PRIx") = %d (%s)",
>> + bcontainer, iova,
>> + iotlb->addr_mask + 1, ret, strerror(-ret));
>
> Use error_setg_errno()?
sure.
>
>> + vfio_set_migration_error(ret, local_err);
>
> Now dma unmap errors (and also the error before it) are not reported if they happen not during migration.
>
> This makes me think, maybe vfio_set_migration_error() is redundant and can be replaced by migration_file_set_error()?
yes. Good suggestion. I would like to get rid of vfio_set_migration_error(),
so that's a good start.
Thanks,
C.
> Thanks.
>
>> }
>> }
>> out:
>> @@ -1108,8 +1110,7 @@ static void vfio_listener_log_global_stop(MemoryListener *listener)
>> if (ret) {
>> error_prepend(&local_err,
>> "vfio: Could not stop dirty page tracking - ");
>> - error_report_err(local_err);
>> - vfio_set_migration_error(ret);
>> + vfio_set_migration_error(ret, local_err);
>> }
>> }
>>
>> @@ -1226,14 +1227,14 @@ static void vfio_iommu_map_dirty_notify(IOMMUNotifier *n, IOMMUTLBEntry *iotlb)
>> trace_vfio_iommu_map_dirty_notify(iova, iova + iotlb->addr_mask);
>>
>> if (iotlb->target_as != &address_space_memory) {
>> - error_report("Wrong target AS \"%s\", only system memory is allowed",
>> - iotlb->target_as->name ? iotlb->target_as->name : "none");
>> + error_setg(&local_err,
>> + "Wrong target AS \"%s\", only system memory is allowed",
>> + iotlb->target_as->name ? iotlb->target_as->name : "none");
>> goto out;
>> }
>>
>> rcu_read_lock();
>> if (!vfio_get_xlat_addr(iotlb, NULL, &translated_addr, NULL, &local_err)) {
>> - error_report_err(local_err);
>> goto out_lock;
>> }
>>
>> @@ -1244,7 +1245,6 @@ static void vfio_iommu_map_dirty_notify(IOMMUNotifier *n, IOMMUTLBEntry *iotlb)
>> "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_lock:
>> @@ -1252,7 +1252,7 @@ out_lock:
>>
>> out:
>> if (ret) {
>> - vfio_set_migration_error(ret);
>> + vfio_set_migration_error(ret, local_err);
>> }
>> }
>>
>> @@ -1372,8 +1372,7 @@ static void vfio_listener_log_sync(MemoryListener *listener,
>> if (vfio_devices_all_dirty_tracking(bcontainer)) {
>> ret = vfio_sync_dirty_bitmap(bcontainer, section, &local_err);
>> if (ret) {
>> - error_report_err(local_err);
>> - vfio_set_migration_error(ret);
>> + vfio_set_migration_error(ret, local_err);
>> }
>> }
>> }
>> --
>> 2.45.0
>>
>
next prev parent reply other threads:[~2024-05-14 11:20 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-06 9:20 [PATCH v5 00/10] vfio: Improve error reporting (part 2) Cédric Le Goater
2024-05-06 9:20 ` [PATCH v5 01/10] vfio: Add Error** argument to .set_dirty_page_tracking() handler Cédric Le Goater
2024-05-13 13:03 ` Avihai Horon
2024-05-13 16:27 ` Cédric Le Goater
2024-05-15 12:17 ` Avihai Horon
2024-05-15 12:25 ` Cédric Le Goater
2024-05-15 12:29 ` Avihai Horon
2024-05-15 12:36 ` Cédric Le Goater
2024-05-15 12:49 ` Avihai Horon
2024-05-06 9:20 ` [PATCH v5 02/10] vfio: Add Error** argument to vfio_devices_dma_logging_start() Cédric Le Goater
2024-05-13 13:08 ` Avihai Horon
2024-05-13 16:49 ` Cédric Le Goater
2024-05-06 9:20 ` [PATCH v5 03/10] vfio: Extend migration_file_set_error() with Error** argument Cédric Le Goater
2024-05-13 13:14 ` Avihai Horon
2024-05-13 16:51 ` Cédric Le Goater
2024-05-13 22:19 ` Fabiano Rosas
2024-05-06 9:20 ` [PATCH v5 04/10] vfio: Use new Error** argument in vfio_save_setup() Cédric Le Goater
2024-05-13 13:21 ` Avihai Horon
2024-05-14 7:57 ` Cédric Le Goater
2024-05-06 9:20 ` [PATCH v5 05/10] vfio: Add Error** argument to .vfio_save_config() handler Cédric Le Goater
2024-05-13 13:30 ` Avihai Horon
2024-05-14 8:50 ` Cédric Le Goater
2024-05-06 9:20 ` [PATCH v5 06/10] vfio: Reverse test on vfio_get_dirty_bitmap() Cédric Le Goater
2024-05-13 13:42 ` Avihai Horon
2024-05-14 8:55 ` Cédric Le Goater
2024-05-06 9:20 ` [PATCH v5 07/10] memory: Add Error** argument to memory_get_xlat_addr() Cédric Le Goater
2024-05-13 13:44 ` Avihai Horon
2024-05-14 8:57 ` Cédric Le Goater
2024-05-06 9:20 ` [PATCH v5 08/10] vfio: Add Error** argument to .get_dirty_bitmap() handler Cédric Le Goater
2024-05-13 13:51 ` Avihai Horon
2024-05-14 9:05 ` Cédric Le Goater
2024-05-06 9:20 ` [PATCH v5 09/10] vfio: Also trace event failures in vfio_save_complete_precopy() Cédric Le Goater
2024-05-13 13:54 ` Avihai Horon
2024-05-06 9:20 ` [PATCH v5 10/10] vfio: Extend vfio_set_migration_error() with Error* argument Cédric Le Goater
2024-05-13 14:26 ` Avihai Horon
2024-05-14 11:20 ` Cédric Le Goater [this message]
2024-05-14 14:35 ` Cédric Le Goater
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d7122cae-8e84-4ea3-987b-107f44bee937@redhat.com \
--to=clg@redhat.com \
--cc=alex.williamson@redhat.com \
--cc=armbru@redhat.com \
--cc=avihaih@nvidia.com \
--cc=farosas@suse.de \
--cc=peterx@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).