memory: Add memory_region_sync() & make NVMe emulated device generic
v2 cover memory: Add memory_region_sync() & make NVMe emulated device generic
Remove the pointless dirty_log_mask check before msync'ing, let the NVMe emulated device be target-agnostic.
Supersedes: <[email protected]>
Philippe Mathieu-Daudé (4):
memory: Simplify memory_region_do_writeback()
memory: Rename memory_region_do_writeback() -> memory_region_sync() hw/block: Let the NVMe emulated device be target-agnostic
exec: Rename qemu_ram_writeback() as qemu_ram_msync()
include/exec/memory.h | 13 +++++++------ include/exec/ram_addr.h | 4 ++-- exec.c | 2 +- hw/block/nvme.c | 6 ++---- memory.c | 7 +++---- target/arm/helper.c | 2 +- hw/block/Makefile.objs | 2 +- 7 files changed, 17 insertions(+), 19 deletions(-)
Signature · 1 line
2.21.3
PATCH v2 1/4 memory: Simplify memory_region_do_writeback()
mr->dirty_log_mask tells if dirty tracking has been enabled, not if the page is dirty. It would always be true during live migration and when running on TCG, but otherwise it would always be false.
As the value of mr->dirty_log_mask does not matter, remove the check.
--- memory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
memory.c +1 -1
@@ -2204,7 +2204,7 @@ void memory_region_do_writeback(MemoryRegion *mr, hwaddr addr, hwaddr size)* Might be extended case needed to cover * different types of memory regions */ -if (mr->ram_block && mr->dirty_log_mask) { +if (mr->ram_block) {qemu_ram_writeback (mr->ram_block, addr, size); } }
Signature · 1 line
2.21.3
PATCH v2 2/4 memory: Rename memory_region_do_writeback() -> memory_region_sync()
In reply to Philippe Mathieu-DaudéWe usually use '_do_' for internal functions. Rename memory_region_do_writeback() as memory_region_sync() to better reflect what it does.
--- include/exec/memory.h | 13 +++++++------ memory.c | 2 +- target/arm/helper.c | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-)
include/exec/memory.h +7 -6
@@ -1474,14 +1474,15 @@ void *memory_region_get_ram_ptr(MemoryRegion *mr);void memory_region_ram_resize (MemoryRegion *mr,ram_addr_t newsize,Error **errp);/** -* memory_region_do_writeback: Trigger cache writeback or msync for -* selected address range +* memory_region_sync: Synchronize selected address range * -* @mr: the memory region to be updated -* @addr: the initial address of the range to be written back -* @size: the size of the range to be written back +* It is only meaningful for RAM regions, otherwise it is no-op. +* +* @mr: the memory region to be synchronized +* @addr: the initial address of the range to be sync +* @size: the size of the range to be sync */ -void memory_region_do_writeback (MemoryRegion *mr,hwaddr addr,hwaddr size); +void memory_region_sync (MemoryRegion *mr,hwaddr addr,hwaddr size);/** * memory_region_set_log: Turn dirty logging on or off for a region.
memory.c +1 -1
@@ -2198,7 +2198,7 @@ void memory_region_ram_resize(MemoryRegion *mr, ram_addr_t newsize, Error **errp } -void memory_region_do_writeback (MemoryRegion *mr,hwaddr addr,hwaddr size) +void memory_region_sync (MemoryRegion *mr,hwaddr addr,hwaddr size) {/* * Might be extended case needed to cover
target/arm/helper.c +1 -1
@@ -6829,7 +6829,7 @@ static void dccvap_writefn(CPUARMState *env, const ARMCPRegInfo *opaque, mr =memory_region_from_host (haddr, &offset);if (mr) { -memory_region_do_writeback (mr, offset, dline_size); +memory_region_sync (mr, offset, dline_size); } } }
Signature · 1 line
2.21.3
PATCH v2 3/4 hw/block: Let the NVMe emulated device be target-agnostic
In reply to Philippe Mathieu-DaudéNow than the non-target specific memory_region_sync() function is available, use it to make this device target-agnostic.
--- hw/block/nvme.c | 6 ++---- hw/block/Makefile.objs | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-)
hw/block/nvme.c +2 -4
@@ -46,8 +46,7 @@#include "qapi/visitor.h" #include "sysemu/hostmem.h" #include "sysemu/block-backend.h" -#include "exec/ram_addr.h" - +#include "exec/memory.h" #include "qemu/log.h" #include "qemu/module.h" #include "qemu/cutils.h"
@@ -1207,8 +1206,7 @@ static uint64_t nvme_mmio_read(void *opaque, hwaddr addr, unsigned size)*/ if (addr ==0xE08 && (NVME_PMRCAP_PMRWBM (n->bar.pmrcap) &0x02 )) { -qemu_ram_writeback (n->pmrdev->mr.ram_block, -0 , n->pmrdev->size); +memory_region_sync (&n->pmrdev->mr,0 , n->pmrdev->size); }memcpy (&val, ptr + addr, size); }else {
hw/block/Makefile.objs +1 -1
@@ -13,6 +13,6 @@ common-obj-$(CONFIG_SH4) += tc58128.o obj-$(CONFIG_VIRTIO_BLK) += virtio-blk.o obj-$(CONFIG_VHOST_USER_BLK) += vhost-user-blk.o -obj-$(CONFIG_NVME_PCI) += nvme.o +common-obj-$(CONFIG_NVME_PCI) += nvme.o obj-y += dataplane/
Signature · 1 line
2.21.3
PATCH v2 4/4 exec: Rename qemu_ram_writeback() as qemu_ram_msync()
In reply to Philippe Mathieu-DaudéRename qemu_ram_writeback() as qemu_ram_msync() to better match what it does.
--- include/exec/ram_addr.h | 4 ++-- exec.c | 2 +- memory.c | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-)
include/exec/ram_addr.h +2 -2
@@ -136,12 +136,12 @@ void qemu_ram_free(RAMBlock *block);int qemu_ram_resize (RAMBlock *block,ram_addr_t newsize,Error **errp); -void qemu_ram_writeback (RAMBlock *block,ram_addr_t start,ram_addr_t length); +void qemu_ram_msync (RAMBlock *block,ram_addr_t start,ram_addr_t length);/* Clear whole block of mem */ static inline void qemu_ram_block_writeback (RAMBlock *block) { -qemu_ram_writeback (block,0 , block->used_length); +qemu_ram_msync (block,0 , block->used_length); }#define DIRTY_CLIENTS_ALL ((1 << DIRTY_MEMORY_NUM) - 1)
exec.c +1 -1
@@ -2127,7 +2127,7 @@ int qemu_ram_resize(RAMBlock *block, ram_addr_t newsize, Error **errp)* Otherwise no-op. * @Note: this is supposed to be a synchronous op. */ -void qemu_ram_writeback (RAMBlock *block,ram_addr_t start,ram_addr_t length) +void qemu_ram_msync (RAMBlock *block,ram_addr_t start,ram_addr_t length) {/* The requested range should fit in within the block range */ g_assert ((start + length) <= block->used_length);
memory.c +1 -2
@@ -2197,7 +2197,6 @@ void memory_region_ram_resize(MemoryRegion *mr, ram_addr_t newsize, Error **errpqemu_ram_resize (mr->ram_block, newsize, errp); } -void memory_region_sync (MemoryRegion *mr,hwaddr addr,hwaddr size) {/*
@@ -2205,7 +2204,7 @@ void memory_region_sync(MemoryRegion *mr, hwaddr addr, hwaddr size)* different types of memory regions */ if (mr->ram_block) { -qemu_ram_writeback (mr->ram_block, addr, size); +qemu_ram_msync (mr->ram_block, addr, size); } }
Signature · 1 line
2.21.3
Re: [PATCH v2 4/4] exec: Rename qemu_ram_writeback() as qemu_ram_msync()
Quoted 2 lines · Philippe Mathieu-Daudé
Rename
qemu_ram_writeback()asqemu_ram_msync()to better match what it does.
Based on Juan's comment in the other email thread I think this commit description could be expanded. Let's explain the rationale for this change:
qemu_ram_writeback() and memory_region_do_writeback() have similar names but perform different functions. qemu_ram_writeback() is concerned with syncing changes to the underlying memory device (NVDIMM or file-backed RAM). memory_region_do_writeback() is concerned with dirty memory logging.
Rename qemu_ram_writeback() to prevent confusion with memory_region_do_writeback().
Quoted 65 lines
Suggested-by Stefan Hajnoczi <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- include/exec/ram_addr.h | 4 ++-- exec.c | 2 +- memory.c | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-)include/exec/ram_addr.h +2
-2@@ -136,12 +136,12 @@ void qemu_ram_free(RAMBlock *block);int qemu_ram_resize (RAMBlock *block,ram_addr_t newsize,Error **errp); -void qemu_ram_writeback (RAMBlock *block,ram_addr_t start,ram_addr_t length); +void qemu_ram_msync (RAMBlock *block,ram_addr_t start,ram_addr_t length);/* Clear whole block of mem */ static inline void qemu_ram_block_writeback (RAMBlock *block) { -qemu_ram_writeback (block,0 , block->used_length); +qemu_ram_msync (block,0 , block->used_length); }#define DIRTY_CLIENTS_ALL ((1 << DIRTY_MEMORY_NUM) - 1)exec.c +1
-1@@ -2127,7 +2127,7 @@ int qemu_ram_resize(RAMBlock *block, ram_addr_t newsize, Error **errp)* Otherwise no-op. * @Note: this is supposed to be a synchronous op. */ -void qemu_ram_writeback (RAMBlock *block,ram_addr_t start,ram_addr_t length) +void qemu_ram_msync (RAMBlock *block,ram_addr_t start,ram_addr_t length) {/* The requested range should fit in within the block range */ g_assert ((start + length) <= block->used_length);memory.c +1
-2@@ -2197,7 +2197,6 @@ void memory_region_ram_resize(MemoryRegion *mr, ram_addr_t newsize, Error **errpqemu_ram_resize (mr->ram_block, newsize, errp); } -void memory_region_sync (MemoryRegion *mr,hwaddr addr,hwaddr size) {/* @@ -2205,7 +2204,7 @@ void memory_region_sync(MemoryRegion *mr, hwaddr addr, hwaddr size)* different types of memory regions */ if (mr->ram_block) { -qemu_ram_writeback (mr->ram_block, addr, size); +qemu_ram_msync (mr->ram_block, addr, size); } }Signature · 1 line
2.21.3