From nobody Fri Nov 14 19:48:45 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=yandex-team.ru ARC-Seal: i=1; a=rsa-sha256; t=1761730943; cv=none; d=zohomail.com; s=zohoarc; b=LIK68FcrhJssSIA+Xm1c7BT4jSx4e6U2cDPzwQ7TjCfSRPvIXOOAiGLXR63qLCfG4uHXH99s5j/9BPX7CbXsPhFT3qb+uS8F5gWsebpci5ZSUiJV13so2OCqoYq69Zp60UynC1GTu+wgKJPD8KjTt4Ak+dZDuFUVmRd3CWZ/9oM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761730943; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=OuFWa9+MzavqJkI10h1F+5VsTtN4q5muV91G/8fFCZo=; b=G1ocjV9MbxsF1n64HtibhLrL5fm/MSbRXVKv6dG4dvjy428zzn934a86j3Inm1UILQJlOGhh3oAuMk6kgSPo9GbbWQOyVDJ2aV7bFVyaEpB51hjYQcQMUUdlZgE6LjWj5AicwNTNQ4vtm0jBZjlYMviGOY/AgADSItbdFRVfGU0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761730943247877.5095874585744; Wed, 29 Oct 2025 02:42:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vE2g0-0002R1-Pi; Wed, 29 Oct 2025 05:41:09 -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 1vE2fl-0002O7-G3 for qemu-devel@nongnu.org; Wed, 29 Oct 2025 05:40:55 -0400 Received: from forwardcorp1d.mail.yandex.net ([2a02:6b8:c41:1300:1:45:d181:df01]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vE2ff-0008Qf-Ro for qemu-devel@nongnu.org; Wed, 29 Oct 2025 05:40:52 -0400 Received: from mail-nwsmtp-smtp-corp-main-56.klg.yp-c.yandex.net (mail-nwsmtp-smtp-corp-main-56.klg.yp-c.yandex.net [IPv6:2a02:6b8:c42:65a0:0:640:e1de:0]) by forwardcorp1d.mail.yandex.net (Yandex) with ESMTPS id 54F75808B7; Wed, 29 Oct 2025 12:40:44 +0300 (MSK) Received: from dtalexundeer-nx.yandex.net (unknown [2a02:6bf:8080:d37::1:31]) by mail-nwsmtp-smtp-corp-main-56.klg.yp-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id Rea6510FtiE0-p1B9ZxC3; Wed, 29 Oct 2025 12:40:43 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1761730843; bh=OuFWa9+MzavqJkI10h1F+5VsTtN4q5muV91G/8fFCZo=; h=Message-Id:Date:In-Reply-To:Cc:Subject:References:To:From; b=zp3pqaxDi0/05oCt+5+FfnRtJtAms2+1H5SWEWfJwfcHsf3LMCscJUda9oghzU92M VQ4EeYR+KgeCfVRpZw5iJZq+Yo7NAmscqN4Izu+9FHMTxh8hHaUwARibp7vBsjTHTN xNP7+5Bfo6wMTUD1qyQEOBBmtgf3bQzmM1oximTY= Authentication-Results: mail-nwsmtp-smtp-corp-main-56.klg.yp-c.yandex.net; dkim=pass header.i=@yandex-team.ru From: Alexandr Moshkov To: qemu-devel@nongnu.org Cc: Raphael Norwitz , "Michael S. Tsirkin" , Stefano Garzarella , Kevin Wolf , Hanna Reitz , Peter Xu , Fabiano Rosas , Eric Blake , Markus Armbruster , Alexandr Moshkov Subject: [PATCH v2 1/3] vmstate: introduce VMSTATE_VBUFFER_UINT64 Date: Wed, 29 Oct 2025 14:39:39 +0500 Message-Id: <20251029093939.3251188-2-dtalexundeer@yandex-team.ru> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251029093939.3251188-1-dtalexundeer@yandex-team.ru> References: <20251029093939.3251188-1-dtalexundeer@yandex-team.ru> 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=2a02:6b8:c41:1300:1:45:d181:df01; envelope-from=dtalexundeer@yandex-team.ru; helo=forwardcorp1d.mail.yandex.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @yandex-team.ru) X-ZM-MESSAGEID: 1761730947423158500 Content-Type: text/plain; charset="utf-8" This is an analog of VMSTATE_VBUFFER_UINT32 macro, but for uint64 type. Signed-off-by: Alexandr Moshkov Acked-by: Peter Xu --- include/migration/vmstate.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index 7f1f1c166a..4c9e212d58 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -707,6 +707,16 @@ extern const VMStateInfo vmstate_info_qlist; .offset =3D offsetof(_state, _field), \ } =20 +#define VMSTATE_VBUFFER_UINT64(_field, _state, _version, _test, _field_siz= e) { \ + .name =3D (stringify(_field)), \ + .version_id =3D (_version), \ + .field_exists =3D (_test), \ + .size_offset =3D vmstate_offset_value(_state, _field_size, uint64_t),\ + .info =3D &vmstate_info_buffer, \ + .flags =3D VMS_VBUFFER | VMS_POINTER, \ + .offset =3D offsetof(_state, _field), \ +} + #define VMSTATE_VBUFFER_ALLOC_UINT32(_field, _state, _version, \ _test, _field_size) { \ .name =3D (stringify(_field)), \ --=20 2.34.1 From nobody Fri Nov 14 19:48:45 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=yandex-team.ru ARC-Seal: i=1; a=rsa-sha256; t=1761730924; cv=none; d=zohomail.com; s=zohoarc; b=eej4j98vl5H9l3ydPJ9sSLkem1n5AilxnAElL6MeYCp/DKQ3Fi37MG13JYVoJKz1+4Gf/muucFrPGdUQLFRIPiWrlE1JnLZM/vbl1gtWj7JbgUq5W5ylpxEuu3sQl3Oo3AC/So2VQLMbth5FTfVUSMlZGcI5nHxYVHAGZ7xJXP8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761730924; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=dewZtlGVF78OCULW01xUxoCXbqgHh67srXGr7dEfC/c=; b=e2kn/D9Nzk9u20d55yxVdHLYjR3uX4O05qcjx7AdBS89OIrXqcuNKVeRgfIzOq58yN5AQNSB0qsE1upXdHz7whOoxuZiqRo2SjbTgRKB2RnEI82wpDXUp8QQ6Mn22ko0ZxusM/A4wdWOuV1/qUXkZO28bx/8LDj6ODjbIFUoLNA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761730924650226.3142733126499; Wed, 29 Oct 2025 02:42:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vE2g2-0002Ra-IK; Wed, 29 Oct 2025 05:41:10 -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 1vE2fz-0002Qz-Mo for qemu-devel@nongnu.org; Wed, 29 Oct 2025 05:41:07 -0400 Received: from forwardcorp1d.mail.yandex.net ([178.154.239.200]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vE2fu-0008Rj-R8 for qemu-devel@nongnu.org; Wed, 29 Oct 2025 05:41:06 -0400 Received: from mail-nwsmtp-smtp-corp-main-56.klg.yp-c.yandex.net (mail-nwsmtp-smtp-corp-main-56.klg.yp-c.yandex.net [IPv6:2a02:6b8:c42:65a0:0:640:e1de:0]) by forwardcorp1d.mail.yandex.net (Yandex) with ESMTPS id 1C391808B7; Wed, 29 Oct 2025 12:40:53 +0300 (MSK) Received: from dtalexundeer-nx.yandex.net (unknown [2a02:6bf:8080:d37::1:31]) by mail-nwsmtp-smtp-corp-main-56.klg.yp-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id Rea6510FtiE0-CGSPPmoI; Wed, 29 Oct 2025 12:40:52 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1761730852; bh=dewZtlGVF78OCULW01xUxoCXbqgHh67srXGr7dEfC/c=; h=Message-Id:Date:In-Reply-To:Cc:Subject:References:To:From; b=q8D9DEmMFfLyZO8KiEPZEB1uMhcvkq9f6WHYj7GkHBD0GkBrVnJU4QrVS12SFKfC1 HmOaBGrE61NzvENMQrkQ/kfXJF7U5wWsIk1aQh4iymQr5o1X8bf9SDSx3t68ZVg8SY G+jrpmMyw4cCNsde/PE4uI/4j8OWz3cwMYBJFEHQ= Authentication-Results: mail-nwsmtp-smtp-corp-main-56.klg.yp-c.yandex.net; dkim=pass header.i=@yandex-team.ru From: Alexandr Moshkov To: qemu-devel@nongnu.org Cc: Raphael Norwitz , "Michael S. Tsirkin" , Stefano Garzarella , Kevin Wolf , Hanna Reitz , Peter Xu , Fabiano Rosas , Eric Blake , Markus Armbruster , Alexandr Moshkov Subject: [PATCH v2 2/3] vhost: add vmstate for inflight region with inner buffer Date: Wed, 29 Oct 2025 14:39:41 +0500 Message-Id: <20251029093939.3251188-3-dtalexundeer@yandex-team.ru> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251029093939.3251188-1-dtalexundeer@yandex-team.ru> References: <20251029093939.3251188-1-dtalexundeer@yandex-team.ru> 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=178.154.239.200; envelope-from=dtalexundeer@yandex-team.ru; helo=forwardcorp1d.mail.yandex.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @yandex-team.ru) X-ZM-MESSAGEID: 1761730929682154100 Content-Type: text/plain; charset="utf-8" Prepare for future inflight region migration for vhost-user-blk. We need to migrate size, queue_size, and inner buffer. So firstly it migrate size and queue_size fields, then allocate memory for = buffer with migrated size, then migrate inner buffer itself. Signed-off-by: Alexandr Moshkov --- hw/virtio/vhost.c | 44 +++++++++++++++++++++++++++++++++++++++ include/hw/virtio/vhost.h | 6 ++++++ 2 files changed, 50 insertions(+) diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index c46203eb9c..f0c283f8f4 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -2028,6 +2028,50 @@ const VMStateDescription vmstate_backend_transfer_vh= ost_inflight =3D { } }; =20 +static int vhost_inflight_buffer_pre_load(void *opaque) +{ + info_report("vhost_inflight_region_buffer_pre_load"); + struct vhost_inflight *inflight =3D opaque; + + Error *err =3D NULL; + int fd =3D -1; + void *addr =3D qemu_memfd_alloc("vhost-inflight", inflight->size, + F_SEAL_GROW | F_SEAL_SHRINK | F_SEAL_SEA= L, + &fd, &err); + if (err) { + error_report_err(err); + return -ENOMEM; + } + + inflight->offset =3D 0; + inflight->addr =3D addr; + inflight->fd =3D fd; + + return 0; +} + +const VMStateDescription vmstate_vhost_inflight_region_buffer =3D { + .name =3D "vhost-inflight-region/buffer", + .pre_load =3D vhost_inflight_buffer_pre_load, + .fields =3D (const VMStateField[]) { + VMSTATE_VBUFFER_UINT64(addr, struct vhost_inflight, 0, NULL, size), + VMSTATE_END_OF_LIST() + } +}; + +const VMStateDescription vmstate_vhost_inflight_region =3D { + .name =3D "vhost-inflight-region", + .fields =3D (const VMStateField[]) { + VMSTATE_UINT64(size, struct vhost_inflight), + VMSTATE_UINT16(queue_size, struct vhost_inflight), + VMSTATE_END_OF_LIST() + }, + .subsections =3D (const VMStateDescription * const []) { + &vmstate_vhost_inflight_region_buffer, + NULL + } +}; + const VMStateDescription vmstate_vhost_virtqueue =3D { .name =3D "vhost-virtqueue", .fields =3D (const VMStateField[]) { diff --git a/include/hw/virtio/vhost.h b/include/hw/virtio/vhost.h index 13ca2c319f..dd552de91f 100644 --- a/include/hw/virtio/vhost.h +++ b/include/hw/virtio/vhost.h @@ -596,6 +596,12 @@ extern const VMStateDescription vmstate_backend_transf= er_vhost_inflight; vmstate_backend_transfer_vhost_inflight, \ struct vhost_inflight) =20 +extern const VMStateDescription vmstate_vhost_inflight_region; +#define VMSTATE_VHOST_INFLIGHT_REGION(_field, _state) \ + VMSTATE_STRUCT_POINTER(_field, _state, \ + vmstate_vhost_inflight_region, \ + struct vhost_inflight) + extern const VMStateDescription vmstate_vhost_dev; #define VMSTATE_BACKEND_TRANSFER_VHOST(_field, _state) \ VMSTATE_STRUCT(_field, _state, 0, vmstate_vhost_dev, struct vhost_dev) --=20 2.34.1 From nobody Fri Nov 14 19:48:45 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=yandex-team.ru ARC-Seal: i=1; a=rsa-sha256; t=1761730928; cv=none; d=zohomail.com; s=zohoarc; b=i/FBjSrq5XzCAQC2u0RGo8RX1yU4Ryq9WHBLJzhxV7l9BdwSvL8xMOBoVOKtKdw1r9KxTuYhTrDhe7PJFn/LrBeInpLlyqwx2adKw9/dl9/ypLEtOkHM2EkkiIm2XlbN1soOODoTZybIx+oEb4XKapDDhcD9VpbA+tmQEEYm/sI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761730928; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=L3idjeFzpoBa9CNA1EydnK3SilKFwfpI7XQJIuYetWs=; b=QteEWFAboLtT4XAgsldZ7HxgVUDqTvDlVGMKJ36Yd4O9MAD2ueUdmuYRIROobZVhkedTnJb1eXjYSuJvX9Qh5BQ0TWWvpY5uarPoLrAsN7EwskRScTQHAY+yjF0tjofeGNsXRNI5hzHPdEz9gO5UAy3YuG4EZPn7XMC5hq6mjtU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761730927768645.9773534243698; Wed, 29 Oct 2025 02:42:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vE2gJ-0002Z2-R0; Wed, 29 Oct 2025 05:41:27 -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 1vE2gI-0002Ye-Ai for qemu-devel@nongnu.org; Wed, 29 Oct 2025 05:41:26 -0400 Received: from forwardcorp1d.mail.yandex.net ([178.154.239.200]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vE2g8-0008TE-KG for qemu-devel@nongnu.org; Wed, 29 Oct 2025 05:41:24 -0400 Received: from mail-nwsmtp-smtp-corp-main-56.klg.yp-c.yandex.net (mail-nwsmtp-smtp-corp-main-56.klg.yp-c.yandex.net [IPv6:2a02:6b8:c42:65a0:0:640:e1de:0]) by forwardcorp1d.mail.yandex.net (Yandex) with ESMTPS id 35CE9808B7; Wed, 29 Oct 2025 12:41:10 +0300 (MSK) Received: from dtalexundeer-nx.yandex.net (unknown [2a02:6bf:8080:d37::1:31]) by mail-nwsmtp-smtp-corp-main-56.klg.yp-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id Rea6510FtiE0-W2yEEPnq; Wed, 29 Oct 2025 12:41:09 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1761730869; bh=L3idjeFzpoBa9CNA1EydnK3SilKFwfpI7XQJIuYetWs=; h=Message-Id:Date:In-Reply-To:Cc:Subject:References:To:From; b=kRwZUeWL7r5LG/ghvyAV+cNj9FRoye0cZt10L8e5uBDz8DU9+TAK84p8aH7SrzZQF XQXhsVnrAJHZFZMQqFVNjNt20ZBOP9feeQgsRRTPdUyCh5+1kUQoc/6nMW9dcQGik4 znRmMObsL9uCBeSu95Ft722dp2mAovipmagaJemU= Authentication-Results: mail-nwsmtp-smtp-corp-main-56.klg.yp-c.yandex.net; dkim=pass header.i=@yandex-team.ru From: Alexandr Moshkov To: qemu-devel@nongnu.org Cc: Raphael Norwitz , "Michael S. Tsirkin" , Stefano Garzarella , Kevin Wolf , Hanna Reitz , Peter Xu , Fabiano Rosas , Eric Blake , Markus Armbruster , Alexandr Moshkov Subject: [PATCH v2 3/3] vhost-user-blk: support inter-host inflight migration Date: Wed, 29 Oct 2025 14:39:43 +0500 Message-Id: <20251029093939.3251188-4-dtalexundeer@yandex-team.ru> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251029093939.3251188-1-dtalexundeer@yandex-team.ru> References: <20251029093939.3251188-1-dtalexundeer@yandex-team.ru> 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=178.154.239.200; envelope-from=dtalexundeer@yandex-team.ru; helo=forwardcorp1d.mail.yandex.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @yandex-team.ru) X-ZM-MESSAGEID: 1761730935525158500 Content-Type: text/plain; charset="utf-8" During inter-host migration, waiting for disk requests to be drained in the vhost-user backend can incur significant downtime. This can be avoided if QEMU migrates the inflight region in vhost-user-blk. Thus, during the qemu migration, the vhost-user backend can cancel all inflight requests and then, after migration, they will be executed on another host. In vhost_user_blk_stop() on incoming inter-host migration make force_stop = =3D true, so GET_VRING_BASE will not be executed. Signed-off-by: Alexandr Moshkov --- hw/block/vhost-user-blk.c | 30 ++++++++++++++++++++++++++++++ include/hw/virtio/vhost-user-blk.h | 1 + 2 files changed, 31 insertions(+) diff --git a/hw/block/vhost-user-blk.c b/hw/block/vhost-user-blk.c index a8fd90480a..29d4505d24 100644 --- a/hw/block/vhost-user-blk.c +++ b/hw/block/vhost-user-blk.c @@ -242,6 +242,12 @@ static int vhost_user_blk_stop(VirtIODevice *vdev) force_stop =3D s->skip_get_vring_base_on_force_shutdown && qemu_force_shutdown_requested(); =20 + if (s->enable_inflight_region_migration && + !migrate_local_vhost_user_blk() && + runstate_check(RUN_STATE_FINISH_MIGRATE)) { + force_stop =3D true; + } + s->dev.backend_transfer =3D s->dev.backend_transfer || (runstate_check(RUN_STATE_FINISH_MIGRATE) && migrate_local_vhost_user_blk()); @@ -656,6 +662,24 @@ static struct vhost_dev *vhost_user_blk_get_vhost(Virt= IODevice *vdev) return &s->dev; } =20 +static bool vhost_user_blk_inflight_needed(void *opaque) +{ + struct VHostUserBlk *s =3D opaque; + + return s->enable_inflight_region_migration && + !migrate_local_vhost_user_blk(); +} + +static const VMStateDescription vmstate_vhost_user_blk_inflight =3D { + .name =3D "vhost-user-blk/inflight", + .version_id =3D 1, + .needed =3D vhost_user_blk_inflight_needed, + .fields =3D (const VMStateField[]) { + VMSTATE_VHOST_INFLIGHT_REGION(inflight, VHostUserBlk), + VMSTATE_END_OF_LIST() + }, +}; + static bool vhost_user_blk_pre_incoming(void *opaque, Error **errp) { VHostUserBlk *s =3D VHOST_USER_BLK(opaque); @@ -678,6 +702,10 @@ static const VMStateDescription vmstate_vhost_user_blk= =3D { VMSTATE_VIRTIO_DEVICE, VMSTATE_END_OF_LIST() }, + .subsections =3D (const VMStateDescription * const []) { + &vmstate_vhost_user_blk_inflight, + NULL + } }; =20 static bool vhost_user_needed(void *opaque) @@ -751,6 +779,8 @@ static const Property vhost_user_blk_properties[] =3D { VIRTIO_BLK_F_WRITE_ZEROES, true), DEFINE_PROP_BOOL("skip-get-vring-base-on-force-shutdown", VHostUserBlk, skip_get_vring_base_on_force_shutdown, false), + DEFINE_PROP_BOOL("enable-inflight-migration", VHostUserBlk, + enable_inflight_region_migration, false), }; =20 static void vhost_user_blk_class_init(ObjectClass *klass, const void *data) diff --git a/include/hw/virtio/vhost-user-blk.h b/include/hw/virtio/vhost-u= ser-blk.h index b06f55fd6f..1556714296 100644 --- a/include/hw/virtio/vhost-user-blk.h +++ b/include/hw/virtio/vhost-user-blk.h @@ -52,6 +52,7 @@ struct VHostUserBlk { bool started_vu; =20 bool skip_get_vring_base_on_force_shutdown; + bool enable_inflight_region_migration; =20 bool incoming_backend; }; --=20 2.34.1