From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Kmqf0-0000er-Ap for qemu-devel@nongnu.org; Mon, 06 Oct 2008 10:02:06 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Kmqez-0000eS-MO for qemu-devel@nongnu.org; Mon, 06 Oct 2008 10:02:05 -0400 Received: from [199.232.76.173] (port=40561 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Kmqez-0000eL-I1 for qemu-devel@nongnu.org; Mon, 06 Oct 2008 10:02:05 -0400 Received: from savannah.gnu.org ([199.232.41.3]:34011 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Kmqey-0006zV-RT for qemu-devel@nongnu.org; Mon, 06 Oct 2008 10:02:05 -0400 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1Kmqey-0007te-5h for qemu-devel@nongnu.org; Mon, 06 Oct 2008 14:02:04 +0000 Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1Kmqex-0007ta-QM for qemu-devel@nongnu.org; Mon, 06 Oct 2008 14:02:04 +0000 MIME-Version: 1.0 Errors-To: aliguori Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Anthony Liguori Message-Id: Date: Mon, 06 Oct 2008 14:02:03 +0000 Subject: [Qemu-devel] [5433] Add dirty tracking for live migration Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Revision: 5433 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5433 Author: aliguori Date: 2008-10-06 14:02:03 +0000 (Mon, 06 Oct 2008) Log Message: ----------- Add dirty tracking for live migration This patch adds a dirty tracking bit for live migration. We use 0x08 because kqemu uses 0x04. Signed-off-by: Anthony Liguori Modified Paths: -------------- trunk/cpu-all.h trunk/exec.c Modified: trunk/cpu-all.h =================================================================== --- trunk/cpu-all.h 2008-10-06 13:55:43 UTC (rev 5432) +++ trunk/cpu-all.h 2008-10-06 14:02:03 UTC (rev 5433) @@ -904,8 +904,10 @@ int cpu_memory_rw_debug(CPUState *env, target_ulong addr, uint8_t *buf, int len, int is_write); -#define VGA_DIRTY_FLAG 0x01 -#define CODE_DIRTY_FLAG 0x02 +#define VGA_DIRTY_FLAG 0x01 +#define CODE_DIRTY_FLAG 0x02 +#define KQEMU_DIRTY_FLAG 0x04 +#define MIGRATION_DIRTY_FLAG 0x08 /* read dirty bit (return 0 or 1) */ static inline int cpu_physical_memory_is_dirty(ram_addr_t addr) @@ -928,6 +930,10 @@ int dirty_flags); void cpu_tlb_update_dirty(CPUState *env); +int cpu_physical_memory_set_dirty_tracking(int enable); + +int cpu_physical_memory_get_dirty_tracking(void); + void dump_exec_info(FILE *f, int (*cpu_fprintf)(FILE *f, const char *fmt, ...)); Modified: trunk/exec.c =================================================================== --- trunk/exec.c 2008-10-06 13:55:43 UTC (rev 5432) +++ trunk/exec.c 2008-10-06 14:02:03 UTC (rev 5433) @@ -38,6 +38,7 @@ #include "qemu-common.h" #include "tcg.h" #include "hw/hw.h" +#include "osdep.h" #if defined(CONFIG_USER_ONLY) #include #endif @@ -113,6 +114,7 @@ int phys_ram_fd; uint8_t *phys_ram_base; uint8_t *phys_ram_dirty; +static int in_migration; static ram_addr_t phys_ram_alloc_offset = 0; #endif @@ -1809,6 +1811,17 @@ } } +int cpu_physical_memory_set_dirty_tracking(int enable) +{ + in_migration = enable; + return 0; +} + +int cpu_physical_memory_get_dirty_tracking(void) +{ + return in_migration; +} + static inline void tlb_update_dirty(CPUTLBEntry *tlb_entry) { ram_addr_t ram_addr; @@ -2964,9 +2977,19 @@ io_index = (pd >> IO_MEM_SHIFT) & (IO_MEM_NB_ENTRIES - 1); io_mem_write[io_index][2](io_mem_opaque[io_index], addr, val); } else { - ptr = phys_ram_base + (pd & TARGET_PAGE_MASK) + - (addr & ~TARGET_PAGE_MASK); + unsigned long addr1 = (pd & TARGET_PAGE_MASK) + (addr & ~TARGET_PAGE_MASK); + ptr = phys_ram_base + addr1; stl_p(ptr, val); + + if (unlikely(in_migration)) { + if (!cpu_physical_memory_is_dirty(addr1)) { + /* invalidate code */ + tb_invalidate_phys_page_range(addr1, addr1 + 4, 0); + /* set dirty bit */ + phys_ram_dirty[addr1 >> TARGET_PAGE_BITS] |= + (0xff & ~CODE_DIRTY_FLAG); + } + } } }