From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36839) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vtb6O-0000eX-7c for qemu-devel@nongnu.org; Thu, 19 Dec 2013 05:45:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vtb6I-0007Ry-4Z for qemu-devel@nongnu.org; Thu, 19 Dec 2013 05:45:12 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50439) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vtb6H-0007Mv-Tx for qemu-devel@nongnu.org; Thu, 19 Dec 2013 05:45:06 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id rBJAj3UL007437 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 19 Dec 2013 05:45:04 -0500 Message-ID: <52B2CE50.6050906@redhat.com> Date: Thu, 19 Dec 2013 12:45:36 +0200 From: Orit Wasserman MIME-Version: 1.0 References: <1387293974-24718-1-git-send-email-quintela@redhat.com> <1387293974-24718-37-git-send-email-quintela@redhat.com> In-Reply-To: <1387293974-24718-37-git-send-email-quintela@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 36/38] ram: split function that synchronizes a range List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Juan Quintela , qemu-devel@nongnu.org On 12/17/2013 05:26 PM, Juan Quintela wrote: > This function is the only bit where we care about speed. > > Signed-off-by: Juan Quintela > --- > arch_init.c | 34 ++++++++++++++++++++-------------- > 1 file changed, 20 insertions(+), 14 deletions(-) > > diff --git a/arch_init.c b/arch_init.c > index 0e8c8b5..2cd3d00 100644 > --- a/arch_init.c > +++ b/arch_init.c > @@ -360,11 +360,10 @@ ram_addr_t migration_bitmap_find_and_reset_dirty(MemoryRegion *mr, > return (next - base) << TARGET_PAGE_BITS; > } > > -static inline bool migration_bitmap_set_dirty(MemoryRegion *mr, > - ram_addr_t offset) > +static inline bool migration_bitmap_set_dirty(ram_addr_t addr) > { > bool ret; > - int nr = (mr->ram_addr + offset) >> TARGET_PAGE_BITS; > + int nr = addr >> TARGET_PAGE_BITS; > > ret = test_and_set_bit(nr, migration_bitmap); > > @@ -374,12 +373,28 @@ static inline bool migration_bitmap_set_dirty(MemoryRegion *mr, > return ret; > } > > +static void migration_bitmap_sync_range(ram_addr_t start, ram_addr_t length) > +{ > + ram_addr_t addr; > + > + for (addr = 0; addr < length; addr += TARGET_PAGE_SIZE) { > + if (cpu_physical_memory_get_dirty(start + addr, > + TARGET_PAGE_SIZE, > + DIRTY_MEMORY_MIGRATION)) { > + cpu_physical_memory_reset_dirty(start + addr, > + TARGET_PAGE_SIZE, > + DIRTY_MEMORY_MIGRATION); > + migration_bitmap_set_dirty(start + addr); > + } > + } > +} > + > + > /* Needs iothread lock! */ > > static void migration_bitmap_sync(void) > { > RAMBlock *block; > - ram_addr_t addr; > uint64_t num_dirty_pages_init = migration_dirty_pages; > MigrationState *s = migrate_get_current(); > static int64_t start_time; > @@ -400,16 +415,7 @@ static void migration_bitmap_sync(void) > address_space_sync_dirty_bitmap(&address_space_memory); > > QTAILQ_FOREACH(block, &ram_list.blocks, next) { > - for (addr = 0; addr < block->length; addr += TARGET_PAGE_SIZE) { > - if (cpu_physical_memory_get_dirty(block->mr->ram_addr + addr, > - TARGET_PAGE_SIZE, > - DIRTY_MEMORY_MIGRATION)) { > - cpu_physical_memory_reset_dirty(block->mr->ram_addr + addr, > - TARGET_PAGE_SIZE, > - DIRTY_MEMORY_MIGRATION); > - migration_bitmap_set_dirty(block->mr, addr); > - } > - } > + migration_bitmap_sync_range(block->mr->ram_addr, block->length); > } > trace_migration_bitmap_sync_end(migration_dirty_pages > - num_dirty_pages_init); > Reviewed-by: Orit Wasserman