From patchwork Thu Feb 28 08:09:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 223810 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6A8102C0085 for ; Thu, 28 Feb 2013 19:14:08 +1100 (EST) Received: from localhost ([::1]:52056 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UAycw-0001fl-HK for incoming@patchwork.ozlabs.org; Thu, 28 Feb 2013 03:14:06 -0500 Received: from eggs.gnu.org ([208.118.235.92]:50773) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UAybM-0007eN-RW for qemu-devel@nongnu.org; Thu, 28 Feb 2013 03:12:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UAybL-0004Mq-3M for qemu-devel@nongnu.org; Thu, 28 Feb 2013 03:12:28 -0500 Received: from e28smtp01.in.ibm.com ([122.248.162.1]:47147) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UAybK-0004M1-79 for qemu-devel@nongnu.org; Thu, 28 Feb 2013 03:12:27 -0500 Received: from /spool/local by e28smtp01.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 28 Feb 2013 13:39:21 +0530 Received: from d28dlp03.in.ibm.com (9.184.220.128) by e28smtp01.in.ibm.com (192.168.1.131) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 28 Feb 2013 13:39:19 +0530 Received: from d28relay01.in.ibm.com (d28relay01.in.ibm.com [9.184.220.58]) by d28dlp03.in.ibm.com (Postfix) with ESMTP id 647F21258055 for ; Thu, 28 Feb 2013 13:43:14 +0530 (IST) Received: from d28av01.in.ibm.com (d28av01.in.ibm.com [9.184.220.63]) by d28relay01.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r1S8CHT13866680 for ; Thu, 28 Feb 2013 13:42:17 +0530 Received: from d28av01.in.ibm.com (loopback [127.0.0.1]) by d28av01.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r1S8CKjx013558 for ; Thu, 28 Feb 2013 08:12:21 GMT Received: from RH63Wenchao (wenchaox.cn.ibm.com [9.115.122.12] (may be forged)) by d28av01.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r1S89njB004622; Thu, 28 Feb 2013 08:12:19 GMT From: Wenchao Xia To: qemu-devel@nongnu.org Date: Thu, 28 Feb 2013 16:09:43 +0800 Message-Id: <1362038985-19008-3-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1362038985-19008-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1362038985-19008-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13022808-4790-0000-0000-0000071E5A96 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 122.248.162.1 Cc: kwolf@redhat.com, aliguori@us.ibm.com, quintela@redhat.com, stefanha@gmail.com, pbonzini@redhat.com, Wenchao Xia Subject: [Qemu-devel] [PATCH 2/4] savevm: save vmstate with seekable file X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This patch added logic in qemu_savevm level which can predict the space used in iteration, when qemu file is seekable Signed-off-by: Wenchao Xia --- include/migration/vmstate.h | 10 +++++ savevm.c | 87 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 95 insertions(+), 2 deletions(-) diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index f27276c..a1bb8b3 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -39,6 +39,16 @@ typedef struct SaveVMHandlers { void (*cancel)(void *opaque); LoadStateHandler *load_state; bool (*is_active)(void *opaque); + /* seekable file */ + int (*save_live_iterate_seekable)(QEMUFile *f, int64_t base, + int64_t max, void *opaque); + int64_t (*save_live_iterate_seekable_get_size)(void *opaque); + /* after return, complete_seekable must make sure qemu_ftell(f) will + report the correct value */ + int (*save_live_complete_seekable)(QEMUFile *f, int64_t iterate_base, + int64_t iterate_max, + int64_t complete_base, + void *opaque); } SaveVMHandlers; int register_savevm(DeviceState *dev, diff --git a/savevm.c b/savevm.c index 54dc090..57dbf09 100644 --- a/savevm.c +++ b/savevm.c @@ -125,6 +125,11 @@ struct QEMUFile { int buf_size; /* 0 when writing */ uint8_t buf[IO_BUF_SIZE]; + /* seekable file support */ + bool file_seekable; /* write to seekable file instead of stream */ + int64_t iterate_base; + int64_t iterate_size; + int last_error; }; @@ -1220,6 +1225,12 @@ typedef struct SaveStateEntry { CompatEntry *compat; int no_migrate; int is_ram; + /* seekable file live save */ + /* for iterate */ + int64_t iterate_base; /* base start, include head QEMU_VM_SECTION_PART */ + int64_t iterate_base1; /* without head, used by device's function */ + int64_t iterate_size; /* total iterate size, include 5 byte head */ + int64_t iterate_size1; /* without head, used by device's function */ } SaveStateEntry; @@ -1597,6 +1608,42 @@ bool qemu_savevm_state_blocked(Error **errp) return false; } +#define VMSTATE_ITERATE_PART_HEAD_SIZE (5) +/* This function is closely related with qemu_savevm_state_iterate(), it should + be called before iterate, to arrange the device's space to write. + it returns the total size, negative on error. */ +static int64_t qemu_savevm_state_iterate_calculate_space(int64_t begin) +{ + int64_t base_offset; + SaveStateEntry *se; + + base_offset = begin; + + QTAILQ_FOREACH(se, &savevm_handlers, entry) { + if (!se->ops || !se->ops->save_live_iterate) { + continue; + } + if (se->ops && se->ops->is_active) { + if (!se->ops->is_active(se->opaque)) { + continue; + } + } + if ((!se->ops->save_live_iterate_seekable) || + (!se->ops->save_live_iterate_seekable_get_size) || + (!se->ops->save_live_complete_seekable)) { + return -1; + } + se->iterate_base = base_offset; + se->iterate_base1 = base_offset + VMSTATE_ITERATE_PART_HEAD_SIZE; + se->iterate_size1 = + se->ops->save_live_iterate_seekable_get_size(se->opaque); + se->iterate_size = se->iterate_size1 + VMSTATE_ITERATE_PART_HEAD_SIZE; + base_offset += se->iterate_size; + } + + return base_offset - begin; +} + int qemu_savevm_state_begin(QEMUFile *f, const MigrationParams *params) { @@ -1642,6 +1689,18 @@ int qemu_savevm_state_begin(QEMUFile *f, return ret; } } + + if (f->file_seekable) { + int64_t size, begin = qemu_ftell(f); + size = qemu_savevm_state_iterate_calculate_space(begin); + if (size < 0) { + qemu_savevm_state_cancel(); + return size; + } + f->iterate_size = size; + f->iterate_base = begin; + } + ret = qemu_file_get_error(f); if (ret != 0) { qemu_savevm_state_cancel(); @@ -1675,11 +1734,22 @@ int qemu_savevm_state_iterate(QEMUFile *f) return 0; } trace_savevm_section_start(); + if (f->file_seekable) { + ret = qemu_fseek(f, se->iterate_base); + if (ret < 0) { + break; + } + } /* Section type */ qemu_put_byte(f, QEMU_VM_SECTION_PART); qemu_put_be32(f, se->section_id); - ret = se->ops->save_live_iterate(f, se->opaque); + if (f->file_seekable) { + ret = se->ops->save_live_iterate_seekable(f, + se->iterate_base1, se->iterate_size1, se->opaque); + } else { + ret = se->ops->save_live_iterate(f, se->opaque); + } trace_savevm_section_end(se->section_id); if (ret <= 0) { @@ -1707,6 +1777,13 @@ int qemu_savevm_state_complete(QEMUFile *f) cpu_synchronize_all_states(); + if (f->file_seekable) { + ret = qemu_fseek(f, f->iterate_base + f->iterate_size); + if (ret < 0) { + return ret; + } + } + QTAILQ_FOREACH(se, &savevm_handlers, entry) { if (!se->ops || !se->ops->save_live_complete) { continue; @@ -1721,7 +1798,13 @@ int qemu_savevm_state_complete(QEMUFile *f) qemu_put_byte(f, QEMU_VM_SECTION_END); qemu_put_be32(f, se->section_id); - ret = se->ops->save_live_complete(f, se->opaque); + if (f->file_seekable) { + int64_t complete_base = qemu_ftell(f); + ret = se->ops->save_live_complete_seekable(f, se->iterate_base1, + se->iterate_size1, complete_base, se->opaque); + } else { + ret = se->ops->save_live_complete(f, se->opaque); + } trace_savevm_section_end(se->section_id); if (ret < 0) { return ret;