[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 13/29] ram_addr: tweaks to xen_modified_memory
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 13/29] ram_addr: tweaks to xen_modified_memory |
Date: |
Mon, 27 Apr 2015 18:28:21 +0200 |
Invoke xen_modified_memory from cpu_physical_memory_set_dirty_range_nocode;
it is akin to DIRTY_MEMORY_MIGRATION, so set it together with that bitmap.
The remaining call from invalidate_and_set_dirty's "else" branch will go
away soon.
Second, fix the second argument to the function in the
cpu_physical_memory_set_dirty_lebitmap call site. That function is only used
by KVM, but it is better to be clean anyway.
Acked-by: Stefano Stabellini <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
exec.c | 3 ++-
include/exec/ram_addr.h | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/exec.c b/exec.c
index 4717928..083d65d 100644
--- a/exec.c
+++ b/exec.c
@@ -2260,8 +2260,9 @@ static void invalidate_and_set_dirty(hwaddr addr,
if (cpu_physical_memory_range_includes_clean(addr, length)) {
tb_invalidate_phys_range(addr, addr + length, 0);
cpu_physical_memory_set_dirty_range_nocode(addr, length);
+ } else {
+ xen_modified_memory(addr, length);
}
- xen_modified_memory(addr, length);
}
static int memory_access_size(MemoryRegion *mr, unsigned l, hwaddr addr)
diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h
index ff558a4..7f6e928 100644
--- a/include/exec/ram_addr.h
+++ b/include/exec/ram_addr.h
@@ -112,6 +112,7 @@ static inline void
cpu_physical_memory_set_dirty_range_nocode(ram_addr_t start,
page = start >> TARGET_PAGE_BITS;
bitmap_set(ram_list.dirty_memory[DIRTY_MEMORY_MIGRATION], page, end -
page);
bitmap_set(ram_list.dirty_memory[DIRTY_MEMORY_VGA], page, end - page);
+ xen_modified_memory(start, length);
}
static inline void cpu_physical_memory_set_dirty_range(ram_addr_t start,
@@ -155,7 +156,7 @@ static inline void
cpu_physical_memory_set_dirty_lebitmap(unsigned long *bitmap,
ram_list.dirty_memory[DIRTY_MEMORY_CODE][page + k] |= temp;
}
}
- xen_modified_memory(start, pages);
+ xen_modified_memory(start, pages << TARGET_PAGE_BITS);
} else {
/*
* bitmap-traveling is faster than memory-traveling (for addr...)
--
1.8.3.1
- [Qemu-devel] [PATCH 04/29] display: add memory_region_sync_dirty_bitmap calls, (continued)
- [Qemu-devel] [PATCH 04/29] display: add memory_region_sync_dirty_bitmap calls, Paolo Bonzini, 2015/04/27
- [Qemu-devel] [PATCH 03/29] display: enable DIRTY_MEMORY_VGA tracking explicitly, Paolo Bonzini, 2015/04/27
- [Qemu-devel] [PATCH 05/29] memory: differentiate memory_region_is_logging and memory_region_get_dirty_log_mask, Paolo Bonzini, 2015/04/27
- [Qemu-devel] [PATCH 06/29] memory: prepare for multiple bits in the dirty log mask, Paolo Bonzini, 2015/04/27
- [Qemu-devel] [PATCH 07/29] framebuffer: check memory_region_is_logging, Paolo Bonzini, 2015/04/27
- [Qemu-devel] [PATCH 08/29] ui/console: remove dpy_gfx_update_dirty, Paolo Bonzini, 2015/04/27
- [Qemu-devel] [PATCH 10/29] kvm: accept non-mapped memory in kvm_dirty_pages_log_change, Paolo Bonzini, 2015/04/27
- [Qemu-devel] [PATCH 09/29] memory: track DIRTY_MEMORY_CODE in mr->dirty_log_mask, Paolo Bonzini, 2015/04/27
- [Qemu-devel] [PATCH 11/29] memory: include DIRTY_MEMORY_MIGRATION in the dirty log mask, Paolo Bonzini, 2015/04/27
- [Qemu-devel] [PATCH 12/29] kvm: remove special handling of DIRTY_MEMORY_MIGRATION in the dirty log mask, Paolo Bonzini, 2015/04/27
- [Qemu-devel] [PATCH 13/29] ram_addr: tweaks to xen_modified_memory,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 15/29] exec: move functions to translate-all.h, Paolo Bonzini, 2015/04/27
- [Qemu-devel] [PATCH 14/29] exec: use memory_region_get_dirty_log_mask to optimize dirty tracking, Paolo Bonzini, 2015/04/27
- [Qemu-devel] [PATCH 16/29] translate-all: remove unnecessary argument to tb_invalidate_phys_range, Paolo Bonzini, 2015/04/27
- [Qemu-devel] [PATCH 17/29] cputlb: remove useless arguments to tlb_unprotect_code_phys, rename, Paolo Bonzini, 2015/04/27
- [Qemu-devel] [PATCH 18/29] translate-all: make less of tb_invalidate_phys_page_range depend on is_cpu_write_access, Paolo Bonzini, 2015/04/27
- [Qemu-devel] [PATCH 21/29] exec: only check relevant bitmaps for cleanliness, Paolo Bonzini, 2015/04/27
- [Qemu-devel] [PATCH 20/29] exec: invert return value of cpu_physical_memory_get_clean, rename, Paolo Bonzini, 2015/04/27
- [Qemu-devel] [PATCH 22/29] memory: do not touch code dirty bitmap unless TCG is enabled, Paolo Bonzini, 2015/04/27
- [Qemu-devel] [PATCH 19/29] exec: pass client mask to cpu_physical_memory_set_dirty_range, Paolo Bonzini, 2015/04/27
- [Qemu-devel] [PATCH 23/29] bitmap: add atomic set functions, Paolo Bonzini, 2015/04/27