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 93812C021B8 for ; Wed, 26 Feb 2025 17:29:29 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tnLDo-0007Iv-Am; Wed, 26 Feb 2025 12:29:25 -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 1tnLDL-00076Q-C6 for qemu-devel@nongnu.org; Wed, 26 Feb 2025 12:28:56 -0500 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 1tnLDI-0000ut-L2 for qemu-devel@nongnu.org; Wed, 26 Feb 2025 12:28:54 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740590931; 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=DeOXf5Z8qiq3+4U9s+XUolU0yku00Y5eSKrWvGoiA0I=; b=JqtMSXEEWHEjYJc6CQAotKwlnB6o2plsqHY6Z2wjzm2uUj2o6RFn2+zMfBL7YsMwLYuaTS thueilqx82npQx1f+mxIQ0/MrwXsI7v8bQ3djibTY4irwnWxO/ltj8oMVjZpk2e7jBEIf7 m7xBarBrIFQ2SlsdMoONrWPRLr3suY0= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-553-Gijt9IY0NTqpU-Z5l7aqmA-1; Wed, 26 Feb 2025 12:28:48 -0500 X-MC-Unique: Gijt9IY0NTqpU-Z5l7aqmA-1 X-Mimecast-MFC-AGG-ID: Gijt9IY0NTqpU-Z5l7aqmA_1740590928 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-38f29b4d4adso2872457f8f.3 for ; Wed, 26 Feb 2025 09:28:48 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740590928; x=1741195728; 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=DeOXf5Z8qiq3+4U9s+XUolU0yku00Y5eSKrWvGoiA0I=; b=gGV7RDwWRWXm61dfUdlDUhRu1EPu7UNvqq8F+pdbGregLZrVkxWX9+YRvpTa4djuci gbNNF8GwKcWGnrYduZK4GbtepGz5taF2UsETvO7N/ex3MVKZ4sTBfeQwO3TJz0pVtwoE 8cA+U8PLU6jhmva5ll9aD8d/QiNGPezSjjHwJUKTAWj7xV+yR+HPTjqBVXVGDpjOVVdT /Bjfeu1izZlnXzohVhkymUmEAzCEm8F1Imvn2+sOASWF6PTPwjhkcIGlBBCoUxdOi6xC bL4Ycj/eZe1Nizj+lmbI3nHMs0iFZaR4T3qC9Fd9pLh0Z0T3tb9iTlH2n+YIufYfVFH4 KS0w== X-Forwarded-Encrypted: i=1; AJvYcCVg874GR6EfXBR32paatdce9fm1EDfiTisRVjGSZybWI4DDtYDm1ECofbApISrhjs2v2uOzFmK/8lBL@nongnu.org X-Gm-Message-State: AOJu0YzdE89o1epzNX1NZWXxBXNlI5SfGNNVjbViaUldKNa1ni/8komy yTFmCLkWmy2zfFlW2eouX6Mvy2xJcX4yLAD/3K3mTFMswIU9XA7Vqqq+V8w9uWXe0mj1dy14omy 47pjI/ZIG+is6MmJljpXhaUp5Crb7DdHzZIpNNZ0fnR8HhGK8v3zx X-Gm-Gg: ASbGncsI++smMvHemiX7iWypxyFNxDZoqf1uxwJch0JogvoP1HmgwleGy+t6Tt4TK8V hqan++u4UWeEyHoaiykXGgWlPHJMW1k2QYG6ULSdNk4BgJ4vmfFzmdnVfLPJm1Cob+1sV6tjDR5 K8U5lD0ukEQRFAqpLorcvcxXVvVb+WcmiLMDM6RZ8ISMW+4najPb0FsPzeXebqeqLRaWU/vvm9x RxmuC/qruw5nhrULx+K8Bt1xAKAmvaYEt3yLrUJ8GYaAyUdYmNM6JTf7Yr13P3Kk16A/4d6Yf9E uU/JYxeUPVxmAXTYFyfuRUXkYrohPldlaGo0oAIDrSASaWV9C3JJWHKNbqg= X-Received: by 2002:a5d:6d0a:0:b0:38d:dd70:d70d with SMTP id ffacd0b85a97d-38f6e947399mr20652664f8f.18.1740590927724; Wed, 26 Feb 2025 09:28:47 -0800 (PST) X-Google-Smtp-Source: AGHT+IFcepAYn8wUjJYQamcfUkkosYCpl5LL5cP49s/bx3L1Rnd4jXrfwe1NQGnaartj9ykIM711lw== X-Received: by 2002:a5d:6d0a:0:b0:38d:dd70:d70d with SMTP id ffacd0b85a97d-38f6e947399mr20652637f8f.18.1740590927329; Wed, 26 Feb 2025 09:28:47 -0800 (PST) Received: from ?IPV6:2a01:cb19:9004:d500:a732:5611:7f59:8bb3? ([2a01:cb19:9004:d500:a732:5611:7f59:8bb3]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43aba52b953sm29159915e9.7.2025.02.26.09.28.45 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 26 Feb 2025 09:28:46 -0800 (PST) Message-ID: <87286139-a297-492c-869f-6673f344bba3@redhat.com> Date: Wed, 26 Feb 2025 18:28:44 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v5 25/36] vfio/migration: Multifd device state transfer support - receive init/cleanup To: "Maciej S. Szmigiero" , Peter Xu , Fabiano Rosas Cc: Alex Williamson , Eric Blake , Markus Armbruster , =?UTF-8?Q?Daniel_P_=2E_Berrang=C3=A9?= , Avihai Horon , Joao Martins , qemu-devel@nongnu.org References: 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: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit 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: -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.44, 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_H5=0.001, RCVD_IN_MSPIKE_WL=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/19/25 21:34, Maciej S. Szmigiero wrote: > From: "Maciej S. Szmigiero" > > Add support for VFIOMultifd data structure that will contain most of the > receive-side data together with its init/cleanup methods. > > Signed-off-by: Maciej S. Szmigiero > --- > hw/vfio/migration-multifd.c | 33 +++++++++++++++++++++++++++++++++ > hw/vfio/migration-multifd.h | 8 ++++++++ > hw/vfio/migration.c | 29 +++++++++++++++++++++++++++-- > include/hw/vfio/vfio-common.h | 3 +++ > 4 files changed, 71 insertions(+), 2 deletions(-) > > diff --git a/hw/vfio/migration-multifd.c b/hw/vfio/migration-multifd.c > index 7328ad8e925c..c2defc0efef0 100644 > --- a/hw/vfio/migration-multifd.c > +++ b/hw/vfio/migration-multifd.c > @@ -41,6 +41,9 @@ typedef struct VFIOStateBuffer { > size_t len; > } VFIOStateBuffer; > > +typedef struct VFIOMultifd { > +} VFIOMultifd; > + > static void vfio_state_buffer_clear(gpointer data) > { > VFIOStateBuffer *lb = data; > @@ -84,8 +87,38 @@ static VFIOStateBuffer *vfio_state_buffers_at(VFIOStateBuffers *bufs, guint idx) > return &g_array_index(bufs->array, VFIOStateBuffer, idx); > } > > +VFIOMultifd *vfio_multifd_new(void) > +{ > + VFIOMultifd *multifd = g_new(VFIOMultifd, 1); > + > + return multifd; > +} > + > +void vfio_multifd_free(VFIOMultifd *multifd) > +{ > + g_free(multifd); > +} > + > bool vfio_multifd_transfer_supported(void) > { > return multifd_device_state_supported() && > migrate_send_switchover_start(); > } > + > +bool vfio_multifd_transfer_enabled(VFIODevice *vbasedev) > +{ > + return false; > +} > + > +bool vfio_multifd_transfer_setup(VFIODevice *vbasedev, Error **errp) > +{ > + if (vfio_multifd_transfer_enabled(vbasedev) && > + !vfio_multifd_transfer_supported()) { > + error_setg(errp, > + "%s: Multifd device transfer requested but unsupported in the current config", > + vbasedev->name); > + return false; > + } > + > + return true; > +} > diff --git a/hw/vfio/migration-multifd.h b/hw/vfio/migration-multifd.h > index 8fe004c1da81..1eefba3b2eed 100644 > --- a/hw/vfio/migration-multifd.h > +++ b/hw/vfio/migration-multifd.h > @@ -12,6 +12,14 @@ > > #include "hw/vfio/vfio-common.h" > > +typedef struct VFIOMultifd VFIOMultifd; > + > +VFIOMultifd *vfio_multifd_new(void); > +void vfio_multifd_free(VFIOMultifd *multifd); > + > bool vfio_multifd_transfer_supported(void); > +bool vfio_multifd_transfer_enabled(VFIODevice *vbasedev); > + > +bool vfio_multifd_transfer_setup(VFIODevice *vbasedev, Error **errp); > > #endif > diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c > index 7b79be6ad293..4311de763885 100644 > --- a/hw/vfio/migration.c > +++ b/hw/vfio/migration.c > @@ -674,15 +674,40 @@ static void vfio_save_state(QEMUFile *f, void *opaque) > static int vfio_load_setup(QEMUFile *f, void *opaque, Error **errp) > { > VFIODevice *vbasedev = opaque; > + VFIOMigration *migration = vbasedev->migration; > + int ret; > + > + if (!vfio_multifd_transfer_setup(vbasedev, errp)) { > + return -EINVAL; > + } > + > + ret = vfio_migration_set_state(vbasedev, VFIO_DEVICE_STATE_RESUMING, > + migration->device_state, errp); > + if (ret) { > + return ret; > + } > > - return vfio_migration_set_state(vbasedev, VFIO_DEVICE_STATE_RESUMING, > - vbasedev->migration->device_state, errp); > + if (vfio_multifd_transfer_enabled(vbasedev)) { > + assert(!migration->multifd); > + migration->multifd = vfio_multifd_new(); > + } > + > + return 0; > +} > + > +static void vfio_multifd_cleanup(VFIODevice *vbasedev) > +{ > + VFIOMigration *migration = vbasedev->migration; > + > + g_clear_pointer(&migration->multifd, vfio_multifd_free); > } Please move vfio_multifd_cleanup() to migration-multifd.c. Thanks, C. > static int vfio_load_cleanup(void *opaque) > { > VFIODevice *vbasedev = opaque; > > + vfio_multifd_cleanup(vbasedev); > + > vfio_migration_cleanup(vbasedev); > trace_vfio_load_cleanup(vbasedev->name); > > diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h > index 64ee3b1a2547..ab110198bd6b 100644 > --- a/include/hw/vfio/vfio-common.h > +++ b/include/hw/vfio/vfio-common.h > @@ -78,6 +78,8 @@ typedef struct VFIORegion { > uint8_t nr; /* cache the region number for debug */ > } VFIORegion; > > +typedef struct VFIOMultifd VFIOMultifd; > + > typedef struct VFIOMigration { > struct VFIODevice *vbasedev; > VMChangeStateEntry *vm_state; > @@ -89,6 +91,7 @@ typedef struct VFIOMigration { > uint64_t mig_flags; > uint64_t precopy_init_size; > uint64_t precopy_dirty_size; > + VFIOMultifd *multifd; > bool initial_data_sent; > > bool event_save_iterate_started; >