From nobody Tue Feb 10 00:58:25 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=hotmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520990567844104.31119727295868; Tue, 13 Mar 2018 18:22:47 -0700 (PDT) Received: from localhost ([::1]:43901 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evv7v-0001oL-09 for importer@patchew.org; Tue, 13 Mar 2018 21:22:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36405) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evv5r-0000Tz-03 for qemu-devel@nongnu.org; Tue, 13 Mar 2018 21:20:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evv5n-0006Sa-9n for qemu-devel@nongnu.org; Tue, 13 Mar 2018 21:20:38 -0400 Received: from mga18.intel.com ([134.134.136.126]:28906) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1evv5n-0006Hx-1G for qemu-devel@nongnu.org; Tue, 13 Mar 2018 21:20:35 -0400 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Mar 2018 18:20:34 -0700 Received: from natrouter.sh.intel.com (HELO robinhe-hp.domain) ([10.239.13.3]) by orsmga001.jf.intel.com with ESMTP; 13 Mar 2018 18:20:32 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,466,1515484800"; d="scan'208";a="38632854" From: junyan.he@hotmail.com To: qemu-devel@nongnu.org Date: Wed, 14 Mar 2018 09:20:14 +0800 Message-Id: <1520990418-28258-7-git-send-email-junyan.he@hotmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1520990418-28258-1-git-send-email-junyan.he@hotmail.com> References: <1520990418-28258-1-git-send-email-junyan.he@hotmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.126 Subject: [Qemu-devel] [PATCH 06/10] RFC: Add save dependency functions to qemu_file X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, famz@redhat.com, crosthwaite.peter@gmail.com, quintela@redhat.com, dgilbert@redhat.com, mreitz@redhat.com, Junyan He , pbonzini@redhat.com, rth@twiddle.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Junyan He When we save snapshot, we need qemu_file to support save dependency operations. It should call brv_driver's save dependency functions to implement these operations. Signed-off-by: Junyan He --- migration/qemu-file.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++= ++++ migration/qemu-file.h | 14 ++++++++++++ migration/savevm.c | 33 +++++++++++++++++++++++++--- 3 files changed, 105 insertions(+), 3 deletions(-) diff --git a/migration/qemu-file.c b/migration/qemu-file.c index 2ab2bf3..9d2a39a 100644 --- a/migration/qemu-file.c +++ b/migration/qemu-file.c @@ -46,10 +46,13 @@ struct QEMUFile { int buf_index; int buf_size; /* 0 when writing */ uint8_t buf[IO_BUF_SIZE]; + char ref_name_str[128]; /* maybe snapshot id */ =20 DECLARE_BITMAP(may_free, MAX_IOV_SIZE); struct iovec iov[MAX_IOV_SIZE]; unsigned int iovcnt; + bool support_dependency; + int32_t dependency_aligment; =20 int last_error; }; @@ -745,3 +748,61 @@ void qemu_file_set_blocking(QEMUFile *f, bool block) f->ops->set_blocking(f->opaque, block); } } + +void qemu_file_set_support_dependency(QEMUFile *f, int32_t alignment) +{ + f->dependency_aligment =3D alignment; + f->support_dependency =3D true; +} + +bool qemu_file_is_support_dependency(QEMUFile *f, int32_t *alignment) +{ + if (f->support_dependency && alignment) { + *alignment =3D f->dependency_aligment; + } + + return f->support_dependency; +} + +/* This function set the reference name for snapshot usage. Sometimes it n= eeds + * to depend on other snapshot's data to avoid redundance. + */ +bool qemu_file_set_ref_name(QEMUFile *f, const char *name) +{ + if (strlen(name) + 1 > sizeof(f->ref_name_str)) { + return false; + } + + memcpy(f->ref_name_str, name, strlen(name) + 1); + return true; +} + +ssize_t qemu_file_save_dependency(QEMUFile *f, int64_t depend_offset, + int64_t size) +{ + ssize_t ret; + + if (f->support_dependency =3D=3D false) { + return -1; + } + + assert(f->ops->save_dependency); + + if (!QEMU_IS_ALIGNED(depend_offset, f->dependency_aligment)) { + return -1; + } + + qemu_fflush(f); + + if (!QEMU_IS_ALIGNED(f->pos, f->dependency_aligment)) { + return -1; + } + + ret =3D f->ops->save_dependency(f->opaque, f->ref_name_str, + depend_offset, size, f->pos); + if (ret > 0) { + f->pos +=3D size; + } + + return ret; +} diff --git a/migration/qemu-file.h b/migration/qemu-file.h index aae4e5e..137b917 100644 --- a/migration/qemu-file.h +++ b/migration/qemu-file.h @@ -57,6 +57,14 @@ typedef ssize_t (QEMUFileWritevBufferFunc)(void *opaque,= struct iovec *iov, int iovcnt, int64_t pos); =20 /* + * This function add reference to the dependency data in snapshot specifie= d by + * ref_name_str to this file's offset + */ +typedef ssize_t (QEMUFileSaveDependencyFunc)(void *opaque, const char *nam= e, + int64_t depend_offset, + int64_t offset, int64_t size); + +/* * This function provides hooks around different * stages of RAM migration. * 'opaque' is the backend specific data in QEMUFile @@ -104,6 +112,7 @@ typedef struct QEMUFileOps { QEMUFileWritevBufferFunc *writev_buffer; QEMURetPathFunc *get_return_path; QEMUFileShutdownFunc *shut_down; + QEMUFileSaveDependencyFunc *save_dependency; } QEMUFileOps; =20 typedef struct QEMUFileHooks { @@ -153,6 +162,11 @@ int qemu_file_shutdown(QEMUFile *f); QEMUFile *qemu_file_get_return_path(QEMUFile *f); void qemu_fflush(QEMUFile *f); void qemu_file_set_blocking(QEMUFile *f, bool block); +bool qemu_file_set_ref_name(QEMUFile *f, const char *name); +void qemu_file_set_support_dependency(QEMUFile *f, int32_t alignment); +bool qemu_file_is_support_dependency(QEMUFile *f, int32_t *alignment); +ssize_t qemu_file_save_dependency(QEMUFile *f, int64_t depend_offset, + int64_t size); =20 size_t qemu_get_counted_string(QEMUFile *f, char buf[256]); =20 diff --git a/migration/savevm.c b/migration/savevm.c index 358c5b5..1bbd6aa 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -196,6 +196,20 @@ static ssize_t block_writev_buffer(void *opaque, struc= t iovec *iov, int iovcnt, return qiov.size; } =20 +static ssize_t block_save_dependency(void *opaque, const char *id_name, + int64_t depend_offset, + int64_t offset, int64_t size) +{ + int ret =3D bdrv_snapshot_save_dependency(opaque, id_name, + depend_offset, offset, + size, NULL); + if (ret < 0) { + return ret; + } + + return size; +} + static ssize_t block_get_buffer(void *opaque, uint8_t *buf, int64_t pos, size_t size) { @@ -213,15 +227,28 @@ static const QEMUFileOps bdrv_read_ops =3D { }; =20 static const QEMUFileOps bdrv_write_ops =3D { - .writev_buffer =3D block_writev_buffer, - .close =3D bdrv_fclose + .writev_buffer =3D block_writev_buffer, + .close =3D bdrv_fclose, + .save_dependency =3D block_save_dependency }; =20 static QEMUFile *qemu_fopen_bdrv(BlockDriverState *bs, int is_writable) { + int ret =3D 0; + int32_t alignment =3D 0; + QEMUFile *f =3D NULL; + if (is_writable) { - return qemu_fopen_ops(bs, &bdrv_write_ops); + f =3D qemu_fopen_ops(bs, &bdrv_write_ops); + + ret =3D bdrv_snapshot_support_dependency(bs, &alignment); + if (ret > 0) { + qemu_file_set_support_dependency(f, alignment); + } + + return f; } + return qemu_fopen_ops(bs, &bdrv_read_ops); } =20 --=20 2.7.4