From patchwork Tue Mar 16 10:53:55 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshiaki Tamura X-Patchwork-Id: 86115 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o2GAuSdM002382 for ; Tue, 16 Mar 2010 10:56:28 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S937738Ab0CPK4X (ORCPT ); Tue, 16 Mar 2010 06:56:23 -0400 Received: from sh.osrg.net ([192.16.179.4]:49163 "EHLO sh.osrg.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S937728Ab0CPK4V (ORCPT ); Tue, 16 Mar 2010 06:56: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 o2GAu1iL024556; Tue, 16 Mar 2010 19:56:01 +0900 Received: from localhost (hype-wd0.osrg.net [10.72.1.16]) by fs.osrg.net (Postfix) with ESMTP id 2201B3E02D5; Tue, 16 Mar 2010 19:56:01 +0900 (JST) From: Yoshiaki Tamura To: kvm@vger.kernel.org, qemu-devel@nongnu.org Cc: avi@redhat.com, anthony@codemonkey.ws, ohmura.kei@lab.ntt.co.jp, Yoshiaki Tamura Subject: [PATCH 2/6] qemu-kvm: Modify and introduce wrapper functions to access phys_ram_dirty. Date: Tue, 16 Mar 2010 19:53:55 +0900 Message-Id: <1268736839-27371-3-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> X-Mailer: git-send-email 1.7.0.31.g1df487 In-Reply-To: <1268736839-27371-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> References: <1268736839-27371-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> X-Dispatcher: imput version 20070423(IM149) Lines: 136 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 16 Mar 2010 10:56:28 +0000 (UTC) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-3.0 (sh.osrg.net [192.16.179.4]); Tue, 16 Mar 2010 19:56:02 +0900 (JST) X-Virus-Scanned: clamav-milter 0.95.3 at sh X-Virus-Status: Clean Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org diff --git a/cpu-all.h b/cpu-all.h index 9bc01b9..91ec3e5 100644 --- a/cpu-all.h +++ b/cpu-all.h @@ -843,7 +843,9 @@ int cpu_str_to_log_mask(const char *str); /* memory API */ extern int phys_ram_fd; -extern uint8_t *phys_ram_dirty; +extern unsigned long *phys_ram_vga_dirty; +extern unsigned long *phys_ram_code_dirty; +extern unsigned long *phys_ram_migration_dirty; extern ram_addr_t ram_size; extern ram_addr_t last_ram_offset; extern uint8_t *bios_mem; @@ -879,20 +881,104 @@ int cpu_memory_rw_debug(CPUState *env, target_ulong addr, /* read dirty bit (return 0 or 1) */ static inline int cpu_physical_memory_is_dirty(ram_addr_t addr) { - return phys_ram_dirty[addr >> TARGET_PAGE_BITS] == 0xff; + unsigned long mask; + int index = (addr >> TARGET_PAGE_BITS) / HOST_LONG_BITS; + int offset = (addr >> TARGET_PAGE_BITS) & (HOST_LONG_BITS - 1); + + mask = 1UL << offset; + return (phys_ram_vga_dirty[index] & + phys_ram_code_dirty[index] & + phys_ram_migration_dirty[index] & mask) == mask; +} + +static inline int cpu_physical_memory_get_dirty_flags(ram_addr_t addr) +{ + unsigned long mask; + int index = (addr >> TARGET_PAGE_BITS) / HOST_LONG_BITS; + int offset = (addr >> TARGET_PAGE_BITS) & (HOST_LONG_BITS - 1); + int ret = 0; + + mask = 1UL << offset; + if (phys_ram_vga_dirty[index] & mask) + ret |= VGA_DIRTY_FLAG; + if (phys_ram_code_dirty[index] & mask) + ret |= CODE_DIRTY_FLAG; + if (phys_ram_migration_dirty[index] & mask) + ret |= MIGRATION_DIRTY_FLAG; + + return ret; } static inline int cpu_physical_memory_get_dirty(ram_addr_t addr, int dirty_flags) { - return phys_ram_dirty[addr >> TARGET_PAGE_BITS] & dirty_flags; + return cpu_physical_memory_get_dirty_flags(addr) & dirty_flags; } static inline void cpu_physical_memory_set_dirty(ram_addr_t addr) { - phys_ram_dirty[addr >> TARGET_PAGE_BITS] = 0xff; + unsigned long mask; + int index = (addr >> TARGET_PAGE_BITS) / HOST_LONG_BITS; + int offset = (addr >> TARGET_PAGE_BITS) & (HOST_LONG_BITS - 1); + + mask = 1UL << offset; + phys_ram_vga_dirty[index] |= mask; + phys_ram_code_dirty[index] |= mask; + phys_ram_migration_dirty[index] |= mask; +} + +static inline void cpu_physical_memory_set_dirty_range(ram_addr_t addr, + unsigned long mask) +{ + int index = (addr >> TARGET_PAGE_BITS) / HOST_LONG_BITS; + + phys_ram_vga_dirty[index] |= mask; + phys_ram_code_dirty[index] |= mask; + phys_ram_migration_dirty[index] |= mask; } +static inline void cpu_physical_memory_set_dirty_flags(ram_addr_t addr, + int dirty_flags) +{ + unsigned long mask; + int index = (addr >> TARGET_PAGE_BITS) / HOST_LONG_BITS; + int offset = (addr >> TARGET_PAGE_BITS) & (HOST_LONG_BITS - 1); + + mask = 1UL << offset; + if (dirty_flags & VGA_DIRTY_FLAG) + phys_ram_vga_dirty[index] |= mask; + if (dirty_flags & CODE_DIRTY_FLAG) + phys_ram_code_dirty[index] |= mask; + if (dirty_flags & MIGRATION_DIRTY_FLAG) + phys_ram_migration_dirty[index] |= mask; +} + +static inline void cpu_physical_memory_mask_dirty_range(ram_addr_t start, + int length, + int dirty_flags) +{ + ram_addr_t addr = start; + unsigned long mask; + int index, offset, i; + + for (i = 0; i < length; i += TARGET_PAGE_SIZE) { + index = ((addr + i) >> TARGET_PAGE_BITS) / HOST_LONG_BITS; + offset = ((addr + i) >> TARGET_PAGE_BITS) & (HOST_LONG_BITS - 1); + mask = ~(1UL << offset); + + if (dirty_flags & VGA_DIRTY_FLAG) + phys_ram_vga_dirty[index] &= mask; + if (dirty_flags & CODE_DIRTY_FLAG) + phys_ram_code_dirty[index] &= mask; + if (dirty_flags & MIGRATION_DIRTY_FLAG) + phys_ram_migration_dirty[index] &= mask; + } +} + +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);