From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37537) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Um4tG-0001mo-Vg for qemu-devel@nongnu.org; Mon, 10 Jun 2013 12:24:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Um4tD-0006jK-IK for qemu-devel@nongnu.org; Mon, 10 Jun 2013 12:24:18 -0400 Received: from e7.ny.us.ibm.com ([32.97.182.137]:35695) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Um4tD-0006jG-Dm for qemu-devel@nongnu.org; Mon, 10 Jun 2013 12:24:15 -0400 Received: from /spool/local by e7.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 10 Jun 2013 12:24:14 -0400 Received: from d01relay04.pok.ibm.com (d01relay04.pok.ibm.com [9.56.227.236]) by d01dlp03.pok.ibm.com (Postfix) with ESMTP id CD197C90026 for ; Mon, 10 Jun 2013 12:24:11 -0400 (EDT) Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d01relay04.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r5AGG5bi174336 for ; Mon, 10 Jun 2013 12:24:12 -0400 Received: from d03av02.boulder.ibm.com (loopback [127.0.0.1]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r5AG3qx8004910 for ; Mon, 10 Jun 2013 10:03:53 -0600 From: mrhines@linux.vnet.ibm.com Date: Mon, 10 Jun 2013 12:03:36 -0400 Message-Id: <1370880226-2208-3-git-send-email-mrhines@linux.vnet.ibm.com> In-Reply-To: <1370880226-2208-1-git-send-email-mrhines@linux.vnet.ibm.com> References: <1370880226-2208-1-git-send-email-mrhines@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v7 02/12] rdma: introduce qemu_update_position() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, quintela@redhat.com, knoel@redhat.com, owasserm@redhat.com, abali@us.ibm.com, mrhines@us.ibm.com, gokul@us.ibm.com, pbonzini@redhat.com, chegu_vinod@hp.com From: "Michael R. Hines" RDMA writes happen asynchronously, and thus the performance accounting also needs to be able to occur asynchronously. This allows anybody to call into savevm.c to update both f->pos as well as into arch_init.c to update the acct_info structure with up-to-date values when the RDMA transfer actually completes. Signed-off-by: Michael R. Hines --- arch_init.c | 12 ++++++++++++ include/migration/migration.h | 2 ++ include/migration/qemu-file.h | 1 + savevm.c | 5 +++++ 4 files changed, 20 insertions(+) diff --git a/arch_init.c b/arch_init.c index 5d32ecf..819ca5a 100644 --- a/arch_init.c +++ b/arch_init.c @@ -498,6 +498,18 @@ static int ram_save_block(QEMUFile *f, bool last_stage) static uint64_t bytes_transferred; +void acct_update_position(QEMUFile *f, size_t size, bool zero) +{ + uint64_t pages = size / TARGET_PAGE_SIZE; + if (zero) { + acct_info.dup_pages += pages; + } else { + acct_info.norm_pages += pages; + bytes_transferred += size; + qemu_update_position(f, size); + } +} + static ram_addr_t ram_save_remaining(void) { return migration_dirty_pages; diff --git a/include/migration/migration.h b/include/migration/migration.h index e2acec6..0be28a2 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -92,6 +92,8 @@ uint64_t ram_bytes_remaining(void); uint64_t ram_bytes_transferred(void); uint64_t ram_bytes_total(void); +void acct_update_position(QEMUFile *f, size_t size, bool zero); + extern SaveVMHandlers savevm_ram_handlers; uint64_t dup_mig_bytes_transferred(void); diff --git a/include/migration/qemu-file.h b/include/migration/qemu-file.h index 7519464..8fab0dd 100644 --- a/include/migration/qemu-file.h +++ b/include/migration/qemu-file.h @@ -93,6 +93,7 @@ void qemu_put_be32(QEMUFile *f, unsigned int v); void qemu_put_be64(QEMUFile *f, uint64_t v); int qemu_get_buffer(QEMUFile *f, uint8_t *buf, int size); int qemu_get_byte(QEMUFile *f); +void qemu_update_position(QEMUFile *f, size_t size); static inline unsigned int qemu_get_ubyte(QEMUFile *f) { diff --git a/savevm.c b/savevm.c index 2ce439f..2983905 100644 --- a/savevm.c +++ b/savevm.c @@ -670,6 +670,11 @@ int qemu_get_fd(QEMUFile *f) return -1; } +void qemu_update_position(QEMUFile *f, size_t size) +{ + f->pos += size; +} + /** Closes the file * * Returns negative error value if any error happened on previous operations or -- 1.7.10.4