From e892037c3e5cf8ec5f0278dcbc97167831100a54 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Tue, 14 Jan 2014 15:07:23 +0100 Subject: [PATCH 12/40] memory: cpu_physical_memory_mask_dirty_range() always clears a single flag RH-Author: Juan Quintela Message-id: <1389712071-23303-13-git-send-email-quintela@redhat.com> Patchwork-id: 56667 O-Subject: [RHEL7 qemu-kvm PATCH 12/40] memory: cpu_physical_memory_mask_dirty_range() always clears a single flag Bugzilla: 997559 RH-Acked-by: Orit Wasserman RH-Acked-by: Dr. David Alan Gilbert (git) RH-Acked-by: Paolo Bonzini Document it Signed-off-by: Juan Quintela Reviewed-by: Eric Blake Reviewed-by: Orit Wasserman (cherry picked from commit 52159192919469b424b54c167312e53d5a62d233) Signed-off-by: Juan Quintela --- cputlb.c | 4 ++-- exec.c | 19 ++++++++++--------- include/exec/memory-internal.h | 40 ++++++++++++++++++---------------------- include/exec/memory.h | 3 --- memory.c | 10 ++++------ 5 files changed, 34 insertions(+), 42 deletions(-) Signed-off-by: Miroslav Rezanina --- cputlb.c | 4 ++-- exec.c | 19 ++++++++++--------- include/exec/memory-internal.h | 40 ++++++++++++++++++---------------------- include/exec/memory.h | 3 --- memory.c | 10 ++++------ 5 files changed, 34 insertions(+), 42 deletions(-) diff --git a/cputlb.c b/cputlb.c index 84e83e0..9c89c01 100644 --- a/cputlb.c +++ b/cputlb.c @@ -129,7 +129,7 @@ void tlb_protect_code(ram_addr_t ram_addr) { cpu_physical_memory_reset_dirty(ram_addr, 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 @@ -137,7 +137,7 @@ void tlb_protect_code(ram_addr_t ram_addr) void tlb_unprotect_code_phys(CPUArchState *env, ram_addr_t ram_addr, 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) diff --git a/exec.c b/exec.c index 069e082..8942d50 100644 --- a/exec.c +++ b/exec.c @@ -596,7 +596,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. */ void cpu_physical_memory_reset_dirty(ram_addr_t start, ram_addr_t end, - int dirty_flags) + unsigned client) { uintptr_t length; @@ -606,7 +606,7 @@ void cpu_physical_memory_reset_dirty(ram_addr_t start, ram_addr_t end, length = end - start; if (length == 0) return; - cpu_physical_memory_mask_dirty_range(start, length, dirty_flags); + cpu_physical_memory_mask_dirty_range(start, length, client); if (tcg_enabled()) { tlb_reset_dirty_range_all(start, end, length); @@ -1480,7 +1480,7 @@ static const MemoryRegionOps rom_mem_ops = { static void notdirty_mem_write(void *opaque, hwaddr ram_addr, 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); } switch (size) { @@ -1496,8 +1496,8 @@ static void notdirty_mem_write(void *opaque, hwaddr ram_addr, default: abort(); } - cpu_physical_memory_set_dirty_flag(ram_addr, MIGRATION_DIRTY_FLAG); - cpu_physical_memory_set_dirty_flag(ram_addr, VGA_DIRTY_FLAG); + cpu_physical_memory_set_dirty_flag(ram_addr, DIRTY_MEMORY_MIGRATION); + cpu_physical_memory_set_dirty_flag(ram_addr, DIRTY_MEMORY_VGA); /* we remove the notdirty callback only if the code has been flushed */ if (cpu_physical_memory_is_dirty(ram_addr)) @@ -1919,8 +1919,8 @@ static void invalidate_and_set_dirty(hwaddr addr, /* invalidate code */ tb_invalidate_phys_page_range(addr, addr + length, 0); /* set dirty bit */ - cpu_physical_memory_set_dirty_flag(addr, VGA_DIRTY_FLAG); - cpu_physical_memory_set_dirty_flag(addr, MIGRATION_DIRTY_FLAG); + cpu_physical_memory_set_dirty_flag(addr, DIRTY_MEMORY_VGA); + cpu_physical_memory_set_dirty_flag(addr, DIRTY_MEMORY_MIGRATION); } xen_modified_memory(addr, length); } @@ -2435,8 +2435,9 @@ void stl_phys_notdirty(hwaddr addr, uint32_t val) /* invalidate code */ tb_invalidate_phys_page_range(addr1, addr1 + 4, 0); /* set dirty bit */ - cpu_physical_memory_set_dirty_flag(addr1, MIGRATION_DIRTY_FLAG); - cpu_physical_memory_set_dirty_flag(addr1, VGA_DIRTY_FLAG); + cpu_physical_memory_set_dirty_flag(addr1, + DIRTY_MEMORY_MIGRATION); + cpu_physical_memory_set_dirty_flag(addr1, DIRTY_MEMORY_VGA); } } } diff --git a/include/exec/memory-internal.h b/include/exec/memory-internal.h index 794fabd..fbcd384 100644 --- a/include/exec/memory-internal.h +++ b/include/exec/memory-internal.h @@ -49,29 +49,25 @@ ram_addr_t qemu_ram_alloc(ram_addr_t size, MemoryRegion *mr); void qemu_ram_free(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, - 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) */ 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 code = cpu_physical_memory_get_dirty_flag(addr, CODE_DIRTY_FLAG); + bool vga = cpu_physical_memory_get_dirty_flag(addr, DIRTY_MEMORY_VGA); + bool code = cpu_physical_memory_get_dirty_flag(addr, DIRTY_MEMORY_CODE); 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; } static inline int cpu_physical_memory_get_dirty(ram_addr_t start, ram_addr_t length, - int dirty_flag) + unsigned client) { int ret = 0; ram_addr_t addr, end; @@ -79,28 +75,28 @@ static inline int cpu_physical_memory_get_dirty(ram_addr_t start, end = TARGET_PAGE_ALIGN(start + length); start &= TARGET_PAGE_MASK; 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; } 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) { - cpu_physical_memory_set_dirty_flag(addr, MIGRATION_DIRTY_FLAG); - cpu_physical_memory_set_dirty_flag(addr, VGA_DIRTY_FLAG); - cpu_physical_memory_set_dirty_flag(addr, CODE_DIRTY_FLAG); + cpu_physical_memory_set_dirty_flag(addr, DIRTY_MEMORY_MIGRATION); + cpu_physical_memory_set_dirty_flag(addr, DIRTY_MEMORY_VGA); + cpu_physical_memory_set_dirty_flag(addr, DIRTY_MEMORY_CODE); } -static inline int cpu_physical_memory_clear_dirty_flags(ram_addr_t addr, - int dirty_flags) +static inline int cpu_physical_memory_clear_dirty_flag(ram_addr_t addr, + unsigned client) { - int mask = ~dirty_flags; + int mask = ~(1 << client); return ram_list.phys_dirty[addr >> TARGET_PAGE_BITS] &= mask; } @@ -120,19 +116,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, ram_addr_t length, - int dirty_flags) + unsigned client) { ram_addr_t addr, end; end = TARGET_PAGE_ALIGN(start + length); start &= TARGET_PAGE_MASK; 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, - int dirty_flags); + unsigned client); extern const IORangeOps memory_region_iorange_ops; diff --git a/include/exec/memory.h b/include/exec/memory.h index 9e88320..868fdb1 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -30,9 +30,6 @@ typedef struct MemoryRegionOps MemoryRegionOps; typedef struct MemoryRegionPortio MemoryRegionPortio; 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_CODE 1 #define DIRTY_MEMORY_MIGRATION 3 diff --git a/memory.c b/memory.c index e7a454f..2883da5 100644 --- a/memory.c +++ b/memory.c @@ -1070,8 +1070,7 @@ bool memory_region_get_dirty(MemoryRegion *mr, hwaddr addr, hwaddr size, unsigned client) { assert(mr->terminates); - return cpu_physical_memory_get_dirty(mr->ram_addr + addr, size, - 1 << client); + return cpu_physical_memory_get_dirty(mr->ram_addr + addr, size, client); } void memory_region_set_dirty(MemoryRegion *mr, hwaddr addr, @@ -1086,12 +1085,11 @@ bool memory_region_test_and_clear_dirty(MemoryRegion *mr, hwaddr addr, { bool ret; assert(mr->terminates); - ret = cpu_physical_memory_get_dirty(mr->ram_addr + addr, size, - 1 << client); + ret = cpu_physical_memory_get_dirty(mr->ram_addr + addr, size, client); if (ret) { cpu_physical_memory_reset_dirty(mr->ram_addr + addr, mr->ram_addr + addr + size, - 1 << client); + client); } return ret; } @@ -1137,7 +1135,7 @@ void memory_region_reset_dirty(MemoryRegion *mr, hwaddr addr, assert(mr->terminates); cpu_physical_memory_reset_dirty(mr->ram_addr + addr, mr->ram_addr + addr + size, - 1 << client); + client); } void *memory_region_get_ram_ptr(MemoryRegion *mr) -- 1.7.1