[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC v2 02/20] memory: implement dirty tracking
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [RFC v2 02/20] memory: implement dirty tracking |
Date: |
Mon, 27 Jun 2011 16:21:49 +0300 |
Currently dirty tracking is implemented by passing through
all calls to the underlying cpu_physical_memory_*() calls.
Signed-off-by: Avi Kivity <address@hidden>
---
memory.c | 39 +++++++++++++++++++++++++++++++--------
memory.h | 1 +
2 files changed, 32 insertions(+), 8 deletions(-)
diff --git a/memory.c b/memory.c
index 43499c3..d962fff 100644
--- a/memory.c
+++ b/memory.c
@@ -69,6 +69,7 @@ struct FlatRange {
MemoryRegion *mr;
target_phys_addr_t offset_in_region;
AddrRange addr;
+ uint8_t dirty_log_mask;
};
/* Flattened global view of current active memory hierarchy. Kept in sorted
@@ -177,6 +178,7 @@ static void render_memory_region(FlatView *view,
fr.mr = mr;
fr.offset_in_region = offset_in_region;
fr.addr = addrrange_make(base, now);
+ fr.dirty_log_mask = mr->dirty_log_mask;
flatview_insert(view, i, &fr);
++i;
base += now;
@@ -194,6 +196,7 @@ static void render_memory_region(FlatView *view,
fr.mr = mr;
fr.offset_in_region = offset_in_region;
fr.addr = addrrange_make(base, remain);
+ fr.dirty_log_mask = mr->dirty_log_mask;
flatview_insert(view, i, &fr);
}
}
@@ -247,9 +250,14 @@ static void memory_region_update_topology(void)
} else if (frold && frnew && flatrange_equal(frold, frnew)) {
/* In both (logging may have changed) */
+ if (frold->dirty_log_mask && !frnew->dirty_log_mask) {
+ cpu_physical_log_stop(frnew->addr.start, frnew->addr.size);
+ } else if (frnew->dirty_log_mask && !frold->dirty_log_mask) {
+ cpu_physical_log_start(frnew->addr.start, frnew->addr.size);
+ }
+
++iold;
++inew;
- /* FIXME: dirty logging */
} else {
/* In new */
@@ -267,7 +275,7 @@ static void memory_region_update_topology(void)
frnew->addr.size,
phys_offset,
region_offset,
- 0);
+ frnew->dirty_log_mask);
++inew;
}
}
@@ -292,6 +300,7 @@ void memory_region_init(MemoryRegion *mr,
memset(&mr->subregions_link, 0, sizeof mr->subregions_link);
QTAILQ_INIT(&mr->coalesced);
mr->name = qemu_strdup(name);
+ mr->dirty_log_mask = 0;
}
static bool memory_region_access_valid(MemoryRegion *mr,
@@ -494,24 +503,35 @@ void memory_region_set_offset(MemoryRegion *mr,
target_phys_addr_t offset)
void memory_region_set_log(MemoryRegion *mr, bool log, unsigned client)
{
- /* FIXME */
+ uint8_t mask = 1 << client;
+
+ mr->dirty_log_mask = (mr->dirty_log_mask & ~mask) | (log * mask);
+ memory_region_update_topology();
}
bool memory_region_get_dirty(MemoryRegion *mr, target_phys_addr_t addr,
unsigned client)
{
- /* FIXME */
- return true;
+ assert(mr->has_ram_addr);
+ return cpu_physical_memory_get_dirty(mr->ram_addr + addr, 1 << client);
}
void memory_region_set_dirty(MemoryRegion *mr, target_phys_addr_t addr)
{
- /* FIXME */
+ assert(mr->has_ram_addr);
+ return cpu_physical_memory_set_dirty(mr->ram_addr + addr);
}
void memory_region_sync_dirty_bitmap(MemoryRegion *mr)
{
- /* FIXME */
+ FlatRange *fr;
+
+ FOR_EACH_FLAT_RANGE(fr, ¤t_memory_map) {
+ if (fr->mr == mr) {
+ cpu_physical_sync_dirty_bitmap(fr->addr.start,
+ fr->addr.start + fr->addr.size);
+ }
+ }
}
void memory_region_set_readonly(MemoryRegion *mr, bool readonly)
@@ -522,7 +542,10 @@ void memory_region_set_readonly(MemoryRegion *mr, bool
readonly)
void memory_region_reset_dirty(MemoryRegion *mr, target_phys_addr_t addr,
target_phys_addr_t size, unsigned client)
{
- /* FIXME */
+ assert(mr->has_ram_addr);
+ cpu_physical_memory_reset_dirty(mr->ram_addr + addr,
+ mr->ram_addr + addr + size,
+ 1 << client);
}
void *memory_region_get_ram_ptr(MemoryRegion *mr)
diff --git a/memory.h b/memory.h
index a67ff94..2bf9625 100644
--- a/memory.h
+++ b/memory.h
@@ -85,6 +85,7 @@ struct MemoryRegion {
QTAILQ_ENTRY(MemoryRegion) subregions_link;
QTAILQ_HEAD(coalesced_ranges, CoalescedMemoryRange) coalesced;
const char *name;
+ uint8_t dirty_log_mask;
};
/* Initialize a memory region
--
1.7.5.3
- [Qemu-devel] [RFC v2 00/20] Memory API, Avi Kivity, 2011/06/27
- [Qemu-devel] [RFC v2 08/20] pc: move global memory map out of pc_init1() and into its callers, Avi Kivity, 2011/06/27
- [Qemu-devel] [RFC v2 18/20] cirrus: simplify vga window mmio access functions, Avi Kivity, 2011/06/27
- [Qemu-devel] [RFC v2 14/20] vmsvga: don't remember pci BAR address in callback any more, Avi Kivity, 2011/06/27
- [Qemu-devel] [RFC v2 06/20] pc: grab system_memory, Avi Kivity, 2011/06/27
- [Qemu-devel] [RFC v2 05/20] exec.c: initialize memory map, Avi Kivity, 2011/06/27
- [Qemu-devel] [RFC v2 20/20] cirrus: simplify linear framebuffer access functions, Avi Kivity, 2011/06/27
- [Qemu-devel] [RFC v2 02/20] memory: implement dirty tracking,
Avi Kivity <=
- [Qemu-devel] [RFC v2 17/20] cirrus: simplify bitblt BAR access functions, Avi Kivity, 2011/06/27
- [Qemu-devel] [RFC v2 07/20] pc: convert pc_memory_init() to memory API, Avi Kivity, 2011/06/27
- [Qemu-devel] [RFC v2 12/20] usb-ohci: convert to MemoryRegion, Avi Kivity, 2011/06/27
- [Qemu-devel] [RFC v2 09/20] pci: pass address space to pci bus when created, Avi Kivity, 2011/06/27
- [Qemu-devel] [RFC v2 16/20] cirrus: simplify mmio BAR access functions, Avi Kivity, 2011/06/27
- [Qemu-devel] [RFC v2 19/20] vga: simplify vga window mmio access functions, Avi Kivity, 2011/06/27
- [Qemu-devel] [RFC v2 15/20] vga: convert vga and its derivatives to the memory API, Avi Kivity, 2011/06/27
- [Qemu-devel] [RFC v2 03/20] memory: merge adjacent segments of a single memory region, Avi Kivity, 2011/06/27