From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35309) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ve5TT-0002QH-BM for qemu-devel@nongnu.org; Wed, 06 Nov 2013 10:57:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ve5TK-0008Tf-TW for qemu-devel@nongnu.org; Wed, 06 Nov 2013 10:56:55 -0500 Received: from mail-qa0-x22e.google.com ([2607:f8b0:400d:c00::22e]:43216) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ve5TK-0008Tb-Ny for qemu-devel@nongnu.org; Wed, 06 Nov 2013 10:56:46 -0500 Received: by mail-qa0-f46.google.com with SMTP id j7so2278881qaq.5 for ; Wed, 06 Nov 2013 07:56:46 -0800 (PST) Sender: Paolo Bonzini Message-ID: <527A66BA.7030906@redhat.com> Date: Wed, 06 Nov 2013 16:56:42 +0100 From: Paolo Bonzini MIME-Version: 1.0 References: <1383743088-8139-1-git-send-email-quintela@redhat.com> <1383743088-8139-37-git-send-email-quintela@redhat.com> In-Reply-To: <1383743088-8139-37-git-send-email-quintela@redhat.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 36/39] memory: move bitmap synchronization to its own function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Juan Quintela Cc: chegu_vinod@hp.com, qemu-devel@nongnu.org Il 06/11/2013 14:04, Juan Quintela ha scritto: > We want to have all the functions that handle directly the dirty > bitmap near. We will change it later. Please move it to exec.c instead. > Signed-off-by: Juan Quintela > --- > include/exec/memory-physical.h | 31 +++++++++++++++++++++++++++++++ > kvm-all.c | 27 ++------------------------- > 2 files changed, 33 insertions(+), 25 deletions(-) > > diff --git a/include/exec/memory-physical.h b/include/exec/memory-physical.h > index 610c55f..72faf06 100644 > --- a/include/exec/memory-physical.h > +++ b/include/exec/memory-physical.h > @@ -72,6 +72,37 @@ static inline void cpu_physical_memory_set_dirty_range(ram_addr_t start, > xen_modified_memory(start, length); > } > > +static inline void cpu_physical_memory_set_dirty_lebitmap(unsigned long *bitmap, Why "le"? Paolo > + ram_addr_t start, > + ram_addr_t pages) > +{ > + unsigned int i, j; > + unsigned long page_number, c; > + hwaddr addr; > + ram_addr_t ram_addr; > + unsigned int len = (pages + HOST_LONG_BITS - 1) / HOST_LONG_BITS; > + unsigned long hpratio = getpagesize() / TARGET_PAGE_SIZE; > + > + /* > + * bitmap-traveling is faster than memory-traveling (for addr...) > + * especially when most of the memory is not dirty. > + */ > + for (i = 0; i < len; i++) { > + if (bitmap[i] != 0) { > + c = leul_to_cpu(bitmap[i]); > + do { > + j = ffsl(c) - 1; > + c &= ~(1ul << j); > + page_number = (i * HOST_LONG_BITS + j) * hpratio; > + addr = page_number * TARGET_PAGE_SIZE; > + ram_addr = start + addr; > + cpu_physical_memory_set_dirty_range(ram_addr, > + TARGET_PAGE_SIZE * hpratio); > + } while (c != 0); > + } > + } > +} > + > static inline void cpu_physical_memory_clear_dirty_range(ram_addr_t start, > ram_addr_t length, > unsigned client) > diff --git a/kvm-all.c b/kvm-all.c > index 7609242..25c0864 100644 > --- a/kvm-all.c > +++ b/kvm-all.c > @@ -379,33 +379,10 @@ static int kvm_set_migration_log(int enable) > static int kvm_get_dirty_pages_log_range(MemoryRegionSection *section, > unsigned long *bitmap) > { > - unsigned int i, j; > - unsigned long page_number, c; > - hwaddr addr; > ram_addr_t start = section->offset_within_region + section->mr->ram_addr; > - ram_addr_t ram_addr; > - unsigned int pages = int128_get64(section->size) / getpagesize(); > - unsigned int len = (pages + HOST_LONG_BITS - 1) / HOST_LONG_BITS; > - unsigned long hpratio = getpagesize() / TARGET_PAGE_SIZE; > + ram_addr_t pages = int128_get64(section->size) / getpagesize(); > > - /* > - * bitmap-traveling is faster than memory-traveling (for addr...) > - * especially when most of the memory is not dirty. > - */ > - for (i = 0; i < len; i++) { > - if (bitmap[i] != 0) { > - c = leul_to_cpu(bitmap[i]); > - do { > - j = ffsl(c) - 1; > - c &= ~(1ul << j); > - page_number = (i * HOST_LONG_BITS + j) * hpratio; > - addr = page_number * TARGET_PAGE_SIZE; > - ram_addr = start + addr; > - cpu_physical_memory_set_dirty_range(ram_addr, > - TARGET_PAGE_SIZE * hpratio); > - } while (c != 0); > - } > - } > + cpu_physical_memory_set_dirty_lebitmap(bitmap, start, pages); > return 0; > } >