From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O6cjY-0001Lu-Hg for qemu-devel@nongnu.org; Tue, 27 Apr 2010 00:49:20 -0400 Received: from [140.186.70.92] (port=37439 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O6cjW-0001Lm-Ie for qemu-devel@nongnu.org; Tue, 27 Apr 2010 00:49:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O6cjU-0007Me-US for qemu-devel@nongnu.org; Tue, 27 Apr 2010 00:49:18 -0400 Received: from mail-gw0-f45.google.com ([74.125.83.45]:36097) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O6cjU-0007MZ-Pv for qemu-devel@nongnu.org; Tue, 27 Apr 2010 00:49:16 -0400 Received: by gwb15 with SMTP id 15so1597039gwb.4 for ; Mon, 26 Apr 2010 21:49:15 -0700 (PDT) MIME-Version: 1.0 Sender: tamura.yoshiaki@gmail.com In-Reply-To: References: Date: Tue, 27 Apr 2010 13:49:15 +0900 Message-ID: From: Yoshiaki Tamura Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] Re: [PATCH 09/10] kvm: port qemu-kvm's bitmap scanning List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Marcelo Tosatti Cc: Anthony Liguori , qemu-devel@nongnu.org, kvm@vger.kernel.org Hi, This patch may conflict with the patch I posted on April 19. http://www.mail-archive.com/qemu-devel@nongnu.org/msg29941.html If Marcelo's is going to be merged, I need to rebase the above to it. It would be helpful if you could tell me the plan. Thanks, Yoshi 2010/4/27 Marcelo Tosatti : > Which is significantly faster. > > Signed-off-by: Marcelo Tosatti > --- > =A0kvm-all.c | =A0 53 +++++++++++++++++++++++++++++++++++++--------------= -- > =A01 files changed, 37 insertions(+), 16 deletions(-) > > diff --git a/kvm-all.c b/kvm-all.c > index eabb097..ef45418 100644 > --- a/kvm-all.c > +++ b/kvm-all.c > @@ -26,6 +26,7 @@ > =A0#include "hw/hw.h" > =A0#include "gdbstub.h" > =A0#include "kvm.h" > +#include "bswap.h" > > =A0/* KVM uses PAGE_SIZE in it's definition of COALESCED_MMIO_MAX */ > =A0#define PAGE_SIZE TARGET_PAGE_SIZE > @@ -282,11 +283,41 @@ static int kvm_set_migration_log(int enable) > =A0 =A0 return 0; > =A0} > > -static int test_le_bit(unsigned long nr, unsigned char *addr) > +/* get kvm's dirty pages bitmap and update qemu's */ > +static int kvm_get_dirty_pages_log_range(unsigned long start_addr, > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 unsigned long *bitmap, > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 unsigned long offset, > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 unsigned long mem_size) > =A0{ > - =A0 =A0return (addr[nr >> 3] >> (nr & 7)) & 1; > + =A0 =A0unsigned int i, j; > + =A0 =A0unsigned long page_number, addr, addr1, c; > + =A0 =A0ram_addr_t ram_addr; > + =A0 =A0unsigned int len =3D ((mem_size / TARGET_PAGE_SIZE) + HOST_LONG_= BITS - 1) / > + =A0 =A0 =A0 =A0HOST_LONG_BITS; > + > + =A0 =A0/* > + =A0 =A0 * bitmap-traveling is faster than memory-traveling (for addr...= ) > + =A0 =A0 * especially when most of the memory is not dirty. > + =A0 =A0 */ > + =A0 =A0for (i =3D 0; i < len; i++) { > + =A0 =A0 =A0 =A0if (bitmap[i] !=3D 0) { > + =A0 =A0 =A0 =A0 =A0 =A0c =3D leul_to_cpu(bitmap[i]); > + =A0 =A0 =A0 =A0 =A0 =A0do { > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0j =3D ffsl(c) - 1; > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0c &=3D ~(1ul << j); > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0page_number =3D i * HOST_LONG_BITS + j; > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0addr1 =3D page_number * TARGET_PAGE_SIZE= ; > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0addr =3D offset + addr1; > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0ram_addr =3D cpu_get_physical_page_desc(= addr); > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0cpu_physical_memory_set_dirty(ram_addr); > + =A0 =A0 =A0 =A0 =A0 =A0} while (c !=3D 0); > + =A0 =A0 =A0 =A0} > + =A0 =A0} > + =A0 =A0return 0; > =A0} > > +#define ALIGN(x, y) =A0(((x)+(y)-1) & ~((y)-1)) > + > =A0/** > =A0* kvm_physical_sync_dirty_bitmap - Grab dirty bitmap from kernel space > =A0* This function updates qemu's dirty bitmap using cpu_physical_memory_= set_dirty(). > @@ -300,8 +331,6 @@ static int kvm_physical_sync_dirty_bitmap(target_phys= _addr_t start_addr, > =A0{ > =A0 =A0 KVMState *s =3D kvm_state; > =A0 =A0 unsigned long size, allocated_size =3D 0; > - =A0 =A0target_phys_addr_t phys_addr; > - =A0 =A0ram_addr_t addr; > =A0 =A0 KVMDirtyLog d; > =A0 =A0 KVMSlot *mem; > =A0 =A0 int ret =3D 0; > @@ -313,7 +342,7 @@ static int kvm_physical_sync_dirty_bitmap(target_phys= _addr_t start_addr, > =A0 =A0 =A0 =A0 =A0 =A0 break; > =A0 =A0 =A0 =A0 } > > - =A0 =A0 =A0 =A0size =3D ((mem->memory_size >> TARGET_PAGE_BITS) + 7) / = 8; > + =A0 =A0 =A0 =A0size =3D ALIGN(((mem->memory_size) >> TARGET_PAGE_BITS),= HOST_LONG_BITS) / 8; > =A0 =A0 =A0 =A0 if (!d.dirty_bitmap) { > =A0 =A0 =A0 =A0 =A0 =A0 d.dirty_bitmap =3D qemu_malloc(size); > =A0 =A0 =A0 =A0 } else if (size > allocated_size) { > @@ -330,17 +359,9 @@ static int kvm_physical_sync_dirty_bitmap(target_phy= s_addr_t start_addr, > =A0 =A0 =A0 =A0 =A0 =A0 break; > =A0 =A0 =A0 =A0 } > > - =A0 =A0 =A0 =A0for (phys_addr =3D mem->start_addr, addr =3D mem->phys_o= ffset; > - =A0 =A0 =A0 =A0 =A0 =A0 phys_addr < mem->start_addr + mem->memory_size; > - =A0 =A0 =A0 =A0 =A0 =A0 phys_addr +=3D TARGET_PAGE_SIZE, addr +=3D TARG= ET_PAGE_SIZE) { > - =A0 =A0 =A0 =A0 =A0 =A0unsigned char *bitmap =3D (unsigned char *)d.dir= ty_bitmap; > - =A0 =A0 =A0 =A0 =A0 =A0unsigned nr =3D (phys_addr - mem->start_addr) >>= TARGET_PAGE_BITS; > - > - =A0 =A0 =A0 =A0 =A0 =A0if (test_le_bit(nr, bitmap)) { > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0cpu_physical_memory_set_dirty(addr); > - =A0 =A0 =A0 =A0 =A0 =A0} > - =A0 =A0 =A0 =A0} > - =A0 =A0 =A0 =A0start_addr =3D phys_addr; > + =A0 =A0 =A0 =A0kvm_get_dirty_pages_log_range(mem->start_addr, d.dirty_b= itmap, > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0mem->start_addr, mem->memory_size); > + =A0 =A0 =A0 =A0start_addr =3D mem->start_addr + mem->memory_size; > =A0 =A0 } > =A0 =A0 qemu_free(d.dirty_bitmap); > > -- > 1.6.6.1