From patchwork Wed Jun 16 08:09:51 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshiaki Tamura X-Patchwork-Id: 55863 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 D3D68B7D8B for ; Wed, 16 Jun 2010 18:18:07 +1000 (EST) Received: from localhost ([127.0.0.1]:52935 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OOnoy-00036p-SQ for incoming@patchwork.ozlabs.org; Wed, 16 Jun 2010 04:18:04 -0400 Received: from [140.186.70.92] (port=35373 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OOnhY-0007Ah-8M for qemu-devel@nongnu.org; Wed, 16 Jun 2010 04:10:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OOnhV-0001OL-UM for qemu-devel@nongnu.org; Wed, 16 Jun 2010 04:10:24 -0400 Received: from sh.osrg.net ([192.16.179.4]:33896) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OOnhV-0001NX-DT for qemu-devel@nongnu.org; Wed, 16 Jun 2010 04:10:21 -0400 Received: from fs.osrg.net (postfix@fs.osrg.net [10.0.0.12]) by sh.osrg.net (8.14.3/8.14.3/OSRG-NET) with ESMTP id o5G8AH7Z006022; Wed, 16 Jun 2010 17:10:17 +0900 Received: from localhost (hype-wd0.osrg.net [10.72.1.16]) by fs.osrg.net (Postfix) with ESMTP id 6E8443E02F8; Wed, 16 Jun 2010 17:10:17 +0900 (JST) From: Yoshiaki Tamura To: qemu-devel@nongnu.org Date: Wed, 16 Jun 2010 17:09:51 +0900 Message-Id: <1276675793-21262-3-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> X-Mailer: git-send-email 1.7.0.31.g1df487 In-Reply-To: <1276675793-21262-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> References: <1276675793-21262-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> X-Dispatcher: imput version 20070423(IM149) Lines: 107 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-3.0 (sh.osrg.net [192.16.179.4]); Wed, 16 Jun 2010 17:10:18 +0900 (JST) X-Virus-Scanned: clamav-milter 0.96.1 at sh X-Virus-Status: Clean X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: aliguori@us.ibm.com, ohmura.kei@lab.ntt.co.jp, Yoshiaki Tamura Subject: [Qemu-devel] [PATCH v6 2/4] Introduce cpu_physical_memory_get_dirty_range(). 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 It checks the first row and puts dirty addr in the array. If the first row is empty, it skips to the first non-dirty row or the end addr, and put the length in the first entry of the array. Signed-off-by: Yoshiaki Tamura Signed-off-by: OHMURA Kei --- cpu-all.h | 4 +++ exec.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 0 deletions(-) diff --git a/cpu-all.h b/cpu-all.h index fcccf6f..cdcd591 100644 --- a/cpu-all.h +++ b/cpu-all.h @@ -1030,6 +1030,10 @@ static inline void cpu_physical_memory_mask_dirty_range(ram_addr_t start, } } +int cpu_physical_memory_get_dirty_range(ram_addr_t start, ram_addr_t end, + ram_addr_t *dirty_rams, int length, + int dirty_flags); + void cpu_physical_memory_reset_dirty(ram_addr_t start, ram_addr_t end, int dirty_flags); void cpu_tlb_update_dirty(CPUState *env); diff --git a/exec.c b/exec.c index 24f0f67..f2950c7 100644 --- a/exec.c +++ b/exec.c @@ -2018,6 +2018,73 @@ static inline void tlb_reset_dirty_range(CPUTLBEntry *tlb_entry, } } +/* It checks the first row and puts dirty addrs in the array. + If the first row is empty, it skips to the first non-dirty row + or the end addr, and put the length in the first entry of the array. */ +int cpu_physical_memory_get_dirty_range(ram_addr_t start, ram_addr_t end, + ram_addr_t *dirty_rams, int length, + int dirty_flag) +{ + unsigned long p = 0, page_number; + ram_addr_t addr; + ram_addr_t s_idx = (start >> TARGET_PAGE_BITS) / HOST_LONG_BITS; + ram_addr_t e_idx = (end >> TARGET_PAGE_BITS) / HOST_LONG_BITS; + int i, j, offset, dirty_idx = dirty_flag_to_idx(dirty_flag); + + /* mask bits before the start addr */ + offset = (start >> TARGET_PAGE_BITS) & (HOST_LONG_BITS - 1); + cpu_physical_memory_sync_master(s_idx); + p |= ram_list.phys_dirty[dirty_idx][s_idx] & ~((1UL << offset) - 1); + + if (s_idx == e_idx) { + /* mask bits after the end addr */ + offset = (end >> TARGET_PAGE_BITS) & (HOST_LONG_BITS - 1); + p &= (1UL << offset) - 1; + } + + if (p == 0) { + /* when the row is empty */ + ram_addr_t skip; + if (s_idx == e_idx) { + skip = end; + } else { + /* skip empty rows */ + while (s_idx < e_idx) { + s_idx++; + cpu_physical_memory_sync_master(s_idx); + + if (ram_list.phys_dirty[dirty_idx][s_idx] != 0) { + break; + } + } + skip = (s_idx * HOST_LONG_BITS * TARGET_PAGE_SIZE); + } + dirty_rams[0] = skip - start; + i = 0; + + } else if (p == ~0UL) { + /* when the row is fully dirtied */ + addr = start; + for (i = 0; i < length; i++) { + dirty_rams[i] = addr; + addr += TARGET_PAGE_SIZE; + } + } else { + /* when the row is partially dirtied */ + i = 0; + do { + j = ffsl(p) - 1; + p &= ~(1UL << j); + page_number = s_idx * HOST_LONG_BITS + j; + addr = page_number * TARGET_PAGE_SIZE; + dirty_rams[i] = addr; + i++; + } while (p != 0 && i < length); + } + + return i; +} + /* Note: start and end must be within the same ram block. */ void cpu_physical_memory_reset_dirty(ram_addr_t start, ram_addr_t end, int dirty_flags)