From nobody Thu Apr 3 10:16:13 2025 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 1741345133438456.1865720670871; Fri, 7 Mar 2025 02:58:53 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tqVOv-0006Y5-QA; Fri, 07 Mar 2025 05:57:58 -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 1tqVOn-0006QG-Rl for qemu-devel@nongnu.org; Fri, 07 Mar 2025 05:57:50 -0500 Received: from vps-ovh.mhejs.net ([145.239.82.108]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tqVOl-0003DM-0l for qemu-devel@nongnu.org; Fri, 07 Mar 2025 05:57:49 -0500 Received: from MUA by vps-ovh.mhejs.net with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.98) (envelope-from ) id 1tqVOb-00000000RLy-0f2D; Fri, 07 Mar 2025 11:57:37 +0100 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 2/2] vfio/migration: Use BE byte order for device state wire packets Date: Fri, 7 Mar 2025 11:57:25 +0100 Message-ID: X-Mailer: git-send-email 2.48.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=145.239.82.108; envelope-from=mhej@vps-ovh.mhejs.net; helo=vps-ovh.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, HEADER_FROM_DIFFERENT_DOMAINS=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1741345136250019100 Content-Type: text/plain; charset="utf-8" From: "Maciej S. Szmigiero" Wire data commonly use BE byte order (including in the existing migration protocol), use it also for for VFIO device state packets. Fixes: 3228d311ab18 ("vfio/migration: Multifd device state transfer support= - received buffers queuing") Fixes: 6d644baef203 ("vfio/migration: Multifd device state transfer support= - send side") Signed-off-by: Maciej S. Szmigiero Reviewed-by: Avihai Horon --- hw/vfio/migration-multifd.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/hw/vfio/migration-multifd.c b/hw/vfio/migration-multifd.c index a9d41b9f1cb1..e816461e1652 100644 --- a/hw/vfio/migration-multifd.c +++ b/hw/vfio/migration-multifd.c @@ -13,6 +13,7 @@ #include "hw/vfio/vfio-common.h" #include "migration/misc.h" #include "qapi/error.h" +#include "qemu/bswap.h" #include "qemu/error-report.h" #include "qemu/lockable.h" #include "qemu/main-loop.h" @@ -208,12 +209,16 @@ bool vfio_multifd_load_state_buffer(void *opaque, cha= r *data, size_t data_size, return false; } =20 + packet->version =3D be32_to_cpu(packet->version); if (packet->version !=3D VFIO_DEVICE_STATE_PACKET_VER_CURRENT) { error_setg(errp, "%s: packet has unknown version %" PRIu32, vbasedev->name, packet->version); return false; } =20 + packet->idx =3D be32_to_cpu(packet->idx); + packet->flags =3D be32_to_cpu(packet->flags); + if (packet->idx =3D=3D UINT32_MAX) { error_setg(errp, "%s: packet index is invalid", vbasedev->name); return false; @@ -682,9 +687,9 @@ vfio_save_complete_precopy_thread_config_state(VFIODevi= ce *vbasedev, =20 packet_len =3D sizeof(*packet) + bioc->usage; packet =3D g_malloc0(packet_len); - packet->version =3D VFIO_DEVICE_STATE_PACKET_VER_CURRENT; - packet->idx =3D idx; - packet->flags =3D VFIO_DEVICE_STATE_CONFIG_STATE; + packet->version =3D cpu_to_be32(VFIO_DEVICE_STATE_PACKET_VER_CURRENT); + packet->idx =3D cpu_to_be32(idx); + packet->flags =3D cpu_to_be32(VFIO_DEVICE_STATE_CONFIG_STATE); memcpy(&packet->data, bioc->data, bioc->usage); =20 if (!multifd_queue_device_state(idstr, instance_id, @@ -734,7 +739,7 @@ vfio_multifd_save_complete_precopy_thread(SaveLiveCompl= etePrecopyThreadData *d, } =20 packet =3D g_malloc0(sizeof(*packet) + migration->data_buffer_size); - packet->version =3D VFIO_DEVICE_STATE_PACKET_VER_CURRENT; + packet->version =3D cpu_to_be32(VFIO_DEVICE_STATE_PACKET_VER_CURRENT); =20 for (idx =3D 0; ; idx++) { ssize_t data_size; @@ -755,7 +760,7 @@ vfio_multifd_save_complete_precopy_thread(SaveLiveCompl= etePrecopyThreadData *d, break; } =20 - packet->idx =3D idx; + packet->idx =3D cpu_to_be32(idx); packet_size =3D sizeof(*packet) + data_size; =20 if (!multifd_queue_device_state(d->idstr, d->instance_id,