From nobody Mon Feb 9 16:34:18 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1559735764; cv=none; d=zoho.com; s=zohoarc; b=VonQPJcuBgurxsuEH8WIpUI3GeLrj5/ZwT9vLpSHXBPxOqzRGUtIQ9X55pnbClCYvOpIMlIaRXdptp/ibStV6OfRaH1hXPj/0Jxv4ERC+mc7mEA9hvx4R7LI06duUKquCMFuiNfN5WTmnefhXtuFlW47DIpPn5G06KoQYxuEtz4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559735764; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=Xzv+U81Z3+eLeTob08PUlXwX9zzw1TNegpXTkK+a5fQ=; b=OtxMOXlRIoJe8X0zTInHW6O8AuDD7oh2ibtKLTfGs40nnnFeJWUEzpmI9dkE2KqnkT9WyxlZoJf/IipllEl7ejXfvsV9imjjSsUFkrRYk7oFsy3yF8wzaX+8vvQyumtlqOnYBzwmlFK4siiVHFaq5zh53Qm4B7BBVzNKFa3w20w= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1559735764178804.9761898218933; Wed, 5 Jun 2019 04:56:04 -0700 (PDT) Received: from localhost ([127.0.0.1]:39890 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYUWL-0004zw-Lr for importer@patchew.org; Wed, 05 Jun 2019 07:55:57 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37297) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYUUK-0003pj-MH for qemu-devel@nongnu.org; Wed, 05 Jun 2019 07:53:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hYUUG-0002km-RN for qemu-devel@nongnu.org; Wed, 05 Jun 2019 07:53:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46588) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hYUUG-0002jj-Js for qemu-devel@nongnu.org; Wed, 05 Jun 2019 07:53:48 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 481E185546; Wed, 5 Jun 2019 11:53:46 +0000 (UTC) Received: from localhost.localdomain (ovpn-116-241.ams2.redhat.com [10.36.116.241]) by smtp.corp.redhat.com (Postfix) with ESMTP id 038115D71A; Wed, 5 Jun 2019 11:53:43 +0000 (UTC) From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 5 Jun 2019 13:53:18 +0200 Message-Id: <20190605115318.9972-6-quintela@redhat.com> In-Reply-To: <20190605115318.9972-1-quintela@redhat.com> References: <20190605115318.9972-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Wed, 05 Jun 2019 11:53:47 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 5/5] migratioin/ram: leave RAMBlock->bmap blank on allocating 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 , Thomas Huth , zhanghailiang , Juan Quintela , "Dr. David Alan Gilbert" , Markus Armbruster , Wei Yang , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Wei Yang During migration, we would sync bitmap from ram_list.dirty_memory to RAMBlock.bmap in cpu_physical_memory_sync_dirty_bitmap(). Since we set RAMBlock.bmap and ram_list.dirty_memory both to all 1, this means at the first round this sync is meaningless and is a duplicated work. Leaving RAMBlock->bmap blank on allocating would have a side effect on migration_dirty_pages, since it is calculated from the result of cpu_physical_memory_sync_dirty_bitmap(). To keep it right, we need to set migration_dirty_pages to 0 in ram_state_init(). Signed-off-by: Wei Yang Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Juan Quintela Signed-off-by: Juan Quintela --- migration/ram.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index 03a9cce9f9..082aea9d23 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -3173,11 +3173,11 @@ static int ram_state_init(RAMState **rsp) 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. + * This must match with the initial values of dirty bitmap. + * Currently we initialize the dirty bitmap to all zeros so + * here the total dirty page count is zero. */ - (*rsp)->migration_dirty_pages =3D ram_bytes_total() >> TARGET_PAGE_BIT= S; - + (*rsp)->migration_dirty_pages =3D 0; ram_state_reset(*rsp); =20 return 0; @@ -3192,8 +3192,16 @@ static void ram_list_init_bitmaps(void) if (ram_bytes_total()) { RAMBLOCK_FOREACH_NOT_IGNORED(block) { pages =3D block->max_length >> TARGET_PAGE_BITS; + /* + * The initial dirty bitmap for migration must be set with all + * ones to make sure we'll migrate every guest RAM page to + * destination. + * Here we didn't set RAMBlock.bmap simply because it is alrea= dy + * set in ram_list.dirty_memory[DIRTY_MEMORY_MIGRATION] in + * ram_block_add, and that's where we'll sync the dirty bitmap= s. + * Here setting RAMBlock.bmap would be fine too but not necess= ary. + */ block->bmap =3D bitmap_new(pages); - bitmap_set(block->bmap, 0, pages); if (migrate_postcopy_ram()) { block->unsentmap =3D bitmap_new(pages); bitmap_set(block->unsentmap, 0, pages); --=20 2.21.0