From patchwork Tue Feb 9 09:54:49 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: OHMURA Kei X-Patchwork-Id: 44894 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 E99E3B7D45 for ; Tue, 9 Feb 2010 21:02:22 +1100 (EST) Received: from localhost ([127.0.0.1]:41958 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NempX-0002TH-CT for incoming@patchwork.ozlabs.org; Tue, 09 Feb 2010 04:56:27 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nemo4-0002TC-N4 for qemu-devel@nongnu.org; Tue, 09 Feb 2010 04:54:56 -0500 Received: from [199.232.76.173] (port=33398 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nemo3-0002T4-8e for qemu-devel@nongnu.org; Tue, 09 Feb 2010 04:54:55 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1Nemo2-0006nE-4Z for qemu-devel@nongnu.org; Tue, 09 Feb 2010 04:54:55 -0500 Received: from tama500.ecl.ntt.co.jp ([129.60.39.148]:56851) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Nemo1-0006n4-Dr for qemu-devel@nongnu.org; Tue, 09 Feb 2010 04:54:54 -0500 Received: from mfs5.rdh.ecl.ntt.co.jp (mfs5.rdh.ecl.ntt.co.jp [129.60.39.144]) by tama500.ecl.ntt.co.jp (8.14.3/8.14.3) with ESMTP id o199smiC006240; Tue, 9 Feb 2010 18:54:48 +0900 (JST) Received: from mfs5.rdh.ecl.ntt.co.jp (localhost [127.0.0.1]) by mfs5.rdh.ecl.ntt.co.jp (Postfix) with ESMTP id C694D6CDF; Tue, 9 Feb 2010 18:54:48 +0900 (JST) Received: from dmailsv1.y.ecl.ntt.co.jp (dmailsv1.y.ecl.ntt.co.jp [129.60.53.14]) by mfs5.rdh.ecl.ntt.co.jp (Postfix) with ESMTP id A4E6F6CDD; Tue, 9 Feb 2010 18:54:48 +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 o199smDV023412; Tue, 9 Feb 2010 18:54:48 +0900 (JST) Received: from localhost by mailsv02.y.ecl.ntt.co.jp (8.14.3/Lab-1.7) with ESMTP id o199smB0011272; Tue, 9 Feb 2010 18:54:48 +0900 (JST) Message-ID: <4B7130E9.7060809@lab.ntt.co.jp> Date: Tue, 09 Feb 2010 18:54:49 +0900 From: OHMURA Kei User-Agent: Thunderbird 2.0.0.23 (Windows/20090812) MIME-Version: 1.0 To: Avi Kivity References: <4B6BF06D.1090909@lab.ntt.co.jp> <4B70065B.1010401@redhat.com> In-Reply-To: <4B70065B.1010401@redhat.com> X-detected-operating-system: by monty-python.gnu.org: Solaris 10 (beta) Cc: ohmura.kei@lab.ntt.co.jp, mtosatti@redhat.com, qemu-devel@nongnu.org, kvm@vger.kernel.org Subject: [Qemu-devel] Re: [PATCH] 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 Thank you for your comments. We have implemented the code which applied your comments. This is patch for qemu-kvm.c. Signed-off-by: OHMURA Kei --- qemu-kvm.c | 31 +++++++++++++++++++------------ 1 files changed, 19 insertions(+), 12 deletions(-) diff --git a/qemu-kvm.c b/qemu-kvm.c index a305907..d7474ea 100644 --- a/qemu-kvm.c +++ b/qemu-kvm.c @@ -2438,27 +2438,34 @@ 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 int i, j, k, start, end; unsigned char c; unsigned long page_number, addr, addr1; ram_addr_t ram_addr; - unsigned int len = ((mem_size / TARGET_PAGE_SIZE) + 7) / 8; + unsigned int len = ((mem_size / TARGET_PAGE_SIZE) + TARGET_LONG_BITS - 1) / + TARGET_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) { + start = i * TARGET_LONG_SIZE; + end = (i + 1) * TARGET_LONG_SIZE; + for (j = start; j < end; j++) { + c = bitmap[j]; + while (c > 0) { + k = ffsl(c) - 1; + c &= ~(1u << k); + page_number = j * 8 + k; + 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;