From nobody Mon Nov 25 02:24:04 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1718727294080433.48213371961697; Tue, 18 Jun 2024 09:14:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sJbTJ-0006FF-VA; Tue, 18 Jun 2024 12:14:13 -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 1sJbTD-0005hi-1D for qemu-devel@nongnu.org; Tue, 18 Jun 2024 12:14:08 -0400 Received: from vps-vb.mhejs.net ([37.28.154.113]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sJbTB-0000wN-0O for qemu-devel@nongnu.org; Tue, 18 Jun 2024 12:14:06 -0400 Received: from MUA by vps-vb.mhejs.net with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1sJbT2-0001ee-E2; Tue, 18 Jun 2024 18:13:56 +0200 From: "Maciej S. Szmigiero" To: Peter Xu , Fabiano Rosas Cc: Alex Williamson , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Eric Blake , Markus Armbruster , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Avihai Horon , Joao Martins , qemu-devel@nongnu.org Subject: [PATCH v1 13/13] vfio/migration: Multifd device state transfer support - send side Date: Tue, 18 Jun 2024 18:12:31 +0200 Message-ID: <4630a3df3b9ecc12a4df4df884bb9e5ca3278c08.1718717584.git.maciej.szmigiero@oracle.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=37.28.154.113; envelope-from=mail@maciej.szmigiero.name; helo=vps-vb.mhejs.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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-ZM-MESSAGEID: 1718727296153100003 Content-Type: text/plain; charset="utf-8" From: "Maciej S. Szmigiero" Implement the multifd device state transfer via additional per-device thread spawned from save_live_complete_precopy_begin handler. Switch between doing the data transfer in the new handler and doing it in the old save_state handler depending on the x-migration-multifd-transfer device property value. Signed-off-by: Maciej S. Szmigiero --- hw/vfio/migration.c | 207 ++++++++++++++++++++++++++++++++++ hw/vfio/trace-events | 3 + include/hw/vfio/vfio-common.h | 9 ++ 3 files changed, 219 insertions(+) diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c index 719e36800ab5..28a835f8a945 100644 --- a/hw/vfio/migration.c +++ b/hw/vfio/migration.c @@ -643,6 +643,16 @@ static int vfio_save_setup(QEMUFile *f, void *opaque, = Error **errp) uint64_t stop_copy_size =3D VFIO_MIG_DEFAULT_DATA_BUFFER_SIZE; int ret; =20 + /* Make a copy of this setting at the start in case it is changed mid-= migration */ + migration->multifd_transfer =3D vbasedev->migration_multifd_transfer; + + if (migration->multifd_transfer && !migration_has_device_state_support= ()) { + error_setg(errp, + "%s: Multifd device transfer requested but unsupported = in the current config", + vbasedev->name); + return -EINVAL; + } + qemu_put_be64(f, VFIO_MIG_FLAG_DEV_SETUP_STATE); =20 vfio_query_stop_copy_size(vbasedev, &stop_copy_size); @@ -692,6 +702,8 @@ static int vfio_save_setup(QEMUFile *f, void *opaque, E= rror **errp) return ret; } =20 +static void vfio_save_complete_precopy_async_thread_thread_terminate(VFIOD= evice *vbasedev); + static void vfio_save_cleanup(void *opaque) { VFIODevice *vbasedev =3D opaque; @@ -699,6 +711,8 @@ static void vfio_save_cleanup(void *opaque) Error *local_err =3D NULL; int ret; =20 + vfio_save_complete_precopy_async_thread_thread_terminate(vbasedev); + /* * Changing device state from STOP_COPY to STOP can take time. Do it h= ere, * after migration has completed, so it won't increase downtime. @@ -712,6 +726,7 @@ static void vfio_save_cleanup(void *opaque) } } =20 + g_clear_pointer(&migration->idstr, g_free); g_free(migration->data_buffer); migration->data_buffer =3D NULL; migration->precopy_init_size =3D 0; @@ -823,10 +838,17 @@ static int vfio_save_iterate(QEMUFile *f, void *opaqu= e) static int vfio_save_complete_precopy(QEMUFile *f, void *opaque) { VFIODevice *vbasedev =3D opaque; + VFIOMigration *migration =3D vbasedev->migration; ssize_t data_size; int ret; Error *local_err =3D NULL; =20 + if (migration->multifd_transfer) { + /* Emit dummy NOP data */ + qemu_put_be64(f, VFIO_MIG_FLAG_END_OF_STATE); + return 0; + } + trace_vfio_save_complete_precopy_started(vbasedev->name); =20 /* We reach here with device state STOP or STOP_COPY only */ @@ -852,12 +874,188 @@ static int vfio_save_complete_precopy(QEMUFile *f, v= oid *opaque) return ret; } =20 +static int vfio_save_complete_precopy_async_thread_config_state(VFIODevice= *vbasedev, uint32_t idx) +{ + VFIOMigration *migration =3D vbasedev->migration; + g_autoptr(QIOChannelBuffer) bioc =3D NULL; + QEMUFile *f =3D NULL; + int ret; + g_autofree VFIODeviceStatePacket *packet =3D NULL; + size_t packet_len; + + bioc =3D qio_channel_buffer_new(0); + qio_channel_set_name(QIO_CHANNEL(bioc), "vfio-device-config-save"); + + f =3D qemu_file_new_output(QIO_CHANNEL(bioc)); + + ret =3D vfio_save_device_config_state(f, vbasedev, NULL); + if (ret) { + return ret; + } + + ret =3D qemu_fflush(f); + if (ret) { + goto ret_close_file; + } + + packet_len =3D sizeof(*packet) + bioc->usage; + packet =3D g_malloc0(packet_len); + packet->idx =3D idx; + packet->flags =3D VFIO_DEVICE_STATE_CONFIG_STATE; + memcpy(&packet->data, bioc->data, bioc->usage); + + ret =3D multifd_queue_device_state(migration->idstr, migration->instan= ce_id, + (char *)packet, packet_len); + + bytes_transferred +=3D packet_len; + +ret_close_file: + g_clear_pointer(&f, qemu_fclose); + return ret; +} + +static void *vfio_save_complete_precopy_async_thread(void *opaque) +{ + VFIODevice *vbasedev =3D opaque; + VFIOMigration *migration =3D vbasedev->migration; + int *ret =3D &migration->save_complete_precopy_thread_ret; + g_autofree VFIODeviceStatePacket *packet =3D NULL; + uint32_t idx; + + /* We reach here with device state STOP or STOP_COPY only */ + *ret =3D vfio_migration_set_state(vbasedev, VFIO_DEVICE_STATE_STOP_COP= Y, + VFIO_DEVICE_STATE_STOP, NULL); + if (*ret) { + return NULL; + } + + packet =3D g_malloc0(sizeof(*packet) + migration->data_buffer_size); + + for (idx =3D 0; ; idx++) { + ssize_t data_size; + size_t packet_size; + + data_size =3D read(migration->data_fd, &packet->data, + migration->data_buffer_size); + if (data_size < 0) { + if (errno !=3D ENOMSG) { + *ret =3D -errno; + return NULL; + } + + /* + * Pre-copy emptied all the device state for now. For more inf= ormation, + * please refer to the Linux kernel VFIO uAPI. + */ + data_size =3D 0; + } + + if (data_size =3D=3D 0) + break; + + packet->idx =3D idx; + packet_size =3D sizeof(*packet) + data_size; + + *ret =3D multifd_queue_device_state(migration->idstr, migration->i= nstance_id, + (char *)packet, packet_size); + if (*ret) { + return NULL; + } + + bytes_transferred +=3D packet_size; + } + + *ret =3D vfio_save_complete_precopy_async_thread_config_state(vbasedev= , idx); + if (*ret) { + return NULL; + } + + trace_vfio_save_complete_precopy_async_finished(vbasedev->name); + + return NULL; +} + +static int vfio_save_complete_precopy_begin(QEMUFile *f, + char *idstr, uint32_t instance= _id, + void *opaque) +{ + VFIODevice *vbasedev =3D opaque; + VFIOMigration *migration =3D vbasedev->migration; + int ret; + + migration->save_complete_precopy_thread_ret =3D 0; + + if (!migration->multifd_transfer) { + /* Emit dummy NOP data */ + qemu_put_be64(f, VFIO_MIG_FLAG_END_OF_STATE); + return 0; + } + + qemu_put_be64(f, VFIO_MIG_FLAG_DEV_DATA_STATE_COMPLETE); + qemu_put_be64(f, VFIO_MIG_FLAG_END_OF_STATE); + + ret =3D qemu_fflush(f); + if (ret) { + return ret; + } + + assert(!migration->save_complete_precopy_thread_started); + + assert(!migration->idstr); + migration->idstr =3D g_strdup(idstr); + migration->instance_id =3D instance_id; + + qemu_thread_create(&migration->save_complete_precopy_thread, + "vfio-save_complete_precopy", + vfio_save_complete_precopy_async_thread, + opaque, QEMU_THREAD_JOINABLE); + + migration->save_complete_precopy_thread_started =3D true; + + trace_vfio_save_complete_precopy_async_started(vbasedev->name, idstr, = instance_id); + + return 0; +} + +static void vfio_save_complete_precopy_async_thread_thread_terminate(VFIOD= evice *vbasedev) +{ + VFIOMigration *migration =3D vbasedev->migration; + + if (!migration->save_complete_precopy_thread_started) { + return; + } + + qemu_thread_join(&migration->save_complete_precopy_thread); + + migration->save_complete_precopy_thread_started =3D false; + + trace_vfio_save_complete_precopy_async_joined(vbasedev->name, + migration->save_complete= _precopy_thread_ret); +} + +static int vfio_save_complete_precopy_end(QEMUFile *f, void *opaque) +{ + VFIODevice *vbasedev =3D opaque; + VFIOMigration *migration =3D vbasedev->migration; + + vfio_save_complete_precopy_async_thread_thread_terminate(vbasedev); + + return migration->save_complete_precopy_thread_ret; +} + static void vfio_save_state(QEMUFile *f, void *opaque) { VFIODevice *vbasedev =3D opaque; + VFIOMigration *migration =3D vbasedev->migration; Error *local_err =3D NULL; int ret; =20 + if (migration->multifd_transfer) { + /* Emit dummy NOP data */ + qemu_put_be64(f, VFIO_MIG_FLAG_END_OF_STATE); + return; + } + ret =3D vfio_save_device_config_state(f, opaque, &local_err); if (ret) { error_prepend(&local_err, @@ -1106,6 +1304,8 @@ static const SaveVMHandlers savevm_vfio_handlers =3D { .state_pending_exact =3D vfio_state_pending_exact, .is_active_iterate =3D vfio_is_active_iterate, .save_live_iterate =3D vfio_save_iterate, + .save_live_complete_precopy_begin =3D vfio_save_complete_precopy_begin, + .save_live_complete_precopy_end =3D vfio_save_complete_precopy_end, .save_live_complete_precopy =3D vfio_save_complete_precopy, .save_state =3D vfio_save_state, .load_setup =3D vfio_load_setup, @@ -1127,6 +1327,10 @@ static void vfio_vmstate_change_prepare(void *opaque= , bool running, Error *local_err =3D NULL; int ret; =20 + if (running) { + vfio_save_complete_precopy_async_thread_thread_terminate(vbasedev); + } + new_state =3D migration->device_state =3D=3D VFIO_DEVICE_STATE_PRE_COP= Y ? VFIO_DEVICE_STATE_PRE_COPY_P2P : VFIO_DEVICE_STATE_RUNNING_P2P; @@ -1153,6 +1357,9 @@ static void vfio_vmstate_change(void *opaque, bool ru= nning, RunState state) int ret; =20 if (running) { + /* In case "prepare" callback wasn't registered */ + vfio_save_complete_precopy_async_thread_thread_terminate(vbasedev); + new_state =3D VFIO_DEVICE_STATE_RUNNING; } else { new_state =3D diff --git a/hw/vfio/trace-events b/hw/vfio/trace-events index 7f224e4d240f..569bb02434f1 100644 --- a/hw/vfio/trace-events +++ b/hw/vfio/trace-events @@ -166,6 +166,9 @@ vfio_save_block(const char *name, int data_size) " (%s)= data_size %d" vfio_save_cleanup(const char *name) " (%s)" vfio_save_complete_precopy(const char *name, int ret) " (%s) ret %d" vfio_save_complete_precopy_started(const char *name) " (%s)" +vfio_save_complete_precopy_async_started(const char *name, const char *ids= tr, uint32_t instance_id) " (%s) idstr %s instance %"PRIu32 +vfio_save_complete_precopy_async_finished(const char *name) " (%s)" +vfio_save_complete_precopy_async_joined(const char *name, int ret) " (%s) = ret %d" vfio_save_device_config_state(const char *name) " (%s)" vfio_save_iterate(const char *name, uint64_t precopy_init_size, uint64_t p= recopy_dirty_size) " (%s) precopy initial size 0x%"PRIx64" precopy dirty si= ze 0x%"PRIx64 vfio_save_iterate_started(const char *name) " (%s)" diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h index bc85891d8fff..2d76d3fc8bba 100644 --- a/include/hw/vfio/vfio-common.h +++ b/include/hw/vfio/vfio-common.h @@ -70,16 +70,25 @@ typedef struct VFIOMigration { uint64_t mig_flags; uint64_t precopy_init_size; uint64_t precopy_dirty_size; + bool multifd_transfer; bool initial_data_sent; =20 bool save_iterate_run; bool save_iterate_empty_hit; + + QemuThread save_complete_precopy_thread; + int save_complete_precopy_thread_ret; + bool save_complete_precopy_thread_started; + QemuThread load_bufs_thread; Error *load_bufs_thread_errp; bool load_bufs_thread_started; bool load_bufs_thread_finished; bool load_bufs_thread_want_exit; =20 + char *idstr; + uint32_t instance_id; + GArray *load_bufs; bool load_bufs_device_ready; QemuCond load_bufs_device_ready_cond;