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 D46BAC19776 for ; Fri, 28 Feb 2025 09:14:23 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tnwRP-0007YZ-Do; Fri, 28 Feb 2025 04:13:55 -0500 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 1tnwRO-0007Xj-7I for qemu-devel@nongnu.org; Fri, 28 Feb 2025 04:13:54 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tnwRC-0007TC-Ns for qemu-devel@nongnu.org; Fri, 28 Feb 2025 04:13:52 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740734020; 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:autocrypt:autocrypt; bh=vzNTAZKgBLOtSpINcg3Ymz8qclvPjL9AUhQuFMsEJEY=; b=YkEAyV/OOEF22ksxJFJ9V3XbRk+7/Jl5AeETb6qJz6Eky6zVLKGISRfFPFba4aCP9a0Q8K gQ9LkEEBRP/nJFzOcLSIozmAPU241At9G8lJYiRoncDmC6f8NRT/31Zz/1x60wqZSy09kI ldBom0oQoSYtIgQiX5LIfVWR73vxxuA= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-240-Os8nUMrfPDqt6GLEui3_Gw-1; Fri, 28 Feb 2025 04:13:38 -0500 X-MC-Unique: Os8nUMrfPDqt6GLEui3_Gw-1 X-Mimecast-MFC-AGG-ID: Os8nUMrfPDqt6GLEui3_Gw_1740734017 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-4394c0a58e7so12119195e9.0 for ; Fri, 28 Feb 2025 01:13:38 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740734017; x=1741338817; h=content-transfer-encoding:in-reply-to:autocrypt: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=vzNTAZKgBLOtSpINcg3Ymz8qclvPjL9AUhQuFMsEJEY=; b=UdigLUGnoVycSKdWLp+v/NhBPUPQWEMlaqVZfiBdafZQZ3JwIcNBDfw2LI922QZn3q A0+7KY7S16iDcMib66zyFsvnlDCCLAvbVnGQPdvYm/AA3SzLrGAyDQ89igjrvgB7t7Jy 3xY/Vo4ZRqBIo0FRrGoTBlcO0zlK36PlNN1pVQ9Who3eOyxLg7O+6ZCCr7Fvf2HCyqut tXC4VDMRfKvLDsRwYTwhq/T4WWWaBPdIc5Vh/alu3GQN2DIaL9hRphvrJL+yVnrzUTun VLm4FBOdNXbtKN6NPyMP70JUNtilvSNTAAVrN05aNHrmJ8KTX0YEEknLXfsAlJm3FQfN aKZA== X-Forwarded-Encrypted: i=1; AJvYcCWqL49lSEkMKm1i/W1K61iuBkd4JhflUW3YTl4pzlRmUrS4JZRdpXEbU0vg9e8ePeOzl3TWxTlVsfpq@nongnu.org X-Gm-Message-State: AOJu0YzcMhXL7xbyDQQ1gs69Kp/GGnhTbgEorlACIPbtM2HYiXAg8weQ J+wqiVOP+/CN+IHC0cBTAxKrn3JHl0U60M9Hlk/20mxfSI0ofRVZWkNlKtvb/wZuoWN8YmODmbI bgFC6me5ExmIhjoqoV7hxS2dUEBDNXAbL57tCvltEvluoZ5f02vv5 X-Gm-Gg: ASbGncurDiv7c/VHaZsrpGTwkMVXON17+cLM4hytuSvc7fOhiL2HoRzhVrV76cjwKvr 8vEQrE1PCvsD9LD2CggldmCNgWmsbOvmlZ6iBkJ2FVtJF59UP1Rp22S/M4M5Z/Nj9juslIFHaRQ 138PPU1KtIRHEZte7K07EZSoIIBorwEqwB4sRCsb0wJioXPN+H+3cXDjFG+57esczRymZ4aLrVO LEgvLP6hNGq+QqGTbCshMVTcctQmYhn3VY4iE914PE5cRUIYTObUGzZHYUg/xv3RQliaDFk5DMU 1JhbOer4Al6RNztEvllt4LF2yOX5dshPGqMvpcREGa+GnNf16S9KMEPc5oo= X-Received: by 2002:a05:600c:1547:b0:439:98f6:8bc8 with SMTP id 5b1f17b1804b1-43ba6760ca3mr14772575e9.26.1740734016919; Fri, 28 Feb 2025 01:13:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IHr5wr1OjOX/cTeDfT8lQ5wcYPUxiA3zpcetaeoDsMe+3P5po9npHMslBKoPFT8wSPDdyeI7Q== X-Received: by 2002:a05:600c:1547:b0:439:98f6:8bc8 with SMTP id 5b1f17b1804b1-43ba6760ca3mr14772165e9.26.1740734016290; Fri, 28 Feb 2025 01:13:36 -0800 (PST) Received: from ?IPV6:2a01:cb19:9004:d500:837f:93fd:c85e:5b97? ([2a01:cb19:9004:d500:837f:93fd:c85e:5b97]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-390e485d6cdsm4530588f8f.84.2025.02.28.01.13.35 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 28 Feb 2025 01:13:35 -0800 (PST) Message-ID: Date: Fri, 28 Feb 2025 10:13:34 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v5 30/36] vfio/migration: Multifd device state transfer support - send side To: "Maciej S. Szmigiero" Cc: Alex Williamson , Eric Blake , Peter Xu , Fabiano Rosas , Markus Armbruster , =?UTF-8?Q?Daniel_P_=2E_Berrang=C3=A9?= , Avihai Horon , Joao Martins , qemu-devel@nongnu.org References: <608c869621ffe1688e08af98a373c33376487d53.1739994627.git.maciej.szmigiero@oracle.com> <59f0710b-fac6-4a37-9e0d-2cddd43eee24@redhat.com> <5c17edbd-b538-43c3-9a51-430fc337de4c@maciej.szmigiero.name> Content-Language: en-US, fr From: =?UTF-8?Q?C=C3=A9dric_Le_Goater?= Autocrypt: addr=clg@redhat.com; keydata= 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 uVKe8BVz4atMOoktmt0GWTOC8P4= In-Reply-To: <5c17edbd-b538-43c3-9a51-430fc337de4c@maciej.szmigiero.name> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.133.124; envelope-from=clg@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.438, 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_H2=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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 2/26/25 22:05, Maciej S. Szmigiero wrote: > On 26.02.2025 17:43, Cédric Le Goater wrote: >> On 2/19/25 21:34, Maciej S. Szmigiero wrote: >>> From: "Maciej S. Szmigiero" >>> >>> Implement the multifd device state transfer via additional per-device >>> thread inside save_live_complete_precopy_thread 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-multifd.c   | 139 ++++++++++++++++++++++++++++++++++ >>>   hw/vfio/migration-multifd.h   |   5 ++ >>>   hw/vfio/migration.c           |  26 +++++-- >>>   hw/vfio/trace-events          |   2 + >>>   include/hw/vfio/vfio-common.h |   8 ++ >>>   5 files changed, 174 insertions(+), 6 deletions(-) >>> >>> diff --git a/hw/vfio/migration-multifd.c b/hw/vfio/migration-multifd.c >>> index 7200f6f1c2a2..0cfa9d31732a 100644 >>> --- a/hw/vfio/migration-multifd.c >>> +++ b/hw/vfio/migration-multifd.c >>> @@ -476,6 +476,145 @@ bool vfio_multifd_transfer_setup(VFIODevice *vbasedev, Error **errp) >>>       return true; >>>   } >>> +void vfio_multifd_emit_dummy_eos(VFIODevice *vbasedev, QEMUFile *f) >>> +{ >>> +    assert(vfio_multifd_transfer_enabled(vbasedev)); >>> + >>> +    /* >>> +     * Emit dummy NOP data on the main migration channel since the actual >>> +     * device state transfer is done via multifd channels. >>> +     */ >>> +    qemu_put_be64(f, VFIO_MIG_FLAG_END_OF_STATE); >>> +} >>> + >>> +static bool >>> +vfio_save_complete_precopy_thread_config_state(VFIODevice *vbasedev, >>> +                                               char *idstr, >>> +                                               uint32_t instance_id, >>> +                                               uint32_t idx, >>> +                                               Error **errp) >>> +{ >>> +    g_autoptr(QIOChannelBuffer) bioc = NULL; >>> +    g_autoptr(QEMUFile) f = NULL; >>> +    int ret; >>> +    g_autofree VFIODeviceStatePacket *packet = NULL; >>> +    size_t packet_len; >>> + >>> +    bioc = qio_channel_buffer_new(0); >>> +    qio_channel_set_name(QIO_CHANNEL(bioc), "vfio-device-config-save"); >>> + >>> +    f = qemu_file_new_output(QIO_CHANNEL(bioc)); >>> + >>> +    if (vfio_save_device_config_state(f, vbasedev, errp)) { >>> +        return false; >>> +    } >>> + >>> +    ret = qemu_fflush(f); >>> +    if (ret) { >>> +        error_setg(errp, "save config state flush failed: %d", ret); >>> +        return false; >>> +    } >>> + >>> +    packet_len = sizeof(*packet) + bioc->usage; >>> +    packet = g_malloc0(packet_len); >>> +    packet->version = VFIO_DEVICE_STATE_PACKET_VER_CURRENT; >>> +    packet->idx = idx; >>> +    packet->flags = VFIO_DEVICE_STATE_CONFIG_STATE; >>> +    memcpy(&packet->data, bioc->data, bioc->usage); >>> + >>> +    if (!multifd_queue_device_state(idstr, instance_id, >>> +                                    (char *)packet, packet_len)) { >>> +        error_setg(errp, "multifd config data queuing failed"); >>> +        return false; >>> +    } >>> + >>> +    vfio_add_bytes_transferred(packet_len); >>> + >>> +    return true; >>> +} >>> + >>> +/* >>> + * This thread is spawned by the migration core directly via >>> + * .save_live_complete_precopy_thread SaveVMHandler. >>> + * >>> + * It exits after either: >>> + * * completing saving the remaining device state and device config, OR: >>> + * * encountering some error while doing the above, OR: >>> + * * being forcefully aborted by the migration core by >>> + *   multifd_device_state_save_thread_should_exit() returning true. >>> + */ >>> +bool vfio_save_complete_precopy_thread(SaveLiveCompletePrecopyThreadData *d, >>> +                                       Error **errp) >> >> In qemu_savevm_state_complete_precopy_iterable(), this handler is >> called : >> >>      .... >>      if (multifd_device_state) { >>          QTAILQ_FOREACH(se, &savevm_state.handlers, entry) { >>              SaveLiveCompletePrecopyThreadHandler hdlr; >> >>              if (!se->ops || (in_postcopy && se->ops->has_postcopy && >>                               se->ops->has_postcopy(se->opaque)) || >>                  !se->ops->save_live_complete_precopy_thread) { >>                  continue; >>              } >> >>              hdlr = se->ops->save_live_complete_precopy_thread; >>              multifd_spawn_device_state_save_thread(hdlr, >>                                                     se->idstr, se->instance_id, >>                                                     se->opaque); >>          } >>      } >> >> >> I suggest naming it : vfio_multifd_save_complete_precopy_thread() > > Renamed accordingly. > >>> +{ >>> +    VFIODevice *vbasedev = d->handler_opaque; >>> +    VFIOMigration *migration = vbasedev->migration; >>> +    bool ret; >>> +    g_autofree VFIODeviceStatePacket *packet = NULL; >>> +    uint32_t idx; >>> + >>> +    if (!vfio_multifd_transfer_enabled(vbasedev)) { >>> +        /* Nothing to do, vfio_save_complete_precopy() does the transfer. */ >>> +        return true; >>> +    } >>> + >>> +    trace_vfio_save_complete_precopy_thread_start(vbasedev->name, >>> +                                                  d->idstr, d->instance_id); >>> + >>> +    /* We reach here with device state STOP or STOP_COPY only */ >>> +    if (vfio_migration_set_state(vbasedev, VFIO_DEVICE_STATE_STOP_COPY, >>> +                                 VFIO_DEVICE_STATE_STOP, errp)) { >>> +        ret = false; >> >> These "ret = false" can be avoided if the variable is set at the >> top of the function. > > I inverted the "ret" logic here as in vfio_load_bufs_thread() > to make it false by default and set to true just before early > exit label. ok. Let's see what it looks like in v6. >>> +        goto ret_finish; >> >> >> goto thread_exit ? > > As I asked in one of the previous patches, > do this comment mean that your want to rename ret_finish label to > thread_exit? Yes. I find label 'thread_exit' more meaning full. This is minor since there is only one 'exit' label. > >>> +    } >>> + >>> +    packet = g_malloc0(sizeof(*packet) + migration->data_buffer_size); >>> +    packet->version = VFIO_DEVICE_STATE_PACKET_VER_CURRENT; >>> + >>> +    for (idx = 0; ; idx++) { >>> +        ssize_t data_size; >>> +        size_t packet_size; >>> + >>> +        if (multifd_device_state_save_thread_should_exit()) { >>> +            error_setg(errp, "operation cancelled"); >>> +            ret = false; >>> +            goto ret_finish; >>> +        }> + >>> +        data_size = read(migration->data_fd, &packet->data, >>> +                         migration->data_buffer_size); >>> +        if (data_size < 0) { >>> +            error_setg(errp, "reading state buffer %" PRIu32 " failed: %d", >>> +                       idx, errno); >>> +            ret = false; >>> +            goto ret_finish; >>> +        } else if (data_size == 0) { >>> +            break; >>> +        } >>> + >>> +        packet->idx = idx; >>> +        packet_size = sizeof(*packet) + data_size; >>> + >>> +        if (!multifd_queue_device_state(d->idstr, d->instance_id, >>> +                                        (char *)packet, packet_size)) { >>> +            error_setg(errp, "multifd data queuing failed"); >>> +            ret = false; >>> +            goto ret_finish; >>> +        } >>> + >>> +        vfio_add_bytes_transferred(packet_size); >>> +    } >>> + >>> +    ret = vfio_save_complete_precopy_thread_config_state(vbasedev, >>> +                                                         d->idstr, >>> +                                                         d->instance_id, >>> +                                                         idx, errp); >>> + >>> +ret_finish: >>> +    trace_vfio_save_complete_precopy_thread_end(vbasedev->name, ret); >>> + >>> +    return ret; >>> +} >>> + >>>   int vfio_multifd_switchover_start(VFIODevice *vbasedev) >>>   { >>>       VFIOMigration *migration = vbasedev->migration; >>> diff --git a/hw/vfio/migration-multifd.h b/hw/vfio/migration-multifd.h >>> index 09cbb437d9d1..79780d7b5392 100644 >>> --- a/hw/vfio/migration-multifd.h >>> +++ b/hw/vfio/migration-multifd.h >>> @@ -25,6 +25,11 @@ bool vfio_multifd_transfer_setup(VFIODevice *vbasedev, Error **errp); >>>   bool vfio_load_state_buffer(void *opaque, char *data, size_t data_size, >>>                               Error **errp); >>> +void vfio_multifd_emit_dummy_eos(VFIODevice *vbasedev, QEMUFile *f); >>> + >>> +bool vfio_save_complete_precopy_thread(SaveLiveCompletePrecopyThreadData *d, >>> +                                       Error **errp); >>> + >>>   int vfio_multifd_switchover_start(VFIODevice *vbasedev); >>>   #endif >>> diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c >>> index b962309f7c27..69dcf2dac2fa 100644 >>> --- a/hw/vfio/migration.c >>> +++ b/hw/vfio/migration.c > (..) >>> @@ -238,8 +238,7 @@ static int vfio_load_buffer(QEMUFile *f, VFIODevice *vbasedev, >>>       return ret; >>>   } >>> -static int vfio_save_device_config_state(QEMUFile *f, void *opaque, >>> -                                         Error **errp) >>> +int vfio_save_device_config_state(QEMUFile *f, void *opaque, Error **errp) >>>   { >>>       VFIODevice *vbasedev = opaque; >>>       int ret; >>> @@ -453,6 +452,10 @@ static int vfio_save_setup(QEMUFile *f, void *opaque, Error **errp) >>>       uint64_t stop_copy_size = VFIO_MIG_DEFAULT_DATA_BUFFER_SIZE; >>>       int ret; >>> +    if (!vfio_multifd_transfer_setup(vbasedev, errp)) { >>> +        return -EINVAL; >>> +    } >>> + >> >> please move to another patch with the similar change of patch 25. >> > > This patch is about the send/save side while patch 25 > is called "*receive* init/cleanup". > > So adding save setup to patch called "receive init" wouldn't be > consistent with that patch subject. In that case, could please add an extra patch checking for the consistency of the settings ? Thanks, C. > >>>       qemu_put_be64(f, VFIO_MIG_FLAG_DEV_SETUP_STATE); >>>       vfio_query_stop_copy_size(vbasedev, &stop_copy_size); > > (..) >>> index ce2bdea8a2c2..ba851917f9fc 100644 >>> --- a/include/hw/vfio/vfio-common.h >>> +++ b/include/hw/vfio/vfio-common.h >>> @@ -298,6 +298,14 @@ void vfio_add_bytes_transferred(unsigned long val); >>>   bool vfio_device_state_is_running(VFIODevice *vbasedev); >>>   bool vfio_device_state_is_precopy(VFIODevice *vbasedev); >>> +#ifdef CONFIG_LINUX >>> +int vfio_migration_set_state(VFIODevice *vbasedev, >>> +                             enum vfio_device_mig_state new_state, >>> +                             enum vfio_device_mig_state recover_state, >>> +                             Error **errp); >> >> please move below with the other declarations under #ifdef CONFIG_LINUX. >> >>> +#endif >>> + >>> +int vfio_save_device_config_state(QEMUFile *f, void *opaque, Error **errp); >>>   int vfio_load_device_config_state(QEMUFile *f, void *opaque); >>>   #ifdef CONFIG_LINUX >>> >> > > Done. > >> >> Thanks, >> >> C. > > Thanks, > Maciej >