From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46690) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxE3n-0006ns-6B for qemu-devel@nongnu.org; Tue, 26 May 2015 08:34:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YxE3h-0004cx-Pg for qemu-devel@nongnu.org; Tue, 26 May 2015 08:34:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55873) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxE3h-0004ci-JF for qemu-devel@nongnu.org; Tue, 26 May 2015 08:34:13 -0400 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 (Postfix) with ESMTPS id 42DA68E3FC for ; Tue, 26 May 2015 12:34:13 +0000 (UTC) Date: Tue, 26 May 2015 20:34:10 +0800 From: Fam Zheng Message-ID: <20150526123410.GY13749@ad.nay.redhat.com> References: <1430152117-100558-1-git-send-email-pbonzini@redhat.com> <1430152117-100558-27-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1430152117-100558-27-git-send-email-pbonzini@redhat.com> Subject: Re: [Qemu-devel] [PATCH 26/29] migration: move dirty bitmap sync to ram_addr.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: qemu-devel@nongnu.org, stefanha@redhat.com, mst@redhat.com On Mon, 04/27 18:28, Paolo Bonzini wrote: > From: Stefan Hajnoczi > > The dirty memory bitmap is managed by ram_addr.h and copied to > migration_bitmap[] periodically during live migration. > > Move the code to sync the bitmap to ram_addr.h where related code lives. > > Signed-off-by: Stefan Hajnoczi > Message-Id: <1417519399-3166-5-git-send-email-stefanha@redhat.com> > Signed-off-by: Paolo Bonzini > --- > arch_init.c | 46 ++-------------------------------------------- > include/exec/ram_addr.h | 44 ++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 46 insertions(+), 44 deletions(-) > > diff --git a/arch_init.c b/arch_init.c > index 4c8fcee..ec86173 100644 > --- a/arch_init.c > +++ b/arch_init.c > @@ -467,52 +467,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(ram_addr_t addr) > -{ > - bool ret; > - int nr = addr >> TARGET_PAGE_BITS; > - > - ret = test_and_set_bit(nr, migration_bitmap); > - > - if (!ret) { > - migration_dirty_pages++; > - } > - return ret; > -} > - > static void migration_bitmap_sync_range(ram_addr_t start, ram_addr_t length) > { > - ram_addr_t addr; > - unsigned long page = BIT_WORD(start >> TARGET_PAGE_BITS); > - > - /* start address is aligned at the start of a word? */ > - if (((page * BITS_PER_LONG) << TARGET_PAGE_BITS) == start) { > - int k; > - int nr = BITS_TO_LONGS(length >> TARGET_PAGE_BITS); > - unsigned long *src = ram_list.dirty_memory[DIRTY_MEMORY_MIGRATION]; > - > - for (k = page; k < page + nr; k++) { > - if (src[k]) { > - unsigned long new_dirty; > - new_dirty = ~migration_bitmap[k]; > - migration_bitmap[k] |= src[k]; > - new_dirty &= src[k]; > - migration_dirty_pages += ctpopl(new_dirty); > - src[k] = 0; > - } > - } > - } else { > - 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); > - } > - } > - } > + migration_dirty_pages += > + cpu_physical_memory_sync_dirty_bitmap(migration_bitmap, start, length); > } > > > diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h > index bb69a28..9bd7827 100644 > --- a/include/exec/ram_addr.h > +++ b/include/exec/ram_addr.h > @@ -218,5 +218,49 @@ static inline void cpu_physical_memory_clear_dirty_range(ram_addr_t start, > void cpu_physical_memory_reset_dirty(ram_addr_t start, ram_addr_t length, > unsigned client); > > +static inline > +uint64_t cpu_physical_memory_sync_dirty_bitmap(unsigned long *dest, > + ram_addr_t start, > + ram_addr_t length) > +{ > + ram_addr_t addr; > + unsigned long page = BIT_WORD(start >> TARGET_PAGE_BITS); > + uint64_t num_dirty = 0; > + > + /* start address is aligned at the start of a word? */ > + if (((page * BITS_PER_LONG) << TARGET_PAGE_BITS) == start) { > + int k; > + int nr = BITS_TO_LONGS(length >> TARGET_PAGE_BITS); > + unsigned long *src = ram_list.dirty_memory[DIRTY_MEMORY_MIGRATION]; > + > + for (k = page; k < page + nr; k++) { > + if (src[k]) { > + unsigned long new_dirty; > + new_dirty = ~dest[k]; > + dest[k] |= src[k]; > + new_dirty &= src[k]; > + num_dirty += ctpopl(new_dirty); > + src[k] = 0; > + } > + } > + } else { > + 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); > + long k = (start + addr) >> TARGET_PAGE_BITS; The variable declaration should come first in a code block. Fam > + if (!test_and_set_bit(k, dest)) { > + num_dirty++; > + } > + } > + } > + } > + > + return num_dirty; > +} > + > #endif > #endif > -- > 1.8.3.1 > >