From nobody Thu May 2 11:44:59 2024 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 Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508394917895848.0629196405611; Wed, 18 Oct 2017 23:35:17 -0700 (PDT) Received: from localhost ([::1]:47739 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e54QC-0002kE-7W for importer@patchew.org; Thu, 19 Oct 2017 02:35:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51712) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e54NJ-0000kx-Uk for qemu-devel@nongnu.org; Thu, 19 Oct 2017 02:32:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e54NI-0003CT-5J for qemu-devel@nongnu.org; Thu, 19 Oct 2017 02:32:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46692) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e54NH-0003C9-UV for qemu-devel@nongnu.org; Thu, 19 Oct 2017 02:32:12 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D9F0E13A49 for ; Thu, 19 Oct 2017 06:32:10 +0000 (UTC) Received: from pxdev.xzpeter.org.com (dhcp-15-225.nay.redhat.com [10.66.15.225]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0FD3C5E7A0; Thu, 19 Oct 2017 06:32:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com D9F0E13A49 Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=peterx@redhat.com From: Peter Xu To: qemu-devel@nongnu.org Date: Thu, 19 Oct 2017 14:31:57 +0800 Message-Id: <20171019063200.19048-2-peterx@redhat.com> In-Reply-To: <20171019063200.19048-1-peterx@redhat.com> References: <20171019063200.19048-1-peterx@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 19 Oct 2017 06:32:11 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/4] migration: provide ram_state_init() 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: Laurent Vivier , "Dr . David Alan Gilbert" , peterx@redhat.com, Juan Quintela 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" The old ram_state_init() is not really initializing the RAMState only, but including lots of other stuff that is RAM-related. Renaming it to ram_init_all(). Instead, provide a real ram_state_init(). Signed-off-by: Peter Xu Reviewed-by: Juan Quintela --- migration/ram.c | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index b83f8977c5..fd8e14c59b 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -2009,12 +2009,34 @@ err: =20 static int ram_state_init(RAMState **rsp) { - *rsp =3D g_new0(RAMState, 1); + *rsp =3D g_try_new0(RAMState, 1); + + if (!*rsp) { + error_report("%s: Init ramstate fail", __func__); + return -1; + } =20 qemu_mutex_init(&(*rsp)->bitmap_mutex); qemu_mutex_init(&(*rsp)->src_page_req_mutex); QSIMPLEQ_INIT(&(*rsp)->src_page_requests); =20 + /* + * Count the total number of pages used by ram blocks not including any + * gaps due to alignment or unplugs. + */ + (*rsp)->migration_dirty_pages =3D ram_bytes_total() >> TARGET_PAGE_BIT= S; + + ram_state_reset(*rsp); + + return 0; +} + +static int ram_init_all(RAMState **rsp) +{ + if (ram_state_init(rsp)) { + return -1; + } + if (migrate_use_xbzrle()) { XBZRLE_cache_lock(); XBZRLE.zero_target_page =3D g_malloc0(TARGET_PAGE_SIZE); @@ -2055,7 +2077,6 @@ static int ram_state_init(RAMState **rsp) =20 qemu_mutex_lock_ramlist(); rcu_read_lock(); - ram_state_reset(*rsp); =20 /* Skip setting bitmap if there is no RAM */ if (ram_bytes_total()) { @@ -2073,12 +2094,6 @@ static int ram_state_init(RAMState **rsp) } } =20 - /* - * Count the total number of pages used by ram blocks not including any - * gaps due to alignment or unplugs. - */ - (*rsp)->migration_dirty_pages =3D ram_bytes_total() >> TARGET_PAGE_BIT= S; - memory_global_dirty_log_start(); migration_bitmap_sync(*rsp); qemu_mutex_unlock_ramlist(); @@ -2110,7 +2125,7 @@ static int ram_save_setup(QEMUFile *f, void *opaque) =20 /* migration has already setup the bitmap, reuse it. */ if (!migration_in_colo_state()) { - if (ram_state_init(rsp) !=3D 0) { + if (ram_init_all(rsp) !=3D 0) { return -1; } } --=20 2.13.5 From nobody Thu May 2 11:44:59 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508394863476919.9265932502339; Wed, 18 Oct 2017 23:34:23 -0700 (PDT) Received: from localhost ([::1]:47736 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e54PH-0001uX-Pq for importer@patchew.org; Thu, 19 Oct 2017 02:34:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51733) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e54NL-0000lS-20 for qemu-devel@nongnu.org; Thu, 19 Oct 2017 02:32:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e54NK-0003DK-7m for qemu-devel@nongnu.org; Thu, 19 Oct 2017 02:32:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48558) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e54NK-0003Ct-1a for qemu-devel@nongnu.org; Thu, 19 Oct 2017 02:32:14 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 194424E919 for ; Thu, 19 Oct 2017 06:32:13 +0000 (UTC) Received: from pxdev.xzpeter.org.com (dhcp-15-225.nay.redhat.com [10.66.15.225]) by smtp.corp.redhat.com (Postfix) with ESMTP id 598495E7A0; Thu, 19 Oct 2017 06:32:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 194424E919 Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=peterx@redhat.com From: Peter Xu To: qemu-devel@nongnu.org Date: Thu, 19 Oct 2017 14:31:58 +0800 Message-Id: <20171019063200.19048-3-peterx@redhat.com> In-Reply-To: <20171019063200.19048-1-peterx@redhat.com> References: <20171019063200.19048-1-peterx@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Thu, 19 Oct 2017 06:32:13 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/4] migration: provide ram_state_cleanup 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: Laurent Vivier , "Dr . David Alan Gilbert" , peterx@redhat.com, Juan Quintela Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_6 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" There are two Mutexes that are created but not yet destroyed for RAMState. Fix that. Since we are at it, provide helper function to clean up RAMState. Signed-off-by: Peter Xu Reviewed-by: Juan Quintela --- migration/ram.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index fd8e14c59b..72c48e76e9 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1566,6 +1566,15 @@ static void xbzrle_load_cleanup(void) XBZRLE.decoded_buf =3D NULL; } =20 +static void ram_state_cleanup(RAMState **rsp) +{ + migration_page_queue_free(*rsp); + qemu_mutex_destroy(&(*rsp)->bitmap_mutex); + qemu_mutex_destroy(&(*rsp)->src_page_req_mutex); + g_free(*rsp); + *rsp =3D NULL; +} + static void ram_save_cleanup(void *opaque) { RAMState **rsp =3D opaque; @@ -1595,10 +1604,8 @@ static void ram_save_cleanup(void *opaque) XBZRLE.zero_target_page =3D NULL; } XBZRLE_cache_unlock(); - migration_page_queue_free(*rsp); compress_threads_save_cleanup(); - g_free(*rsp); - *rsp =3D NULL; + ram_state_cleanup(rsp); } =20 static void ram_state_reset(RAMState *rs) --=20 2.13.5 From nobody Thu May 2 11:44:59 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508394976018953.7900520598948; Wed, 18 Oct 2017 23:36:16 -0700 (PDT) Received: from localhost ([::1]:47748 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e54R8-0003f0-Ba for importer@patchew.org; Thu, 19 Oct 2017 02:36:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51757) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e54NN-0000mk-Gn for qemu-devel@nongnu.org; Thu, 19 Oct 2017 02:32:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e54NM-0003FB-Ec for qemu-devel@nongnu.org; Thu, 19 Oct 2017 02:32:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38392) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e54NM-0003EJ-6W for qemu-devel@nongnu.org; Thu, 19 Oct 2017 02:32:16 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 48FAF820E6 for ; Thu, 19 Oct 2017 06:32:15 +0000 (UTC) Received: from pxdev.xzpeter.org.com (dhcp-15-225.nay.redhat.com [10.66.15.225]) by smtp.corp.redhat.com (Postfix) with ESMTP id 89BD35E7AD; Thu, 19 Oct 2017 06:32:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 48FAF820E6 Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=peterx@redhat.com From: Peter Xu To: qemu-devel@nongnu.org Date: Thu, 19 Oct 2017 14:31:59 +0800 Message-Id: <20171019063200.19048-4-peterx@redhat.com> In-Reply-To: <20171019063200.19048-1-peterx@redhat.com> References: <20171019063200.19048-1-peterx@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Thu, 19 Oct 2017 06:32:15 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 3/4] migration: clean up xbzrle cache init/destroy 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: Laurent Vivier , "Dr . David Alan Gilbert" , peterx@redhat.com, Juan Quintela Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_6 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Let's further simplify ram_init_all() and ram_save_cleanup() by abstract all the XBZRLE related codes into their own functions. When allocating xbzrle cache, we are always very careful on -ENOMEM; which makes sense. Replacing the last g_malloc0() with g_try_malloc0(), then refactor the logic a bit. This patch should be fixing some memory leaks when some memory allocation failed for XBZRLE in the past. Signed-off-by: Peter Xu Reviewed-by: Juan Quintela --- migration/ram.c | 121 +++++++++++++++++++++++++++++++++++-----------------= ---- 1 file changed, 76 insertions(+), 45 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index 72c48e76e9..3df7715d63 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1575,6 +1575,22 @@ static void ram_state_cleanup(RAMState **rsp) *rsp =3D NULL; } =20 +static void xbzrle_cleanup(void) +{ + XBZRLE_cache_lock(); + if (XBZRLE.cache) { + cache_fini(XBZRLE.cache); + g_free(XBZRLE.encoded_buf); + g_free(XBZRLE.current_buf); + g_free(XBZRLE.zero_target_page); + XBZRLE.cache =3D NULL; + XBZRLE.encoded_buf =3D NULL; + XBZRLE.current_buf =3D NULL; + XBZRLE.zero_target_page =3D NULL; + } + XBZRLE_cache_unlock(); +} + static void ram_save_cleanup(void *opaque) { RAMState **rsp =3D opaque; @@ -1592,18 +1608,7 @@ static void ram_save_cleanup(void *opaque) block->unsentmap =3D NULL; } =20 - XBZRLE_cache_lock(); - if (XBZRLE.cache) { - cache_fini(XBZRLE.cache); - g_free(XBZRLE.encoded_buf); - g_free(XBZRLE.current_buf); - g_free(XBZRLE.zero_target_page); - XBZRLE.cache =3D NULL; - XBZRLE.encoded_buf =3D NULL; - XBZRLE.current_buf =3D NULL; - XBZRLE.zero_target_page =3D NULL; - } - XBZRLE_cache_unlock(); + xbzrle_cleanup(); compress_threads_save_cleanup(); ram_state_cleanup(rsp); } @@ -2014,6 +2019,62 @@ err: return ret; } =20 +/* + * For every allocation, we will try not to crash the VM if the + * allocation failed. + */ +static int xbzrle_init(void) +{ + if (!migrate_use_xbzrle()) { + return 0; + } + + XBZRLE_cache_lock(); + + XBZRLE.zero_target_page =3D g_try_malloc0(TARGET_PAGE_SIZE); + if (!XBZRLE.zero_target_page) { + error_report("%s: Error allocating zero page", __func__); + goto err_out; + } + + XBZRLE.cache =3D cache_init(migrate_xbzrle_cache_size() / + TARGET_PAGE_SIZE, + TARGET_PAGE_SIZE); + if (!XBZRLE.cache) { + error_report("%s: Error creating cache", __func__); + goto free_zero_page; + } + + XBZRLE.encoded_buf =3D g_try_malloc0(TARGET_PAGE_SIZE); + if (!XBZRLE.encoded_buf) { + error_report("%s: Error allocating encoded_buf", __func__); + goto free_cache; + } + + XBZRLE.current_buf =3D g_try_malloc(TARGET_PAGE_SIZE); + if (!XBZRLE.current_buf) { + error_report("%s: Error allocating current_buf", __func__); + goto free_encoded_buf; + } + + /* We are all good */ + XBZRLE_cache_unlock(); + return 0; + +free_encoded_buf: + g_free(XBZRLE.encoded_buf); + XBZRLE.encoded_buf =3D NULL; +free_cache: + cache_fini(XBZRLE.cache); + XBZRLE.cache =3D NULL; +free_zero_page: + g_free(XBZRLE.zero_target_page); + XBZRLE.zero_target_page =3D NULL; +err_out: + XBZRLE_cache_unlock(); + return -ENOMEM; +} + static int ram_state_init(RAMState **rsp) { *rsp =3D g_try_new0(RAMState, 1); @@ -2044,39 +2105,9 @@ static int ram_init_all(RAMState **rsp) return -1; } =20 - if (migrate_use_xbzrle()) { - XBZRLE_cache_lock(); - XBZRLE.zero_target_page =3D g_malloc0(TARGET_PAGE_SIZE); - XBZRLE.cache =3D cache_init(migrate_xbzrle_cache_size() / - TARGET_PAGE_SIZE, - TARGET_PAGE_SIZE); - if (!XBZRLE.cache) { - XBZRLE_cache_unlock(); - error_report("Error creating cache"); - g_free(*rsp); - *rsp =3D NULL; - return -1; - } - XBZRLE_cache_unlock(); - - /* We prefer not to abort if there is no memory */ - XBZRLE.encoded_buf =3D g_try_malloc0(TARGET_PAGE_SIZE); - if (!XBZRLE.encoded_buf) { - error_report("Error allocating encoded_buf"); - g_free(*rsp); - *rsp =3D NULL; - return -1; - } - - XBZRLE.current_buf =3D g_try_malloc(TARGET_PAGE_SIZE); - if (!XBZRLE.current_buf) { - error_report("Error allocating current_buf"); - g_free(XBZRLE.encoded_buf); - XBZRLE.encoded_buf =3D NULL; - g_free(*rsp); - *rsp =3D NULL; - return -1; - } + if (xbzrle_init()) { + ram_state_cleanup(rsp); + return -1; } =20 /* For memory_global_dirty_log_start below. */ --=20 2.13.5 From nobody Thu May 2 11:44:59 2024 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 Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508394868685200.90704268465595; Wed, 18 Oct 2017 23:34:28 -0700 (PDT) Received: from localhost ([::1]:47738 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e54PO-00021e-LO for importer@patchew.org; Thu, 19 Oct 2017 02:34:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51770) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e54NP-0000nV-F8 for qemu-devel@nongnu.org; Thu, 19 Oct 2017 02:32:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e54NO-0003H8-My for qemu-devel@nongnu.org; Thu, 19 Oct 2017 02:32:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57046) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e54NO-0003GT-GV for qemu-devel@nongnu.org; Thu, 19 Oct 2017 02:32:18 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9BAA51E328 for ; Thu, 19 Oct 2017 06:32:17 +0000 (UTC) Received: from pxdev.xzpeter.org.com (dhcp-15-225.nay.redhat.com [10.66.15.225]) by smtp.corp.redhat.com (Postfix) with ESMTP id BA0F25E7AD; Thu, 19 Oct 2017 06:32:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 9BAA51E328 Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=peterx@redhat.com From: Peter Xu To: qemu-devel@nongnu.org Date: Thu, 19 Oct 2017 14:32:00 +0800 Message-Id: <20171019063200.19048-5-peterx@redhat.com> In-Reply-To: <20171019063200.19048-1-peterx@redhat.com> References: <20171019063200.19048-1-peterx@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Thu, 19 Oct 2017 06:32:17 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 4/4] migration: new ram_init_bitmaps() 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: Laurent Vivier , "Dr . David Alan Gilbert" , peterx@redhat.com, Juan Quintela 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" Rearrange the bitmap initialization and the first sync. Since at it, make sure the locks are taken/released in correct order (I moved RCU unlock upper - though it may not affect much). Signed-off-by: Peter Xu Reviewed-by: Juan Quintela --- migration/ram.c | 51 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 21 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index 3df7715d63..0d24fc12f4 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -2099,30 +2099,15 @@ static int ram_state_init(RAMState **rsp) return 0; } =20 -static int ram_init_all(RAMState **rsp) +static void ram_list_init_bitmaps(void) { - if (ram_state_init(rsp)) { - return -1; - } - - if (xbzrle_init()) { - ram_state_cleanup(rsp); - return -1; - } - - /* For memory_global_dirty_log_start below. */ - qemu_mutex_lock_iothread(); - - qemu_mutex_lock_ramlist(); - rcu_read_lock(); + RAMBlock *block; + unsigned long pages; =20 /* Skip setting bitmap if there is no RAM */ if (ram_bytes_total()) { - RAMBlock *block; - QLIST_FOREACH_RCU(block, &ram_list.blocks, next) { - unsigned long pages =3D block->max_length >> TARGET_PAGE_BITS; - + pages =3D block->max_length >> TARGET_PAGE_BITS; block->bmap =3D bitmap_new(pages); bitmap_set(block->bmap, 0, pages); if (migrate_postcopy_ram()) { @@ -2131,12 +2116,36 @@ static int ram_init_all(RAMState **rsp) } } } +} + +static void ram_init_bitmaps(RAMState *rs) +{ + /* For memory_global_dirty_log_start below. */ + qemu_mutex_lock_iothread(); + qemu_mutex_lock_ramlist(); + rcu_read_lock(); =20 + ram_list_init_bitmaps(); memory_global_dirty_log_start(); - migration_bitmap_sync(*rsp); + migration_bitmap_sync(rs); + + rcu_read_unlock(); qemu_mutex_unlock_ramlist(); qemu_mutex_unlock_iothread(); - rcu_read_unlock(); +} + +static int ram_init_all(RAMState **rsp) +{ + if (ram_state_init(rsp)) { + return -1; + } + + if (xbzrle_init()) { + ram_state_cleanup(rsp); + return -1; + } + + ram_init_bitmaps(*rsp); =20 return 0; } --=20 2.13.5