From patchwork Fri Dec 12 01:28:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Liang Z" X-Patchwork-Id: 420328 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id ACBB51400EA for ; Fri, 12 Dec 2014 12:39:17 +1100 (AEDT) Received: from localhost ([::1]:55012 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XzFCN-0008Hn-Pl for incoming@patchwork.ozlabs.org; Thu, 11 Dec 2014 20:39:15 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48166) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XzF9U-0003W2-H8 for qemu-devel@nongnu.org; Thu, 11 Dec 2014 20:36:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XzF9O-0004o9-9G for qemu-devel@nongnu.org; Thu, 11 Dec 2014 20:36:16 -0500 Received: from mga09.intel.com ([134.134.136.24]:11941) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XzF9N-0004lx-3l for qemu-devel@nongnu.org; Thu, 11 Dec 2014 20:36:10 -0500 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 11 Dec 2014 17:34:40 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.07,561,1413270000"; d="scan'208";a="622529683" Received: from lil.sh.intel.com (HELO localhost) ([10.239.36.68]) by orsmga001.jf.intel.com with ESMTP; 11 Dec 2014 17:35:59 -0800 From: Liang Li To: qemu-devel@nongnu.org Date: Fri, 12 Dec 2014 09:28:55 +0800 Message-Id: <1418347746-15829-3-git-send-email-liang.z.li@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1418347746-15829-1-git-send-email-liang.z.li@intel.com> References: <1418347746-15829-1-git-send-email-liang.z.li@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.24 Cc: quintela@redhat.com, Liang Li , armbru@redhat.com, lcapitulino@redhat.com, yang.z.zhang@intel.com, dgilbert@redhat.com Subject: [Qemu-devel] [v3 02/13] migration: Add the framework of multi-thread compression 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 Signed-off-by: Liang Li Signed-off-by: Yang Zhang --- arch_init.c | 78 ++++++++++++++++++++++++++++++++++++++++++- include/migration/migration.h | 9 +++++ migration.c | 38 +++++++++++++++++++++ 3 files changed, 124 insertions(+), 1 deletion(-) diff --git a/arch_init.c b/arch_init.c index 7680d28..a988ec2 100644 --- a/arch_init.c +++ b/arch_init.c @@ -332,6 +332,67 @@ static uint64_t migration_dirty_pages; static uint32_t last_version; static bool ram_bulk_stage; +struct compress_param { + /* To be done */ +}; +typedef struct compress_param compress_param; + +static compress_param *comp_param; +static bool quit_thread; + +static void *do_data_compress(void *opaque) +{ + while (!quit_thread) { + + /* To be done */ + + } + return NULL; +} + +static inline void terminate_compression_threads(void) +{ + quit_thread = true; + /* To be done */ +} + +void migrate_compress_threads_join(MigrationState *s) +{ + int i, thread_count; + + if (!migrate_use_compression()) { + return; + } + terminate_compression_threads(); + thread_count = migrate_compress_threads(); + for (i = 0; i < thread_count; i++) { + qemu_thread_join(s->compress_thread + i); + } + g_free(s->compress_thread); + g_free(comp_param); + s->compress_thread = NULL; + comp_param = NULL; +} + +void migrate_compress_threads_create(MigrationState *s) +{ + int i, thread_count; + + if (!migrate_use_compression()) { + return; + } + quit_thread = false; + thread_count = migrate_compress_threads(); + s->compress_thread = g_malloc0(sizeof(QemuThread) + * thread_count); + comp_param = g_malloc0(sizeof(compress_param) * thread_count); + for (i = 0; i < thread_count; i++) { + qemu_thread_create(s->compress_thread + i, "compress", + do_data_compress, comp_param + i, QEMU_THREAD_JOINABLE); + + } +} + /* Update the xbzrle cache to reflect a page that's been sent as all 0. * The important thing is that a stale (not-yet-0'd) page be replaced * by the new data. @@ -643,6 +704,16 @@ static int ram_save_page(QEMUFile *f, RAMBlock* block, ram_addr_t offset, return bytes_sent; } +static int ram_save_compressed_page(QEMUFile *f, RAMBlock* block, + ram_addr_t offset, bool last_stage) +{ + int bytes_sent = 0; + + /* To be done*/ + + return bytes_sent; +} + /* * ram_find_and_save_block: Finds a page to send and sends it to f * @@ -677,7 +748,12 @@ static int ram_find_and_save_block(QEMUFile *f, bool last_stage) ram_bulk_stage = false; } } else { - bytes_sent = ram_save_page(f, block, offset, last_stage); + if (migrate_use_compression()) { + bytes_sent = ram_save_compressed_page(f, + block, offset, last_stage); + } else { + bytes_sent = ram_save_page(f, block, offset, last_stage); + } /* if page is unmodified, continue to the next */ if (bytes_sent > 0) { diff --git a/include/migration/migration.h b/include/migration/migration.h index 3cb5ba8..daf6c81 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -49,6 +49,9 @@ struct MigrationState QemuThread thread; QEMUBH *cleanup_bh; QEMUFile *file; + QemuThread *compress_thread; + int compress_thread_count; + int compress_level; int state; MigrationParams params; @@ -107,6 +110,8 @@ bool migration_has_finished(MigrationState *); bool migration_has_failed(MigrationState *); MigrationState *migrate_get_current(void); +void migrate_compress_threads_create(MigrationState *s); +void migrate_compress_threads_join(MigrationState *s); uint64_t ram_bytes_remaining(void); uint64_t ram_bytes_transferred(void); uint64_t ram_bytes_total(void); @@ -156,6 +161,10 @@ int64_t migrate_xbzrle_cache_size(void); int64_t xbzrle_cache_resize(int64_t new_size); +bool migrate_use_compression(void); +int migrate_compress_level(void); +int migrate_compress_threads(void); + void ram_control_before_iterate(QEMUFile *f, uint64_t flags); void ram_control_after_iterate(QEMUFile *f, uint64_t flags); void ram_control_load_hook(QEMUFile *f, uint64_t flags); diff --git a/migration.c b/migration.c index c49a05a..402daae 100644 --- a/migration.c +++ b/migration.c @@ -43,6 +43,11 @@ enum { #define BUFFER_DELAY 100 #define XFER_LIMIT_RATIO (1000 / BUFFER_DELAY) +/* Default compression thread count */ +#define DEFAULT_MIGRATE_COMPRESS_THREAD_COUNT 8 +/*0: means nocompress, 1: best speed, ... 9: best compress ratio */ +#define DEFAULT_MIGRATE_COMPRESS_LEVEL 1 + /* Migration XBZRLE default cache size */ #define DEFAULT_MIGRATE_CACHE_SIZE (64 * 1024 * 1024) @@ -60,6 +65,8 @@ MigrationState *migrate_get_current(void) .bandwidth_limit = MAX_THROTTLE, .xbzrle_cache_size = DEFAULT_MIGRATE_CACHE_SIZE, .mbps = -1, + .compress_thread_count = DEFAULT_MIGRATE_COMPRESS_THREAD_COUNT, + .compress_level = DEFAULT_MIGRATE_COMPRESS_LEVEL, }; return ¤t_migration; @@ -302,6 +309,7 @@ static void migrate_fd_cleanup(void *opaque) qemu_thread_join(&s->thread); qemu_mutex_lock_iothread(); + migrate_compress_threads_join(s); qemu_fclose(s->file); s->file = NULL; } @@ -373,6 +381,8 @@ static MigrationState *migrate_init(const MigrationParams *params) int64_t bandwidth_limit = s->bandwidth_limit; bool enabled_capabilities[MIGRATION_CAPABILITY_MAX]; int64_t xbzrle_cache_size = s->xbzrle_cache_size; + int compress_level = s->compress_level; + int compress_thread_count = s->compress_thread_count; memcpy(enabled_capabilities, s->enabled_capabilities, sizeof(enabled_capabilities)); @@ -383,6 +393,8 @@ static MigrationState *migrate_init(const MigrationParams *params) sizeof(enabled_capabilities)); s->xbzrle_cache_size = xbzrle_cache_size; + s->compress_level = compress_level; + s->compress_thread_count = compress_thread_count; s->bandwidth_limit = bandwidth_limit; s->state = MIG_STATE_SETUP; trace_migrate_set_state(MIG_STATE_SETUP); @@ -555,6 +567,31 @@ bool migrate_zero_blocks(void) return s->enabled_capabilities[MIGRATION_CAPABILITY_ZERO_BLOCKS]; } +bool migrate_use_compression(void) +{ + /* Disable compression before the series of patches are applied */ + return false; +} + +int migrate_compress_level(void) +{ + MigrationState *s; + + s = migrate_get_current(); + + return s->compress_level; +} + +int migrate_compress_threads(void) +{ + MigrationState *s; + + s = migrate_get_current(); + + return s->compress_thread_count; +} + + int migrate_use_xbzrle(void) { MigrationState *s; @@ -695,6 +732,7 @@ void migrate_fd_connect(MigrationState *s) /* Notify before starting migration thread */ notifier_list_notify(&migration_state_notifiers, s); + migrate_compress_threads_create(s); qemu_thread_create(&s->thread, "migration", migration_thread, s, QEMU_THREAD_JOINABLE); }