From patchwork Wed Feb 10 10:52:41 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: OHMURA Kei X-Patchwork-Id: 45007 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 206EBB80C8 for ; Wed, 10 Feb 2010 21:58:37 +1100 (EST) Received: from localhost ([127.0.0.1]:46730 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NfAH6-0001PE-Pl for incoming@patchwork.ozlabs.org; Wed, 10 Feb 2010 05:58:28 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NfABZ-0000Kh-Ew for qemu-devel@nongnu.org; Wed, 10 Feb 2010 05:52:45 -0500 Received: from [199.232.76.173] (port=45295 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NfABY-0000Jt-G3 for qemu-devel@nongnu.org; Wed, 10 Feb 2010 05:52:44 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NfABW-0005Qb-Ie for qemu-devel@nongnu.org; Wed, 10 Feb 2010 05:52:43 -0500 Received: from tama500.ecl.ntt.co.jp ([129.60.39.148]:40984) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NfABV-0005QL-7v for qemu-devel@nongnu.org; Wed, 10 Feb 2010 05:52:41 -0500 Received: from mfs6.rdh.ecl.ntt.co.jp (mfs6.rdh.ecl.ntt.co.jp [129.60.39.149]) by tama500.ecl.ntt.co.jp (8.14.3/8.14.3) with ESMTP id o1AAqdmM002756; Wed, 10 Feb 2010 19:52:39 +0900 (JST) Received: from mfs6.rdh.ecl.ntt.co.jp (localhost [127.0.0.1]) by mfs6.rdh.ecl.ntt.co.jp (Postfix) with ESMTP id CB1AE5E64; Wed, 10 Feb 2010 19:52:39 +0900 (JST) Received: from dmailsv1.y.ecl.ntt.co.jp (dmailsv1.y.ecl.ntt.co.jp [129.60.53.14]) by mfs6.rdh.ecl.ntt.co.jp (Postfix) with ESMTP id A9A0B5C66; Wed, 10 Feb 2010 19:52:39 +0900 (JST) Received: from mailsv02.y.ecl.ntt.co.jp by dmailsv1.y.ecl.ntt.co.jp (8.14.3/dmailsv1-2.1) with ESMTP id o1AAqd9k004438; Wed, 10 Feb 2010 19:52:39 +0900 (JST) Received: from localhost by mailsv02.y.ecl.ntt.co.jp (8.14.3/Lab-1.7) with ESMTP id o1AAqdJu002274; Wed, 10 Feb 2010 19:52:39 +0900 (JST) Message-ID: <4B728FF9.6010707@lab.ntt.co.jp> Date: Wed, 10 Feb 2010 19:52:41 +0900 From: OHMURA Kei User-Agent: Thunderbird 2.0.0.23 (Windows/20090812) MIME-Version: 1.0 To: "kvm@vger.kernel.org" , "qemu-devel@nongnu.org" X-detected-operating-system: by monty-python.gnu.org: Solaris 10 (beta) Cc: ohmura.kei@lab.ntt.co.jp, mtosatti@redhat.com, Avi Kivity Subject: [Qemu-devel] [PATCH v2] qemu-kvm: Speed up of the dirty-bitmap-traveling X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org dirty-bitmap-traveling is carried out by byte size in qemu-kvm.c. But We think that dirty-bitmap-traveling by long size is faster than by byte size especially when most of memory is not dirty. Signed-off-by: OHMURA Kei --- bswap.h | 1 - qemu-kvm.c | 30 ++++++++++++++++-------------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/bswap.h b/bswap.h index 4558704..d896f01 100644 --- a/bswap.h +++ b/bswap.h @@ -209,7 +209,6 @@ static inline void cpu_to_be32wu(uint32_t *p, uint32_t v) #define cpu_to_32wu cpu_to_le32wu #endif -#undef le_bswap #undef be_bswap #undef le_bswaps #undef be_bswaps diff --git a/qemu-kvm.c b/qemu-kvm.c index a305907..ea07912 100644 --- a/qemu-kvm.c +++ b/qemu-kvm.c @@ -2438,27 +2438,29 @@ static int kvm_get_dirty_pages_log_range(unsigned long start_addr, unsigned long offset, unsigned long mem_size) { - unsigned int i, j, n = 0; - unsigned char c; - unsigned long page_number, addr, addr1; + unsigned int i, j; + unsigned long page_number, addr, addr1, c; ram_addr_t ram_addr; - unsigned int len = ((mem_size / TARGET_PAGE_SIZE) + 7) / 8; + unsigned int len = ((mem_size / TARGET_PAGE_SIZE) + HOST_LONG_BITS - 1) / + HOST_LONG_BITS; + unsigned long *bitmap_ul = (unsigned long *)bitmap; /* * bitmap-traveling is faster than memory-traveling (for addr...) * especially when most of the memory is not dirty. */ for (i = 0; i < len; i++) { - c = bitmap[i]; - while (c > 0) { - j = ffsl(c) - 1; - c &= ~(1u << j); - page_number = i * 8 + j; - addr1 = page_number * TARGET_PAGE_SIZE; - addr = offset + addr1; - ram_addr = cpu_get_physical_page_desc(addr); - cpu_physical_memory_set_dirty(ram_addr); - n++; + if (bitmap_ul[i] != 0) { + c = le_bswap(bitmap_ul[i], HOST_LONG_BITS); + while (c > 0) { + j = ffsl(c) - 1; + c &= ~(1ul << j); + page_number = i * HOST_LONG_BITS + j; + addr1 = page_number * TARGET_PAGE_SIZE; + addr = offset + addr1; + ram_addr = cpu_get_physical_page_desc(addr); + cpu_physical_memory_set_dirty(ram_addr); + } } } return 0;