From nobody Mon Feb 9 00:31:02 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.zoho.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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 148701009307119.188834645867246; Mon, 13 Feb 2017 10:21:33 -0800 (PST) Received: from localhost ([::1]:58717 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cdLFh-00071l-MQ for importer@patchew.org; Mon, 13 Feb 2017 13:21:29 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39073) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cdKm0-0003Xu-DK for qemu-devel@nongnu.org; Mon, 13 Feb 2017 12:50:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cdKlx-0005vk-EO for qemu-devel@nongnu.org; Mon, 13 Feb 2017 12:50:48 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52610) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cdKlw-0005v8-UZ for qemu-devel@nongnu.org; Mon, 13 Feb 2017 12:50:45 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 043E74DD58; Mon, 13 Feb 2017 17:50:45 +0000 (UTC) Received: from dgilbert-t530.redhat.com (ovpn-117-140.ams2.redhat.com [10.36.117.140]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v1DHoYkE007824; Mon, 13 Feb 2017 12:50:43 -0500 From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org Date: Mon, 13 Feb 2017 17:50:24 +0000 Message-Id: <20170213175033.7314-6-dgilbert@redhat.com> In-Reply-To: <20170213175033.7314-1-dgilbert@redhat.com> References: <20170213175033.7314-1-dgilbert@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Mon, 13 Feb 2017 17:50:45 +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] [PULL 05/14] migration: discard non-dirty ram pages after the start of postcopy 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: pbutsykin@virtuozzo.com, amit@kernel.org, zhang.zhanghailiang@huawei.com, ashijeetacharya@gmail.com, quintela@redhat.com 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: Pavel Butsykin After the start of postcopy migration there are some non-dirty pages which = have already been migrated. These pages are no longer needed on the source vm so= that we can free them and it doen't hurt to complete the migration. Signed-off-by: Pavel Butsykin Message-Id: <20170203152321.19739-4-pbutsykin@virtuozzo.com> Signed-off-by: Dr. David Alan Gilbert --- include/migration/migration.h | 1 + migration/migration.c | 4 ++++ migration/ram.c | 19 +++++++++++++++++++ 3 files changed, 24 insertions(+) diff --git a/include/migration/migration.h b/include/migration/migration.h index b9b706a..71ce190 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -285,6 +285,7 @@ int ram_postcopy_send_discard_bitmap(MigrationState *ms= ); int ram_discard_range(MigrationIncomingState *mis, const char *block_name, uint64_t start, size_t length); int ram_postcopy_incoming_init(MigrationIncomingState *mis); +void ram_postcopy_migrated_memory_release(MigrationState *ms); =20 /** * @migrate_add_blocker - prevent migration from proceeding diff --git a/migration/migration.c b/migration/migration.c index 68afc07..2a26a20 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1722,6 +1722,10 @@ static int postcopy_start(MigrationState *ms, bool *= old_vm_running) */ qemu_savevm_send_ping(ms->to_dst_file, 4); =20 + if (migrate_release_ram()) { + ram_postcopy_migrated_memory_release(ms); + } + ret =3D qemu_file_get_error(ms->to_dst_file); if (ret) { error_report("postcopy_start: Migration stream errored"); diff --git a/migration/ram.c b/migration/ram.c index c22209d..67f2efb 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1537,6 +1537,25 @@ void ram_debug_dump_bitmap(unsigned long *todump, bo= ol expected) =20 /* **** functions for postcopy ***** */ =20 +void ram_postcopy_migrated_memory_release(MigrationState *ms) +{ + struct RAMBlock *block; + unsigned long *bitmap =3D atomic_rcu_read(&migration_bitmap_rcu)->bmap; + + QLIST_FOREACH_RCU(block, &ram_list.blocks, next) { + unsigned long first =3D block->offset >> TARGET_PAGE_BITS; + unsigned long range =3D first + (block->used_length >> TARGET_PAGE= _BITS); + unsigned long run_start =3D find_next_zero_bit(bitmap, range, firs= t); + + while (run_start < range) { + unsigned long run_end =3D find_next_bit(bitmap, range, run_sta= rt + 1); + ram_discard_range(NULL, block->idstr, run_start << TARGET_PAGE= _BITS, + (run_end - run_start) << TARGET_PAGE_BITS); + run_start =3D find_next_zero_bit(bitmap, range, run_end + 1); + } + } +} + /* * Callback from postcopy_each_ram_send_discard for each RAMBlock * Note: At this point the 'unsentmap' is the processed bitmap combined --=20 2.9.3