From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:44878) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S5RQ6-00015A-Lt for qemu-devel@nongnu.org; Wed, 07 Mar 2012 19:41:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S5RQ3-0001XS-45 for qemu-devel@nongnu.org; Wed, 07 Mar 2012 19:41:26 -0500 Received: from ozlabs.org ([203.10.76.45]:51141) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S5RQ2-0001X0-N4 for qemu-devel@nongnu.org; Wed, 07 Mar 2012 19:41:23 -0500 From: David Gibson Date: Thu, 8 Mar 2012 11:41:11 +1100 Message-Id: <1331167272-9800-4-git-send-email-david@gibson.dropbear.id.au> In-Reply-To: <1331167272-9800-1-git-send-email-david@gibson.dropbear.id.au> References: <[0/4] RESEND: Outstanding bugfixes and cleanups> <1331167272-9800-1-git-send-email-david@gibson.dropbear.id.au> Subject: [Qemu-devel] [PATCH 3/4] kvm: Fix dirty tracking with large kernel page size List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: Avi Kivity , 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 a5727a3..eb0e3b0 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -349,10 +349,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...) @@ -364,10 +365,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