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 DA732C25B79 for ; Thu, 16 May 2024 07:17:39 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s7VMh-0002Te-Qe; Thu, 16 May 2024 03:17:24 -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 1s7VMe-0002T4-0a for qemu-devel@nongnu.org; Thu, 16 May 2024 03:17:20 -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 1s7VMa-00046J-IY for qemu-devel@nongnu.org; Thu, 16 May 2024 03:17:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1715843834; 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=i3Xvy/pzFW9XVdAqyCoLhL50Havhnxbb0D1JsEav2og=; b=eYoACKbuAfO0A1kDiXUtujg3tA7YtHkJyMpdisBlBDGz5yCSP5SzMATdA5tEVM57bSVjfk 6/lqXkJnFFEA9jjyGBjdvTcW9w8dVj0w0IXkbZSxbprIsHyCuUZyGrg2aK7k1uft/n3EY0 XPhp8JR0tiB3ZD92dyijmxRaJI4YJnU= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-609-NY8ZKejQMuqnZFUiQHGPnQ-1; Thu, 16 May 2024 03:17:13 -0400 X-MC-Unique: NY8ZKejQMuqnZFUiQHGPnQ-1 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-41fe6df6ef3so30698215e9.2 for ; Thu, 16 May 2024 00:17:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715843832; x=1716448632; 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=i3Xvy/pzFW9XVdAqyCoLhL50Havhnxbb0D1JsEav2og=; b=oHbFP5YYBNTyfEjHZEd0nSAQvt4OqQQVPQieYEs5BA8ctwcflhnH00JiWsIvQ1dLe/ 8fhFEGQz5jU6sPTeRFoKKjGsKTAUH+ZvGrJoN8Qt0BwbuaENWwAh2FIHg3qrUERgM8VC +PQ3gykSUyZvaobfJ6QqCfj/HFh89/6eZADHgFMFebS7hEwKc+Xfovo7Vc95fTCjLSzV 6KDvz3q/kJsobxTcw3hHDam71NecXyfafsCHKzO9mbSMwDmXOWSXcAtJ5CMgEtpu5I0c fEo9EPNJ/rr3e7KxHKOYOc37NLqHriH1NDYtRnBfXiZ2LZky9WrUW9XxZPqXzCE5wJYM YnvQ== X-Forwarded-Encrypted: i=1; AJvYcCUEjRjvEtSrCp+fjKqALnQLe7d2gvEo/gcNybDHFH86XiFukoQr6mCcPYtYpfnJMsCH3hP8Lucvr9CmK5BaswP3wrb/xtw= X-Gm-Message-State: AOJu0Yy/GQr0mBgE0M3q+qAaKA5uuJl6y3/JC2or2uFSC9Dl+OCPI1Gt 8mbP4Hawh4UdW99+xfnlDbMu8YAAazHfkfxONuHXWpNrB5rkLWmiEtoRP/p6302NGqrOl2GJQeJ dUcqpQw3YDjT8w3LQSfz6m/wWCl4/GS+kuTttc6Ih6hW7fIuGTvoM X-Received: by 2002:a05:600c:444c:b0:41c:83aa:18b7 with SMTP id 5b1f17b1804b1-41fead6d1c8mr124093545e9.33.1715843832035; Thu, 16 May 2024 00:17:12 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHqeTSGe5K8iSZ5ppq4UHeCdIaK+rThX2kq14DX5NuscE7rdmkVWc2z6myRxdMdkWbQcCpPkQ== X-Received: by 2002:a05:600c:444c:b0:41c:83aa:18b7 with SMTP id 5b1f17b1804b1-41fead6d1c8mr124093335e9.33.1715843831522; Thu, 16 May 2024 00:17:11 -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 5b1f17b1804b1-42012a025dbsm160061845e9.23.2024.05.16.00.17.10 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 16 May 2024 00:17:10 -0700 (PDT) Message-ID: Date: Thu, 16 May 2024 09:17:08 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v6 4/9] vfio/migration: Add an Error** argument to vfio_migration_set_state() To: Eric Auger , qemu-devel@nongnu.org Cc: Peter Xu , Fabiano Rosas , Alex Williamson , Avihai Horon , =?UTF-8?Q?Philippe_Mathieu-Daud=C3=A9?= , Markus Armbruster References: <20240514153130.394307-1-clg@redhat.com> <20240514153130.394307-5-clg@redhat.com> <396a3c36-45a3-4749-88b3-439af8819965@redhat.com> Content-Language: en-US, fr From: =?UTF-8?Q?C=C3=A9dric_Le_Goater?= In-Reply-To: <396a3c36-45a3-4749-88b3-439af8819965@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: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.935, 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/15/24 09:20, Eric Auger wrote: > Hi Cédric, > > On 5/14/24 17:31, Cédric Le Goater wrote: >> Add an Error** argument to vfio_migration_set_state() and adjust >> callers, including vfio_save_setup(). The error will be propagated up >> to qemu_savevm_state_setup() where the save_setup() handler is >> executed. >> >> Modify vfio_vmstate_change_prepare() and vfio_vmstate_change() to >> store a reported error under the migration stream if a migration is in >> progress. >> >> Signed-off-by: Cédric Le Goater >> --- >> >> Changes in v6: >> >> - Commit log improvements (Avihai) >> - vfio_migration_set_state() : Dropped the error_setg_errno() change >> when setting device in recover state fails (Avihai) >> - vfio_migration_state_notifier() : report local error (Avihai) >> >> Changes in v5: >> >> - Replaced error_setg() by error_setg_errno() in vfio_migration_set_state() >> - Rebased on 20c64c8a51a4 ("migration: migration_file_set_error") >> >> hw/vfio/migration.c | 77 ++++++++++++++++++++++++++++----------------- >> 1 file changed, 48 insertions(+), 29 deletions(-) >> >> diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c >> index bf2fd0759ba6e4fb103cc5c1a43edb180a3d0de4..bf11135167ebb162dd41415656bdacfa0e1ca550 100644 >> --- a/hw/vfio/migration.c >> +++ b/hw/vfio/migration.c >> @@ -82,7 +82,8 @@ static const char *mig_state_to_str(enum vfio_device_mig_state state) >> >> static int vfio_migration_set_state(VFIODevice *vbasedev, >> enum vfio_device_mig_state new_state, >> - enum vfio_device_mig_state recover_state) >> + enum vfio_device_mig_state recover_state, >> + Error **errp) >> { >> VFIOMigration *migration = vbasedev->migration; >> uint64_t buf[DIV_ROUND_UP(sizeof(struct vfio_device_feature) + >> @@ -102,18 +103,19 @@ static int vfio_migration_set_state(VFIODevice *vbasedev, >> ret = -errno; >> >> if (recover_state == VFIO_DEVICE_STATE_ERROR) { >> - error_report("%s: Failed setting device state to %s, err: %s. " >> - "Recover state is ERROR. Resetting device", >> - vbasedev->name, mig_state_to_str(new_state), >> - strerror(errno)); >> + error_setg_errno(errp, errno, >> + "%s: Failed setting device state to %s. " >> + "Recover state is ERROR. Resetting device", >> + vbasedev->name, mig_state_to_str(new_state)); > nit: this may be simplified > with a first unconditional msg saying Failed setting device state to %s. > Recover state is %s. > and not duplicating the msg. > > In the reset label you can prepend "resetting the device ..." I agree. I'd rather do that in a followup patch after ther error_setg_* changes. Adding to the TODO list. >> >> goto reset_device; >> } >> >> - error_report( >> - "%s: Failed setting device state to %s, err: %s. Setting device in recover state %s", >> - vbasedev->name, mig_state_to_str(new_state), >> - strerror(errno), mig_state_to_str(recover_state)); >> + error_setg_errno(errp, errno, >> + "%s: Failed setting device state to %s. " >> + "Setting device in recover state %s", >> + vbasedev->name, mig_state_to_str(new_state), >> + mig_state_to_str(recover_state));> >> mig_state->device_state = recover_state; >> if (ioctl(vbasedev->fd, VFIO_DEVICE_FEATURE, feature)) { > in case you fail setting the device in recover state, your simply > error_report() and do not prepend any other msg in the error handle. Is > it what you want? yes. Otherwise, we loose the previous error message, which I think is more important to report (first error). The following error_report handles an error of an error, which can go on stderr. > In the positive, maybe worth a comment. OK, to avoid a resend, I will amend the patch with: mig_state->device_state = recover_state; if (ioctl(vbasedev->fd, VFIO_DEVICE_FEATURE, feature)) { ret = -errno; + /* + * If setting the device in recover state fails, report + * the error here and propagate the first error. + */ error_report( "%s: Failed setting device in recover state, err: %s. Resetting device", vbasedev->name, strerror(errno)); Thanks, C. >> @@ -137,7 +139,7 @@ static int vfio_migration_set_state(VFIODevice *vbasedev, >> * This can happen if the device is asynchronously reset and >> * terminates a data transfer. >> */ >> - error_report("%s: data_fd out of sync", vbasedev->name); >> + error_setg(errp, "%s: data_fd out of sync", vbasedev->name); >> close(mig_state->data_fd); >> >> return -EBADF; >> @@ -168,10 +170,11 @@ reset_device: >> */ >> static int >> vfio_migration_set_state_or_reset(VFIODevice *vbasedev, >> - enum vfio_device_mig_state new_state) >> + enum vfio_device_mig_state new_state, >> + Error **errp) >> { >> return vfio_migration_set_state(vbasedev, new_state, >> - VFIO_DEVICE_STATE_ERROR); >> + VFIO_DEVICE_STATE_ERROR, errp); >> } >> >> static int vfio_load_buffer(QEMUFile *f, VFIODevice *vbasedev, >> @@ -399,10 +402,8 @@ static int vfio_save_setup(QEMUFile *f, void *opaque, Error **errp) >> switch (migration->device_state) { >> case VFIO_DEVICE_STATE_RUNNING: >> ret = vfio_migration_set_state(vbasedev, VFIO_DEVICE_STATE_PRE_COPY, >> - VFIO_DEVICE_STATE_RUNNING); >> + VFIO_DEVICE_STATE_RUNNING, errp); >> if (ret) { >> - error_setg(errp, "%s: Failed to set new PRE_COPY state", >> - vbasedev->name); >> return ret; >> } >> >> @@ -435,13 +436,20 @@ static void vfio_save_cleanup(void *opaque) >> { >> VFIODevice *vbasedev = opaque; >> VFIOMigration *migration = vbasedev->migration; >> + Error *local_err = NULL; >> + int ret; >> >> /* >> * Changing device state from STOP_COPY to STOP can take time. Do it here, >> * after migration has completed, so it won't increase downtime. >> */ >> if (migration->device_state == VFIO_DEVICE_STATE_STOP_COPY) { >> - vfio_migration_set_state_or_reset(vbasedev, VFIO_DEVICE_STATE_STOP); >> + ret = vfio_migration_set_state_or_reset(vbasedev, >> + VFIO_DEVICE_STATE_STOP, >> + &local_err); >> + if (ret) { >> + error_report_err(local_err); >> + } >> } >> >> g_free(migration->data_buffer); >> @@ -549,11 +557,13 @@ static int vfio_save_complete_precopy(QEMUFile *f, void *opaque) >> VFIODevice *vbasedev = opaque; >> ssize_t data_size; >> int ret; >> + Error *local_err = NULL; >> >> /* We reach here with device state STOP or STOP_COPY only */ >> ret = vfio_migration_set_state(vbasedev, VFIO_DEVICE_STATE_STOP_COPY, >> - VFIO_DEVICE_STATE_STOP); >> + VFIO_DEVICE_STATE_STOP, &local_err); >> if (ret) { >> + error_report_err(local_err); >> return ret; >> } >> >> @@ -591,14 +601,9 @@ static void vfio_save_state(QEMUFile *f, void *opaque) >> static int vfio_load_setup(QEMUFile *f, void *opaque, Error **errp) >> { >> VFIODevice *vbasedev = opaque; >> - int ret; >> >> - ret = vfio_migration_set_state(vbasedev, VFIO_DEVICE_STATE_RESUMING, >> - vbasedev->migration->device_state); >> - if (ret) { >> - error_setg(errp, "%s: Failed to set RESUMING state", vbasedev->name); >> - } >> - return ret; >> + return vfio_migration_set_state(vbasedev, VFIO_DEVICE_STATE_RESUMING, >> + vbasedev->migration->device_state, errp); >> } >> >> static int vfio_load_cleanup(void *opaque) >> @@ -714,19 +719,20 @@ static void vfio_vmstate_change_prepare(void *opaque, bool running, >> VFIODevice *vbasedev = opaque; >> VFIOMigration *migration = vbasedev->migration; >> enum vfio_device_mig_state new_state; >> + Error *local_err = NULL; >> int ret; >> >> new_state = migration->device_state == VFIO_DEVICE_STATE_PRE_COPY ? >> VFIO_DEVICE_STATE_PRE_COPY_P2P : >> VFIO_DEVICE_STATE_RUNNING_P2P; >> >> - ret = vfio_migration_set_state_or_reset(vbasedev, new_state); >> + ret = vfio_migration_set_state_or_reset(vbasedev, new_state, &local_err); >> if (ret) { >> /* >> * Migration should be aborted in this case, but vm_state_notify() >> * currently does not support reporting failures. >> */ >> - migration_file_set_error(ret, NULL); >> + migration_file_set_error(ret, local_err); >> } >> >> trace_vfio_vmstate_change_prepare(vbasedev->name, running, >> @@ -738,6 +744,7 @@ static void vfio_vmstate_change(void *opaque, bool running, RunState state) >> { >> VFIODevice *vbasedev = opaque; >> enum vfio_device_mig_state new_state; >> + Error *local_err = NULL; >> int ret; >> >> if (running) { >> @@ -750,13 +757,13 @@ static void vfio_vmstate_change(void *opaque, bool running, RunState state) >> VFIO_DEVICE_STATE_STOP; >> } >> >> - ret = vfio_migration_set_state_or_reset(vbasedev, new_state); >> + ret = vfio_migration_set_state_or_reset(vbasedev, new_state, &local_err); >> if (ret) { >> /* >> * Migration should be aborted in this case, but vm_state_notify() >> * currently does not support reporting failures. >> */ >> - migration_file_set_error(ret, NULL); >> + migration_file_set_error(ret, local_err); >> } >> >> trace_vfio_vmstate_change(vbasedev->name, running, RunState_str(state), >> @@ -769,11 +776,23 @@ static int vfio_migration_state_notifier(NotifierWithReturn *notifier, >> VFIOMigration *migration = container_of(notifier, VFIOMigration, >> migration_state); >> VFIODevice *vbasedev = migration->vbasedev; >> + Error *local_err = NULL; >> + int ret = 0; >> >> trace_vfio_migration_state_notifier(vbasedev->name, e->type); >> >> if (e->type == MIG_EVENT_PRECOPY_FAILED) { >> - vfio_migration_set_state_or_reset(vbasedev, VFIO_DEVICE_STATE_RUNNING); >> + /* >> + * MigrationNotifyFunc may return an error code and an Error >> + * object only for MIG_EVENT_PRECOPY_SETUP. Hence, report the >> + * error locally and ignore the errp argument. >> + */ >> + ret = vfio_migration_set_state_or_reset(vbasedev, >> + VFIO_DEVICE_STATE_RUNNING, >> + &local_err); >> + if (ret) { >> + error_report_err(local_err); >> + } >> } >> return 0; >> } > Thanks > > Eric >