OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

memory: cpu_physical_memory_mask_dirty_range() always clears a single flag

Browse Source 
Document it

Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
This commit is contained in:
Juan Quintela 2013-10-08 12:44:04 +02:00
parent 75218e7f2b
commit 5215919291
5 changed files with 34 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cputlb.c
View File

@ -114,7 +114,7 @@ void tlb_protect_code(ram_addr_t ram_addr)
{ {
cpu_physical_memory_reset_dirty(ram_addr, cpu_physical_memory_reset_dirty(ram_addr,
ram_addr + TARGET_PAGE_SIZE, ram_addr + TARGET_PAGE_SIZE,
CODE_DIRTY_FLAG); DIRTY_MEMORY_CODE);
} }
/* update the TLB so that writes in physical page 'phys_addr' are no longer /* update the TLB so that writes in physical page 'phys_addr' are no longer
@ -122,7 +122,7 @@ void tlb_protect_code(ram_addr_t ram_addr)
void tlb_unprotect_code_phys(CPUArchState *env, ram_addr_t ram_addr, void tlb_unprotect_code_phys(CPUArchState *env, ram_addr_t ram_addr,
target_ulong vaddr) target_ulong vaddr)
{ {
cpu_physical_memory_set_dirty_flag(ram_addr, CODE_DIRTY_FLAG); cpu_physical_memory_set_dirty_flag(ram_addr, DIRTY_MEMORY_CODE);
} }
static bool tlb_is_dirty_ram(CPUTLBEntry *tlbe) static bool tlb_is_dirty_ram(CPUTLBEntry *tlbe)

19
exec.c
View File

@ -738,7 +738,7 @@ static void tlb_reset_dirty_range_all(ram_addr_t start, ram_addr_t end,
/* Note: start and end must be within the same ram block. */ /* 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, void cpu_physical_memory_reset_dirty(ram_addr_t start, ram_addr_t end,
int dirty_flags) unsigned client)
{ {
uintptr_t length; uintptr_t length;
@ -748,7 +748,7 @@ void cpu_physical_memory_reset_dirty(ram_addr_t start, ram_addr_t end,
length = end - start; length = end - start;
if (length == 0) if (length == 0)
return; return;
cpu_physical_memory_mask_dirty_range(start, length, dirty_flags); cpu_physical_memory_mask_dirty_range(start, length, client);
if (tcg_enabled()) { if (tcg_enabled()) {
tlb_reset_dirty_range_all(start, end, length); tlb_reset_dirty_range_all(start, end, length);
@ -1485,7 +1485,7 @@ found:
static void notdirty_mem_write(void *opaque, hwaddr ram_addr, static void notdirty_mem_write(void *opaque, hwaddr ram_addr,
uint64_t val, unsigned size) uint64_t val, unsigned size)
{ {
if (!cpu_physical_memory_get_dirty_flag(ram_addr, CODE_DIRTY_FLAG)) { if (!cpu_physical_memory_get_dirty_flag(ram_addr, DIRTY_MEMORY_CODE)) {
tb_invalidate_phys_page_fast(ram_addr, size); tb_invalidate_phys_page_fast(ram_addr, size);
} }
switch (size) { switch (size) {
@ -1501,8 +1501,8 @@ static void notdirty_mem_write(void *opaque, hwaddr ram_addr,
default: default:
abort(); abort();
} }
cpu_physical_memory_set_dirty_flag(ram_addr, MIGRATION_DIRTY_FLAG); cpu_physical_memory_set_dirty_flag(ram_addr, DIRTY_MEMORY_MIGRATION);
cpu_physical_memory_set_dirty_flag(ram_addr, VGA_DIRTY_FLAG); cpu_physical_memory_set_dirty_flag(ram_addr, DIRTY_MEMORY_VGA);
/* we remove the notdirty callback only if the code has been /* we remove the notdirty callback only if the code has been
flushed */ flushed */
if (cpu_physical_memory_is_dirty(ram_addr)) { if (cpu_physical_memory_is_dirty(ram_addr)) {
@ -1912,8 +1912,8 @@ static void invalidate_and_set_dirty(hwaddr addr,
/* invalidate code */ /* invalidate code */
tb_invalidate_phys_page_range(addr, addr + length, 0); tb_invalidate_phys_page_range(addr, addr + length, 0);
/* set dirty bit */ /* set dirty bit */
cpu_physical_memory_set_dirty_flag(addr, VGA_DIRTY_FLAG); cpu_physical_memory_set_dirty_flag(addr, DIRTY_MEMORY_VGA);
cpu_physical_memory_set_dirty_flag(addr, MIGRATION_DIRTY_FLAG); cpu_physical_memory_set_dirty_flag(addr, DIRTY_MEMORY_MIGRATION);
} }
xen_modified_memory(addr, length); xen_modified_memory(addr, length);
} }
@ -2528,8 +2528,9 @@ void stl_phys_notdirty(hwaddr addr, uint32_t val)
/* invalidate code */ /* invalidate code */
tb_invalidate_phys_page_range(addr1, addr1 + 4, 0); tb_invalidate_phys_page_range(addr1, addr1 + 4, 0);
/* set dirty bit */ /* set dirty bit */
cpu_physical_memory_set_dirty_flag(addr1, MIGRATION_DIRTY_FLAG); cpu_physical_memory_set_dirty_flag(addr1,
cpu_physical_memory_set_dirty_flag(addr1, VGA_DIRTY_FLAG); DIRTY_MEMORY_MIGRATION);
cpu_physical_memory_set_dirty_flag(addr1, DIRTY_MEMORY_VGA);
} }
} }
} }

40
include/exec/memory-internal.h
View File

@ -40,29 +40,25 @@ void *qemu_get_ram_ptr(ram_addr_t addr);
void qemu_ram_free(ram_addr_t addr); void qemu_ram_free(ram_addr_t addr);
void qemu_ram_free_from_ptr(ram_addr_t addr); void qemu_ram_free_from_ptr(ram_addr_t addr);
#define VGA_DIRTY_FLAG 0x01
#define CODE_DIRTY_FLAG 0x02
#define MIGRATION_DIRTY_FLAG 0x08
static inline bool cpu_physical_memory_get_dirty_flag(ram_addr_t addr, static inline bool cpu_physical_memory_get_dirty_flag(ram_addr_t addr,
int dirty_flag) unsigned client)
{ {
return ram_list.phys_dirty[addr >> TARGET_PAGE_BITS] & dirty_flag; return ram_list.phys_dirty[addr >> TARGET_PAGE_BITS] & (1 << client);
} }
/* read dirty bit (return 0 or 1) */ /* read dirty bit (return 0 or 1) */
static inline bool cpu_physical_memory_is_dirty(ram_addr_t addr) static inline bool cpu_physical_memory_is_dirty(ram_addr_t addr)
{ {
bool vga = cpu_physical_memory_get_dirty_flag(addr, VGA_DIRTY_FLAG); bool vga = cpu_physical_memory_get_dirty_flag(addr, DIRTY_MEMORY_VGA);
bool code = cpu_physical_memory_get_dirty_flag(addr, CODE_DIRTY_FLAG); bool code = cpu_physical_memory_get_dirty_flag(addr, DIRTY_MEMORY_CODE);
bool migration = bool migration =
cpu_physical_memory_get_dirty_flag(addr, MIGRATION_DIRTY_FLAG); cpu_physical_memory_get_dirty_flag(addr, DIRTY_MEMORY_MIGRATION);
return vga && code && migration; return vga && code && migration;
} }
static inline int cpu_physical_memory_get_dirty(ram_addr_t start, static inline int cpu_physical_memory_get_dirty(ram_addr_t start,
ram_addr_t length, ram_addr_t length,
int dirty_flag) unsigned client)
{ {
int ret = 0; int ret = 0;
ram_addr_t addr, end; ram_addr_t addr, end;
@ -70,28 +66,28 @@ static inline int cpu_physical_memory_get_dirty(ram_addr_t start,
end = TARGET_PAGE_ALIGN(start + length); end = TARGET_PAGE_ALIGN(start + length);
start &= TARGET_PAGE_MASK; start &= TARGET_PAGE_MASK;
for (addr = start; addr < end; addr += TARGET_PAGE_SIZE) { for (addr = start; addr < end; addr += TARGET_PAGE_SIZE) {
ret |= cpu_physical_memory_get_dirty_flag(addr, dirty_flag); ret |= cpu_physical_memory_get_dirty_flag(addr, client);
} }
return ret; return ret;
} }
static inline void cpu_physical_memory_set_dirty_flag(ram_addr_t addr, static inline void cpu_physical_memory_set_dirty_flag(ram_addr_t addr,
int dirty_flag) unsigned client)
{ {
ram_list.phys_dirty[addr >> TARGET_PAGE_BITS] |= dirty_flag; ram_list.phys_dirty[addr >> TARGET_PAGE_BITS] |= (1 << client);
} }
static inline void cpu_physical_memory_set_dirty(ram_addr_t addr) static inline void cpu_physical_memory_set_dirty(ram_addr_t addr)
{ {
cpu_physical_memory_set_dirty_flag(addr, MIGRATION_DIRTY_FLAG); cpu_physical_memory_set_dirty_flag(addr, DIRTY_MEMORY_MIGRATION);
cpu_physical_memory_set_dirty_flag(addr, VGA_DIRTY_FLAG); cpu_physical_memory_set_dirty_flag(addr, DIRTY_MEMORY_VGA);
cpu_physical_memory_set_dirty_flag(addr, CODE_DIRTY_FLAG); cpu_physical_memory_set_dirty_flag(addr, DIRTY_MEMORY_CODE);
} }
static inline int cpu_physical_memory_clear_dirty_flags(ram_addr_t addr, static inline int cpu_physical_memory_clear_dirty_flag(ram_addr_t addr,
int dirty_flags) unsigned client)
{ {
int mask = ~dirty_flags; int mask = ~(1 << client);
return ram_list.phys_dirty[addr >> TARGET_PAGE_BITS] &= mask; return ram_list.phys_dirty[addr >> TARGET_PAGE_BITS] &= mask;
} }
@ -111,19 +107,19 @@ static inline void cpu_physical_memory_set_dirty_range(ram_addr_t start,
static inline void cpu_physical_memory_mask_dirty_range(ram_addr_t start, static inline void cpu_physical_memory_mask_dirty_range(ram_addr_t start,
ram_addr_t length, ram_addr_t length,
int dirty_flags) unsigned client)
{ {
ram_addr_t addr, end; ram_addr_t addr, end;
end = TARGET_PAGE_ALIGN(start + length); end = TARGET_PAGE_ALIGN(start + length);
start &= TARGET_PAGE_MASK; start &= TARGET_PAGE_MASK;
for (addr = start; addr < end; addr += TARGET_PAGE_SIZE) { for (addr = start; addr < end; addr += TARGET_PAGE_SIZE) {
cpu_physical_memory_clear_dirty_flags(addr, dirty_flags); cpu_physical_memory_clear_dirty_flag(addr, client);
} }
} }
void cpu_physical_memory_reset_dirty(ram_addr_t start, ram_addr_t end, void cpu_physical_memory_reset_dirty(ram_addr_t start, ram_addr_t end,
int dirty_flags); unsigned client);
#endif #endif

3
include/exec/memory.h
View File

@ -33,9 +33,6 @@
typedef struct MemoryRegionOps MemoryRegionOps; typedef struct MemoryRegionOps MemoryRegionOps;
typedef struct MemoryRegionMmio MemoryRegionMmio; typedef struct MemoryRegionMmio MemoryRegionMmio;
/* Must match *_DIRTY_FLAGS in cpu-all.h. To be replaced with dynamic
* registration.
*/
#define DIRTY_MEMORY_VGA 0 #define DIRTY_MEMORY_VGA 0
#define DIRTY_MEMORY_CODE 1 #define DIRTY_MEMORY_CODE 1
#define DIRTY_MEMORY_MIGRATION 3 #define DIRTY_MEMORY_MIGRATION 3

10
memory.c
View File

@ -1174,8 +1174,7 @@ bool memory_region_get_dirty(MemoryRegion *mr, hwaddr addr,
hwaddr size, unsigned client) hwaddr size, unsigned client)
{ {
assert(mr->terminates); assert(mr->terminates);
return cpu_physical_memory_get_dirty(mr->ram_addr + addr, size, return cpu_physical_memory_get_dirty(mr->ram_addr + addr, size, client);
1 << client);
} }
void memory_region_set_dirty(MemoryRegion *mr, hwaddr addr, void memory_region_set_dirty(MemoryRegion *mr, hwaddr addr,
@ -1190,12 +1189,11 @@ bool memory_region_test_and_clear_dirty(MemoryRegion *mr, hwaddr addr,
{ {
bool ret; bool ret;
assert(mr->terminates); assert(mr->terminates);
ret = cpu_physical_memory_get_dirty(mr->ram_addr + addr, size, ret = cpu_physical_memory_get_dirty(mr->ram_addr + addr, size, client);
1 << client);
if (ret) { if (ret) {
cpu_physical_memory_reset_dirty(mr->ram_addr + addr, cpu_physical_memory_reset_dirty(mr->ram_addr + addr,
mr->ram_addr + addr + size, mr->ram_addr + addr + size,
1 << client); client);
} }
return ret; return ret;
} }
@ -1243,7 +1241,7 @@ void memory_region_reset_dirty(MemoryRegion *mr, hwaddr addr,
assert(mr->terminates); assert(mr->terminates);
cpu_physical_memory_reset_dirty(mr->ram_addr + addr, cpu_physical_memory_reset_dirty(mr->ram_addr + addr,
mr->ram_addr + addr + size, mr->ram_addr + addr + size,
1 << client); client);
} }
void *memory_region_get_ram_ptr(MemoryRegion *mr) void *memory_region_get_ram_ptr(MemoryRegion *mr)