From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:44420) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S9Uf6-0007UU-EW for qemu-devel@nongnu.org; Mon, 19 Mar 2012 00:57:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S9Uf4-0005QP-9G for qemu-devel@nongnu.org; Mon, 19 Mar 2012 00:57:39 -0400 Received: from ozlabs.org ([203.10.76.45]:59028) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S9Uf3-0005QE-Tr for qemu-devel@nongnu.org; Mon, 19 Mar 2012 00:57:38 -0400 From: David Gibson Date: Mon, 19 Mar 2012 15:57:27 +1100 Message-Id: <1332133047-7672-1-git-send-email-david@gibson.dropbear.id.au> Subject: [Qemu-devel] [PATCH] kvm: Fix dirty tracking with large kernel page size List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: avi@redhat.com Cc: Marcelo Tossatti , qemu-devel@nongnu.org, David Gibson If the kernel page size is larger than TARGET_PAGE_SIZE, which happens for example on ppc64 with kernels compiled for 64K pages, the dirty tracking doesn't work. Cc: Avi Kivity Cc: Marcelo Tossatti Signed-off-by: Benjamin Herrenschmidt Signed-off-by: David Gibson --- kvm-all.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/kvm-all.c b/kvm-all.c index ba2cee1..47adc97 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -350,10 +350,11 @@ 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 int i, j; unsigned long page_number, c; target_phys_addr_t addr, addr1; unsigned int len = ((section->size / TARGET_PAGE_SIZE) + HOST_LONG_BITS - 1) / HOST_LONG_BITS; + unsigned long hpratio = getpagesize() / TARGET_PAGE_SIZE; /* * bitmap-traveling is faster than memory-traveling (for addr...) @@ -365,10 +366,11 @@ static int kvm_get_dirty_pages_log_range(MemoryRegionSection *section, do { j = ffsl(c) - 1; c &= ~(1ul << j); - page_number = i * HOST_LONG_BITS + j; + page_number = (i * HOST_LONG_BITS + j) * hpratio; addr1 = page_number * TARGET_PAGE_SIZE; addr = section->offset_within_region + addr1; - memory_region_set_dirty(section->mr, addr, TARGET_PAGE_SIZE); + memory_region_set_dirty(section->mr, addr, + TARGET_PAGE_SIZE * hpratio); } while (c != 0); } } -- 1.7.9.1