RAM_NORESERVE, MAP_NORESERVE and hostmem "reserve" property
Subsystems (2)
v5 cover RAM_NORESERVE, MAP_NORESERVE and hostmem "reserve" property
Based-on: [email protected]
Some cleanups previously sent in other context (resizeable allocations), followed by RAM_NORESERVE, implementing it under Linux using MAP_NORESERVE, and letting users configure it for memory backens using the "reserve" property (default: true).
MAP_NORESERVE under Linux has in the context of QEMU an effect on
1) Private/shared anonymous memory
-> memory-backend-ram,id=mem0,size=10G
2) Private fd-based mappings
-> memory-backend-file,id=mem0,size=10G,mem-path=/dev/shm/0 -> memory-backend-memfd,id=mem0,size=10G
3) Private/shared hugetlb mappings
-> memory-backend-memfd,id=mem0,size=10G,hugetlb=on,hugetlbsize=2M
With MAP_NORESERVE/"reserve=off", we won't be reserving swap space (1/2) or huge pages (3) for the whole memory region.
The target use case is virtio-mem, which dynamically exposes memory inside a large, sparse memory area to the VM. MAP_NORESERVE tells the OS "this mapping might be very sparse". This essentially allows avoiding having to set "/proc/sys/vm/overcommit_memory == 1") when using virtio-mem and also supporting hugetlbfs in the future.
v4 -> v5:
- Sent out shared anonymous RAM fixes separately
- Rebased
- "hostmem: Wire up RAM_NORESERVE via "reserve" property" -- Adjusted/simplified description of new "reserve" property -- Properly add it to qapi/qom.json
- "qmp: Clarify memory backend properties returned via query-memdev" -- Added
- "qmp: Include "share" property of memory backends"
-- Added
- "hmp: Print "share" property of memory backends with "info memdev""
- Added
- "qmp: Include "reserve" property of memory backends"
-- Adjust description of new "reserve" property
v3 -> v4:
- Minor comment/description updates
- "softmmu/physmem: Fix ram_block_discard_range() to handle shared ..." -- Extended description
- "util/mmap-alloc: Pass flags instead of separate bools to ..." -- Move flags to include/qemu/osdep.h and rename to "QEMU_MAP_*"
- "memory: Introduce RAM_NORESERVE and wire it up in qemu_ram_mmap()" -- Adjust to new flags. Handle errors in mmap_activate() for now.
- "util/mmap-alloc: Support RAM_NORESERVE via MAP_NORESERVE under Linux" -- Restrict support to Linux only for now
- "qmp: Include "reserve" property of memory backends"
-- Added
- "hmp: Print "reserve" property of memory backends with ..." -- Added
v2 -> v3:
- Renamed "softmmu/physmem: Drop "shared" parameter from ram_block_add()" to "softmmu/physmem: Mark shared anonymous memory RAM_SHARED" and adjusted the description
- Added "softmmu/physmem: Fix ram_block_discard_range() to handle shared anonymous memory"
- Added "softmmu/physmem: Fix qemu_ram_remap() to handle shared anonymous memory"
- Added "util/mmap-alloc: Pass flags instead of separate bools to qemu_ram_mmap()"
- "util/mmap-alloc: Support RAM_NORESERVE via MAP_NORESERVE" -- Further tweak code comments
-- Handle shared anonymous memory
v1 -> v2:
- Rebased to upstream and phs_mem_alloc simplifications
-- Upsteam added the "map_offset" parameter to many RAM allocation
interfaces.
- "softmmu/physmem: Drop "shared" parameter from ram_block_add()" -- Use local variable "shared"
- "memory: introduce RAM_NORESERVE and wire it up in qemu_ram_mmap()" -- Simplify due to phs_mem_alloc changes
- "util/mmap-alloc: Support RAM_NORESERVE via MAP_NORESERVE" -- Add a whole bunch of comments.
-- Exclude shared anonymous memory that QEMU doesn't use -- Special-case readonly mappings
David Hildenbrand (14):
util/mmap-alloc: Factor out calculation of the pagesize for the guard
page
util/mmap-alloc: Factor out reserving of a memory region to
mmap_reserve()
util/mmap-alloc: Factor out activating of memory to mmap_activate() softmmu/memory: Pass ram_flags to qemu_ram_alloc_from_fd() softmmu/memory: Pass ram_flags to
memory_region_init_ram_shared_nomigrate()
util/mmap-alloc: Pass flags instead of separate bools to
qemu_ram_mmap()
memory: Introduce RAM_NORESERVE and wire it up in qemu_ram_mmap() util/mmap-alloc: Support RAM_NORESERVE via MAP_NORESERVE under Linux
hostmem: Wire up RAM_NORESERVE via "reserve" property
qmp: Clarify memory backend properties returned via query-memdev
qmp: Include "share" property of memory backends
hmp: Print "share" property of memory backends with "info memdev"
qmp: Include "reserve" property of memory backends
hmp: Print "reserve" property of memory backends with "info memdev"
backends/hostmem-file.c | 11 +- backends/hostmem-memfd.c | 8 +- backends/hostmem-ram.c | 7 +- backends/hostmem.c | 32 +++ hw/core/machine-hmp-cmds.c | 4 + hw/core/machine-qmp-cmds.c | 2 + hw/m68k/next-cube.c | 4 +- hw/misc/ivshmem.c | 5 +- include/exec/cpu-common.h | 1 + include/exec/memory.h | 42 ++-- include/exec/ram_addr.h | 9 +- include/qemu/mmap-alloc.h | 16 +- include/qemu/osdep.h | 30 ++- include/sysemu/hostmem.h | 2 +- migration/ram.c | 3 +- qapi/machine.json | 13 +- qapi/qom.json | 4 + .../memory-region-housekeeping.cocci | 8 +- softmmu/memory.c | 27 ++- softmmu/physmem.c | 44 ++-- util/mmap-alloc.c | 212 +++++++++++++----- util/oslib-posix.c | 7 +- util/oslib-win32.c | 13 +- 23 files changed, 349 insertions(+), 155 deletions(-)
Signature · 1 line
2.30.2
PATCH v5 1/14 util/mmap-alloc: Factor out calculation of the pagesize for the guard page
Let's factor out calculating the size of the guard page and rename the variable to make it clearer that this pagesize only applies to the guard page.
--- util/mmap-alloc.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-)
util/mmap-alloc.c +16 -15
@@ -82,6 +82,16 @@ size_t qemu_mempath_getpagesize(const char *mem_path)return qemu_real_host_page_size; } +static inline size_t mmap_guard_pagesize (int fd) +{ +#if defined(__powerpc64__) && defined(__linux__) +/* Mappings in the same segment must share the same page size */ +return qemu_fd_getpagesize (fd); +#else +return qemu_real_host_page_size; +#endif +} + void *qemu_ram_mmap(int fd, size_t size, size_t align,
@@ -90,12 +100,12 @@ void *qemu_ram_mmap(int fd, bool is_pmem, off_t map_offset) { +const size_t guard_pagesize =mmap_guard_pagesize (fd);int prot;int flags;int map_sync_flags =0 ;int guardfd;size_t offset; -size_t pagesize;size_t total;void *guardptr;void *ptr;
@@ -116,8 +126,7 @@ void *qemu_ram_mmap(int fd,* anonymous memory is OK. */ flags =MAP_PRIVATE ; - pagesize =qemu_fd_getpagesize (fd); -if (fd ==-1 || pagesize == qemu_real_host_page_size) { +if (fd ==-1 || guard_pagesize == qemu_real_host_page_size) { guardfd =-1 ; flags |=MAP_ANONYMOUS ; }else {
@@ -126,7 +135,6 @@ void *qemu_ram_mmap(int fd, }#else guardfd =-1 ; - pagesize = qemu_real_host_page_size; flags =MAP_PRIVATE |MAP_ANONYMOUS ;#endif
@@ -138,7 +146,7 @@ void *qemu_ram_mmap(int fd,assert (is_power_of_2 (align));/* Always align to host page size */ -assert (align >= pagesize); +assert (align >= guard_pagesize); flags =MAP_FIXED ; flags |= fd ==-1 ?MAP_ANONYMOUS :0 ;
@@ -193,8 +201,8 @@ void *qemu_ram_mmap(int fd,* a guard page guarding against potential buffer overflows. */ total -= offset; -if (total > size + pagesize) { -munmap (ptr + size + pagesize, total - size - pagesize); +if (total > size + guard_pagesize) { +munmap (ptr + size + guard_pagesize, total - size - guard_pagesize); }return ptr;
@@ -202,15 +210,8 @@ void *qemu_ram_mmap(int fd,void qemu_ram_munmap (int fd,void *ptr,size_t size) { -size_t pagesize; -if (ptr) {/* Unmap both the RAM block and the guard page */ -#if defined(__powerpc64__) && defined(__linux__) - pagesize =qemu_fd_getpagesize (fd); -#else - pagesize = qemu_real_host_page_size; -#endif -munmap (ptr, size + pagesize); +munmap (ptr, size +mmap_guard_pagesize (fd)); } }
Signature · 1 line
2.30.2
PATCH v5 2/14 util/mmap-alloc: Factor out reserving of a memory region to mmap_reserve()
In reply to David HildenbrandWe want to reserve a memory region without actually populating memory. Let's factor that out.
--- util/mmap-alloc.c | 58 +++++++++++++++++++++++++++-------------------- 1 file changed, 33 insertions(+), 25 deletions(-)
util/mmap-alloc.c +33 -25
@@ -82,6 +82,38 @@ size_t qemu_mempath_getpagesize(const char *mem_path)return qemu_real_host_page_size; } +/* +* Reserve a new memory region of the requested size to be used for mapping +* from the given fd (if any). +*/ +static void *mmap_reserve (size_t size,int fd) +{ +int flags =MAP_PRIVATE ; + +#if defined(__powerpc64__) && defined(__linux__) +/* +* On ppc64 mappings in the same segment (aka slice) must share the same +* page size. Since we will be re-allocating part of this segment +* from the supplied fd, we should make sure to use the same page size, to +* this end we mmap the supplied fd. In this case, set MAP_NORESERVE to +* avoid allocating backing store memory. +* We do this unless we are using the system page size, in which case +* anonymous memory is OK. +*/ +if (fd ==-1 ||qemu_fd_getpagesize (fd) == qemu_real_host_page_size) { + fd =-1 ; + flags |=MAP_ANONYMOUS ; + }else { + flags |=MAP_NORESERVE ; + } +#else + fd =-1 ; + flags |=MAP_ANONYMOUS ; +#endif + +return mmap (0 , size,PROT_NONE , flags, fd,0 ); +} +static inline size_t mmap_guard_pagesize (int fd) {#if defined(__powerpc64__) && defined(__linux__)
@@ -104,7 +136,6 @@ void *qemu_ram_mmap(int fd,int prot;int flags;int map_sync_flags =0 ; -int guardfd;size_t offset;size_t total;void *guardptr;
@@ -116,30 +147,7 @@ void *qemu_ram_mmap(int fd,*/ total = size + align; -#if defined(__powerpc64__) && defined(__linux__) -/* On ppc64 mappings in the same segment (aka slice) must share the same -* page size. Since we will be re-allocating part of this segment -* from the supplied fd, we should make sure to use the same page size, to -* this end we mmap the supplied fd. In this case, set MAP_NORESERVE to -* avoid allocating backing store memory. -* We do this unless we are using the system page size, in which case -* anonymous memory is OK. -*/ - flags =MAP_PRIVATE ; -if (fd ==-1 || guard_pagesize == qemu_real_host_page_size) { - guardfd =-1 ; - flags |=MAP_ANONYMOUS ; - }else { - guardfd = fd; - flags |=MAP_NORESERVE ; - } -#else - guardfd =-1 ; - flags =MAP_PRIVATE |MAP_ANONYMOUS ; -#endif - - guardptr =mmap (0 , total,PROT_NONE , flags, guardfd,0 ); - + guardptr =mmap_reserve (total, fd);if (guardptr ==MAP_FAILED ) {return MAP_FAILED ; }
Signature · 1 line
2.30.2
PATCH v5 3/14 util/mmap-alloc: Factor out activating of memory to mmap_activate()
In reply to David HildenbrandWe want to activate memory within a reserved memory region, to make it accessible. Let's factor that out.
--- util/mmap-alloc.c | 94 +++++++++++++++++++++++++---------------------- 1 file changed, 50 insertions(+), 44 deletions(-)
util/mmap-alloc.c +50 -44
@@ -114,6 +114,52 @@ static void *mmap_reserve(size_t size, int fd)return mmap (0 , size,PROT_NONE , flags, fd,0 ); } +/* +* Activate memory in a reserved region from the given fd (if any), to make +* it accessible. +*/ +static void *mmap_activate (void *ptr,size_t size,int fd,bool readonly, +bool shared,bool is_pmem,off_t map_offset) +{ +const int prot =PROT_READ | (readonly ?0 :PROT_WRITE ); +int map_sync_flags =0 ; +int flags =MAP_FIXED ; +void *activated_ptr; + + flags |= fd ==-1 ?MAP_ANONYMOUS :0 ; + flags |= shared ?MAP_SHARED :MAP_PRIVATE ; +if (shared && is_pmem) { + map_sync_flags =MAP_SYNC |MAP_SHARED_VALIDATE ; + } + + activated_ptr =mmap (ptr, size, prot, flags | map_sync_flags, fd, + map_offset); +if (activated_ptr ==MAP_FAILED && map_sync_flags) { +if (errno ==ENOTSUP ) { +char *proc_link =g_strdup_printf ("/proc/self/fd/%d" , fd); +char *file_name =g_malloc0 (PATH_MAX ); +int len =readlink (proc_link, file_name,PATH_MAX -1 ); + +if (len <0 ) { + len =0 ; + } + file_name[len] ='\0' ; +fprintf (stderr,"Warning: requesting persistence across crashes " +"for backend file %s failed. Proceeding without " +"persistence, data might become corrupted in case of host " +"crash.\n" , file_name); +g_free (proc_link); +g_free (file_name); + } +/* +* If mmap failed with MAP_SHARED_VALIDATE | MAP_SYNC, we will try +* again without these flags to handle backwards compatibility. +*/ + activated_ptr =mmap (ptr, size, prot, flags, fd, map_offset); + } +return activated_ptr; +} +static inline size_t mmap_guard_pagesize (int fd) {#if defined(__powerpc64__) && defined(__linux__)
@@ -133,13 +179,8 @@ void *qemu_ram_mmap(int fd, off_t map_offset) {const size_t guard_pagesize =mmap_guard_pagesize (fd); -int prot; -int flags; -int map_sync_flags =0 ; -size_t offset; -size_t total; -void *guardptr; -void *ptr; +size_t offset, total; +void *ptr, *guardptr;/* * Note: this always allocates at least one extra page of virtual address
@@ -156,45 +197,10 @@ void *qemu_ram_mmap(int fd,/* Always align to host page size */ assert (align >= guard_pagesize); - flags =MAP_FIXED ; - flags |= fd ==-1 ?MAP_ANONYMOUS :0 ; - flags |= shared ?MAP_SHARED :MAP_PRIVATE ; -if (shared && is_pmem) { - map_sync_flags =MAP_SYNC |MAP_SHARED_VALIDATE ; - } - offset =QEMU_ALIGN_UP ((uintptr_t )guardptr, align) - (uintptr_t )guardptr; - prot =PROT_READ | (readonly ?0 :PROT_WRITE ); - - ptr =mmap (guardptr + offset, size, prot, - flags | map_sync_flags, fd, map_offset); - -if (ptr ==MAP_FAILED && map_sync_flags) { -if (errno ==ENOTSUP ) { -char *proc_link, *file_name; -int len; - proc_link =g_strdup_printf ("/proc/self/fd/%d" , fd); - file_name =g_malloc0 (PATH_MAX ); - len =readlink (proc_link, file_name,PATH_MAX -1 ); -if (len <0 ) { - len =0 ; - } - file_name[len] ='\0' ; -fprintf (stderr,"Warning: requesting persistence across crashes " -"for backend file %s failed. Proceeding without " -"persistence, data might become corrupted in case of host " -"crash.\n" , file_name); -g_free (proc_link); -g_free (file_name); - } -/* -* if map failed with MAP_SHARED_VALIDATE | MAP_SYNC, -* we will remove these flags to handle compatibility. -*/ - ptr =mmap (guardptr + offset, size, prot, flags, fd, map_offset); - } - + ptr =mmap_activate (guardptr + offset, size, fd, readonly, shared, is_pmem, + map_offset);if (ptr ==MAP_FAILED ) {munmap (guardptr, total);return MAP_FAILED ;
Signature · 1 line
2.30.2
PATCH v5 4/14 softmmu/memory: Pass ram_flags to qemu_ram_alloc_from_fd()
In reply to David HildenbrandLet's pass in ram flags just like we do with qemu_ram_alloc_from_file(), to clean up and prepare for more flags.
Simplify the documentation of passed ram flags: Looking at our documentation of RAM_SHARED and RAM_PMEM is sufficient, no need to be repetitive.
--- backends/hostmem-memfd.c | 7 ++++--- hw/misc/ivshmem.c | 5 ++--- include/exec/memory.h | 9 +++------ include/exec/ram_addr.h | 6 +----- softmmu/memory.c | 7 +++---- 5 files changed, 13 insertions(+), 21 deletions(-)
backends/hostmem-memfd.c +4 -3
@@ -36,6 +36,7 @@ static void memfd_backend_memory_alloc(HostMemoryBackend *backend, Error **errp) {HostMemoryBackendMemfd *m =MEMORY_BACKEND_MEMFD (backend); +uint32_t ram_flags;char *name;int fd;
@@ -53,9 +54,9 @@ memfd_backend_memory_alloc(HostMemoryBackend *backend, Error **errp) } name =host_memory_backend_get_name (backend); -memory_region_init_ram_from_fd (&backend->mr,OBJECT (backend), - name, backend->size, - backend->share, fd,0 , errp); + ram_flags = backend->share ?RAM_SHARED :0 ; +memory_region_init_ram_from_fd (&backend->mr,OBJECT (backend), name, + backend->size, ram_flags, fd,0 , errp);g_free (name); }
hw/misc/ivshmem.c +2 -3
@@ -493,9 +493,8 @@ static void process_msg_shmem(IVShmemState *s, int fd, Error **errp) size = buf.st_size;/* mmap the region and map into the BAR2 */ -memory_region_init_ram_from_fd (&s->server_bar2,OBJECT (s), -"ivshmem.bar2" , size, true, fd,0 , - &local_err); +memory_region_init_ram_from_fd (&s->server_bar2,OBJECT (s),"ivshmem.bar2" , + size,RAM_SHARED , fd,0 , &local_err);if (local_err) {error_propagate (errp, local_err);return ;
include/exec/memory.h +3 -6
@@ -991,10 +991,7 @@ void memory_region_init_resizeable_ram(MemoryRegion *mr,* @size: size of the region. * @align: alignment of the region base address; if 0, the default alignment * (getpagesize()) will be used. -* @ram_flags: Memory region features: -* - RAM_SHARED: memory must be mmaped with the MAP_SHARED flag -* - RAM_PMEM: the memory is persistent memory -* Other bits are ignored now. +* @ram_flags: RamBlock flags. Supported flags: RAM_SHARED, RAM_PMEM. * @path: the path in which to allocate the RAM. * @readonly: true to open @path for reading, false for read/write. * @errp: pointer to Error*, to store an error if it happens.
@@ -1020,7 +1017,7 @@ void memory_region_init_ram_from_file(MemoryRegion *mr,* @owner: the object that tracks the region's reference count * @name: the name of the region. * @size: size of the region. -* @share: %true if memory must be mmaped with the MAP_SHARED flag +* @ram_flags: RamBlock flags. Supported flags: RAM_SHARED, RAM_PMEM. * @fd: the fd to mmap. * @offset: offset within the file referenced by fd * @errp: pointer to Error*, to store an error if it happens.
@@ -1032,7 +1029,7 @@ void memory_region_init_ram_from_fd(MemoryRegion *mr,Object *owner, const char *name, uint64_t size, - bool share, + uint32_t ram_flags, int fd, ram_addr_t offset, Error **errp);
include/exec/ram_addr.h +1 -5
@@ -104,11 +104,7 @@ long qemu_maxrampagesize(void);* Parameters: * @size: the size in bytes of the ram block * @mr: the memory region where the ram block is -* @ram_flags: specify the properties of the ram block, which can be one -* or bit-or of following values -* - RAM_SHARED: mmap the backing file or device with MAP_SHARED -* - RAM_PMEM: the backend @mem_path or @fd is persistent memory -* Other bits are ignored. +* @ram_flags: RamBlock flags. Supported flags: RAM_SHARED, RAM_PMEM. * @mem_path or @fd: specify the backing file or device * @readonly: true to open @path for reading, false for read/write. * @errp: pointer to Error*, to store an error if it happens
softmmu/memory.c +3 -4
@@ -1611,7 +1611,7 @@ void memory_region_init_ram_from_fd(MemoryRegion *mr,Object *owner, const char *name, uint64_t size, - bool share, + uint32_t ram_flags, int fd, ram_addr_t offset, Error **errp)
@@ -1621,9 +1621,8 @@ void memory_region_init_ram_from_fd(MemoryRegion *mr, mr->ram = true; mr->terminates = true; mr->destructor = memory_region_destructor_ram; - mr->ram_block =qemu_ram_alloc_from_fd (size, mr, - share ?RAM_SHARED :0 , - fd, offset, false, &err); + mr->ram_block =qemu_ram_alloc_from_fd (size, mr, ram_flags, fd, offset, + false, &err);if (err) { mr->size =int128_zero ();object_unparent (OBJECT (mr));
Signature · 1 line
2.30.2
Re: [PATCH v5 04/14] softmmu/memory: Pass ram_flags to qemu_ram_alloc_from_fd()
Quoted 9 lines · David Hildenbrand
Let's pass in ram flags just like we do with
qemu_ram_alloc_from_file(), to clean up and prepare for more flags.Simplify the documentation of passed ram flags: Looking at our documentation of
RAM_SHAREDandRAM_PMEMis sufficient, no need to be repetitive.Reviewed-by Peter Xu <[email protected]>Signed-off-by David Hildenbrand <[email protected]>
Quoted 7 lines
--- backends/hostmem-memfd.c | 7 ++++--- hw/misc/ivshmem.c | 5 ++--- include/exec/memory.h | 9 +++------ include/exec/ram_addr.h | 6 +----- softmmu/memory.c | 7 +++---- 5 files changed, 13 insertions(+), 21 deletions(-)
Re: [PATCH v5 04/14] softmmu/memory: Pass ram_flags to qemu_ram_alloc_from_fd()
Hi David,
Quoted 18 lines · Philippe Mathieu-Daudé
Quoted 9 lines · David Hildenbrand
Let's pass in ram flags just like we do with
qemu_ram_alloc_from_file(), to clean up and prepare for more flags.Simplify the documentation of passed ram flags: Looking at our documentation of
RAM_SHAREDandRAM_PMEMis sufficient, no need to be repetitive.Reviewed-by Peter Xu <[email protected]>Signed-off-by David Hildenbrand <[email protected]>Quoted 7 lines
--- backends/hostmem-memfd.c | 7 ++++--- hw/misc/ivshmem.c | 5 ++--- include/exec/memory.h | 9 +++------ include/exec/ram_addr.h | 6 +----- softmmu/memory.c | 7 +++---- 5 files changed, 13 insertions(+), 21 deletions(-)
Quoted 2 lines
Reviewed-by Philippe Mathieu-Daudé <[email protected]>
Actually it would be clearer to define the 0 value, maybe:
#define RAM_NOFLAG (0 << 0)
Re: [PATCH v5 04/14] softmmu/memory: Pass ram_flags to qemu_ram_alloc_from_fd()
Quoted 21 lines · Philippe Mathieu-Daudé
Hi David,
Quoted 18 lines · Philippe Mathieu-Daudé
Quoted 16 lines · David Hildenbrand
Let's pass in ram flags just like we do with
qemu_ram_alloc_from_file(), to clean up and prepare for more flags.Simplify the documentation of passed ram flags: Looking at our documentation of
RAM_SHAREDandRAM_PMEMis sufficient, no need to be repetitive.Reviewed-by Peter Xu <[email protected]>Signed-off-by David Hildenbrand <[email protected]>--- backends/hostmem-memfd.c | 7 ++++--- hw/misc/ivshmem.c | 5 ++--- include/exec/memory.h | 9 +++------ include/exec/ram_addr.h | 6 +----- softmmu/memory.c | 7 +++---- 5 files changed, 13 insertions(+), 21 deletions(-)
Quoted 7 lines
Quoted 2 lines
Reviewed-by Philippe Mathieu-Daudé <[email protected]>Actually it would be clearer to define the 0 value, maybe:
#define
RAM_NOFLAG(0 << 0)
This will also turn some code into
ram_flags = backend->share ? RAM_SHARED : RAM_NOFLAG; ram_flags |= backend->reserve ? RAM_NOFLAG : RAM_NORESERVE;
Looking at other flag users, I barely see any such usage. XKB_CONTEXT_NO_FLAGS, ALLOC_NO_FLAGS, and MEM_AFFINITY_NOFLAGS seem to be the only ones. That's why I tend to not do it unless there are strong opinions.
Thanks!
Signature · 3 lines
Thanks, David / dhildenb
Re: [PATCH v5 04/14] softmmu/memory: Pass ram_flags to qemu_ram_alloc_from_fd()
Quoted 28 lines · David Hildenbrand
Quoted 27 lines · Philippe Mathieu-Daudé
Hi David,
Quoted 19 lines · Philippe Mathieu-Daudé
Quoted 10 lines · David Hildenbrand
Let's pass in ram flags just like we do with
qemu_ram_alloc_from_file(),
to clean up and prepare for more flags.Simplify the documentation of passed ram flags: Looking at our documentation of
RAM_SHAREDandRAM_PMEMis sufficient, no need to be repetitive.Reviewed-by Peter Xu <[email protected]>Signed-off-by David Hildenbrand <[email protected]>Quoted 7 lines
---
backends/hostmem-memfd.c| 7 ++++---
hw/misc/ivshmem.c | 5 ++---
include/exec/memory.h | 9 +++------
include/exec/ram_addr.h | 6 +-----
softmmu/memory.c | 7 +++----5 files changed, 13 insertions(+), 21 deletions(-)Quoted 2 lines
Reviewed-by Philippe Mathieu-Daudé <[email protected]>Actually it would be clearer to define the 0 value, maybe:
Quoted 7 lines
Quoted 2 lines
#define RAM_NOFLAG (0 << 0)
This will also turn some code into
ram_flags=backend->share?RAM_SHARED:RAM_NOFLAG;ram_flags|=backend->reserve?RAM_NOFLAG:RAM_NORESERVE;
This is the callee view, withing the API, where you have all the context.
Quoted 4 lines
Looking at other flag users, I barely see any such usage.
XKB_CONTEXT_NO_FLAGS,ALLOC_NO_FLAGS, andMEM_AFFINITY_NOFLAGSseem to be the only ones. That's why I tend to not do it unless there are strong opinions.
I'm more concerned about the caller perspective. What means this magic '0' in the arguments? Then I have to check the prototype. If the caller uses RAM_NO_FLAGS, I directly understand what is passed.
Anyway my comment fits the usual "can be cleaned later" case.
Thanks,
Phil.
Re: [PATCH v5 04/14] softmmu/memory: Pass ram_flags to qemu_ram_alloc_from_fd()
Quoted 40 lines · Philippe Mathieu-Daudé
Quoted 28 lines · David Hildenbrand
Quoted 27 lines · Philippe Mathieu-Daudé
Hi David,
Quoted 19 lines · Philippe Mathieu-Daudé
Quoted 10 lines · David Hildenbrand
Let's pass in ram flags just like we do with
qemu_ram_alloc_from_file(),
to clean up and prepare for more flags.Simplify the documentation of passed ram flags: Looking at our documentation of
RAM_SHAREDandRAM_PMEMis sufficient, no need to be repetitive.Reviewed-by Peter Xu <[email protected]>Signed-off-by David Hildenbrand <[email protected]>Quoted 7 lines
--- backends/hostmem-memfd.c | 7 ++++--- hw/misc/ivshmem.c | 5 ++--- include/exec/memory.h | 9 +++------ include/exec/ram_addr.h | 6 +----- softmmu/memory.c | 7 +++---- 5 files changed, 13 insertions(+), 21 deletions(-)Quoted 2 lines
Reviewed-by Philippe Mathieu-Daudé <[email protected]>Actually it would be clearer to define the 0 value, maybe:
Quoted 7 lines
Quoted 2 lines
#define RAM_NOFLAG (0 << 0)
This will also turn some code into
ram_flags=backend->share?RAM_SHARED:RAM_NOFLAG;ram_flags|=backend->reserve?RAM_NOFLAG:RAM_NORESERVE;This is the callee view, withing the API, where you have all the context.
Quoted 9 lines
Quoted 4 lines
Looking at other flag users, I barely see any such usage.
XKB_CONTEXT_NO_FLAGS,ALLOC_NO_FLAGS, andMEM_AFFINITY_NOFLAGSseem to be the only ones. That's why I tend to not do it unless there are strong opinions.I'm more concerned about the caller perspective. What means this magic '0' in the arguments? Then I have to check the prototype. If the caller uses
RAM_NO_FLAGS, I directly understand what is passed.
Yeah, that makes sense. Even cleaner would be using the type system as we do in the kernel, e.g., for GFP flags
typedef unsigned int __bitwise gfp_t;
#define ___GFP_DMA 0x01u
#define __GFP_DMA ((__force gfp_t)___GFP_DMA)
And passing around gfp_t. Then even using "0" will bail out.
Quoted 1 line
Anyway my comment fits the usual "can be cleaned later" case.
Make sense, thanks.
Signature · 3 lines
Thanks, David / dhildenb
PATCH v5 5/14 softmmu/memory: Pass ram_flags to memory_region_init_ram_shared_nomigrate()
In reply to David HildenbrandLet's forward ram_flags instead, renaming memory_region_init_ram_shared_nomigrate() into memory_region_init_ram_flags_nomigrate(). Forward flags to qemu_ram_alloc() and qemu_ram_alloc_internal().
--- backends/hostmem-ram.c | 6 +++-- hw/m68k/next-cube.c | 4 ++-- include/exec/memory.h | 24 +++++++++---------- include/exec/ram_addr.h | 2 +- .../memory-region-housekeeping.cocci | 8 +++---- softmmu/memory.c | 20 ++++++++-------- softmmu/physmem.c | 24 ++++++++----------- 7 files changed, 43 insertions(+), 45 deletions(-)
backends/hostmem-ram.c +4 -2
@@ -19,6 +19,7 @@static void ram_backend_memory_alloc (HostMemoryBackend *backend,Error **errp) { +uint32_t ram_flags;char *name;if (!backend->size) {
@@ -27,8 +28,9 @@ ram_backend_memory_alloc(HostMemoryBackend *backend, Error **errp) } name =host_memory_backend_get_name (backend); -memory_region_init_ram_shared_nomigrate (&backend->mr,OBJECT (backend), name, - backend->size, backend->share, errp); + ram_flags = backend->share ?RAM_SHARED :0 ; +memory_region_init_ram_flags_nomigrate (&backend->mr,OBJECT (backend), name, + backend->size, ram_flags, errp);g_free (name); }
hw/m68k/next-cube.c +2 -2
@@ -986,8 +986,8 @@ static void next_cube_init(MachineState *machine)sysbus_mmio_map (SYS_BUS_DEVICE (pcdev),1 ,0x02100000 );/* BMAP memory */ -memory_region_init_ram_shared_nomigrate (bmapm1,NULL ,"next.bmapmem" ,64 , - true, &error_fatal); +memory_region_init_ram_flags_nomigrate (bmapm1,NULL ,"next.bmapmem" ,64 , +RAM_SHARED , &error_fatal);memory_region_add_subregion (sysmem,0x020c0000 , bmapm1);/* The Rev_2.5_v66.bin firmware accesses it at 0x820c0020, too */ memory_region_init_alias (bmapm2,NULL ,"next.bmapmem2" , bmapm1,0x0 ,64 );
include/exec/memory.h +12 -12
@@ -928,27 +928,27 @@ void memory_region_init_ram_nomigrate(MemoryRegion *mr, Error **errp);/** -* memory_region_init_ram_shared_nomigrate: Initialize RAM memory region. -* Accesses into the region will -* modify memory directly. +* memory_region_init_ram_flags_nomigrate: Initialize RAM memory region. +* Accesses into the region will +* modify memory directly. * * @mr: the #MemoryRegion to be initialized. * @owner: the object that tracks the region's reference count * @name: Region name, becomes part of RAMBlock name used in migration stream * must be unique within any device * @size: size of the region. -* @share: allow remapping RAM to different addresses +* @ram_flags: RamBlock flags. Supported flags: RAM_SHARED. * @errp: pointer to Error*, to store an error if it happens. * -* Note that this function is similar to memory_region_init_ram_nomigrate. -* The only difference is part of the RAM region can be remapped. +* Note that this function does not do anything to cause the data in the +* RAM memory region to be migrated; that is the responsibility of the caller. */ -void memory_region_init_ram_shared_nomigrate (MemoryRegion *mr, -Object *owner, -const char *name, -uint64_t size, -bool share, -Error **errp); +void memory_region_init_ram_flags_nomigrate (MemoryRegion *mr, +Object *owner, +const char *name, +uint64_t size, +uint32_t ram_flags, +Error **errp);/** * memory_region_init_resizeable_ram: Initialize memory region with resizeable
include/exec/ram_addr.h +1 -1
@@ -122,7 +122,7 @@ RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, MemoryRegion *mr,RAMBlock *qemu_ram_alloc_from_ptr (ram_addr_t size,void *host,MemoryRegion *mr,Error **errp); -RAMBlock *qemu_ram_alloc (ram_addr_t size,bool share,MemoryRegion *mr, +RAMBlock *qemu_ram_alloc (ram_addr_t size,uint32_t ram_flags,MemoryRegion *mr,Error **errp); RAMBlock *qemu_ram_alloc_resizeable(ram_addr_t size, ram_addr_t max_size, void (*resized)(const char*,
scripts/coccinelle/memory-region-housekeeping.cocci +4 -4
@@ -127,8 +127,8 @@ static void device_fn(DeviceState *dev, ...) - memory_region_init_rom(E1, NULL, E2, E3, E4); + memory_region_init_rom(E1, obj, E2, E3, E4); | -- memory_region_init_ram_shared_nomigrate(E1, NULL, E2, E3, E4, E5); -+ memory_region_init_ram_shared_nomigrate(E1, obj, E2, E3, E4, E5); +- memory_region_init_ram_flags_nomigrate(E1, NULL, E2, E3, E4, E5); ++ memory_region_init_ram_flags_nomigrate(E1, obj, E2, E3, E4, E5); ) ...+> }
@@ -152,8 +152,8 @@ static void device_fn(DeviceState *dev, ...) - memory_region_init_rom(E1, NULL, E2, E3, E4); + memory_region_init_rom(E1, OBJECT(dev), E2, E3, E4); | -- memory_region_init_ram_shared_nomigrate(E1, NULL, E2, E3, E4, E5); -+ memory_region_init_ram_shared_nomigrate(E1, OBJECT(dev), E2, E3, E4, E5); +- memory_region_init_ram_flags_nomigrate(E1, NULL, E2, E3, E4, E5); ++ memory_region_init_ram_flags_nomigrate(E1, OBJECT(dev), E2, E3, E4, E5); ) ...+> }
softmmu/memory.c +10 -10
@@ -1533,22 +1533,22 @@ void memory_region_init_ram_nomigrate(MemoryRegion *mr,uint64_t size, Error **errp) { -memory_region_init_ram_shared_nomigrate (mr ,owner ,name ,size ,false ,errp ); + memory_region_init_ram_flags_nomigrate(mr, owner, name, size, 0, errp); } -void memory_region_init_ram_shared_nomigrate (MemoryRegion *mr, -Object *owner, -const char *name, -uint64_t size, -bool share, -Error **errp) +void memory_region_init_ram_flags_nomigrate (MemoryRegion *mr, +Object *owner, +const char *name, +uint64_t size, +uint32_t ram_flags, +Error **errp) {Error *err =NULL ;memory_region_init (mr, owner, name, size); mr->ram = true; mr->terminates = true; mr->destructor = memory_region_destructor_ram; - mr->ram_block =qemu_ram_alloc (size, share, mr, &err); + mr->ram_block =qemu_ram_alloc (size, ram_flags, mr, &err);if (err) { mr->size =int128_zero ();object_unparent (OBJECT (mr));
@@ -1684,7 +1684,7 @@ void memory_region_init_rom_nomigrate(MemoryRegion *mr,uint64_t size, Error **errp) { -memory_region_init_ram_shared_nomigrate (mr ,owner ,name ,size ,false ,errp ); + memory_region_init_ram_flags_nomigrate(mr, owner, name, size, 0, errp); mr->readonly = true; }
@@ -1704,7 +1704,7 @@ void memory_region_init_rom_device_nomigrate(MemoryRegion *mr, mr->terminates = true; mr->rom_device = true; mr->destructor = memory_region_destructor_ram; - mr->ram_block =qemu_ram_alloc (size, false, mr, &err); + mr->ram_block =qemu_ram_alloc (size,0 , mr, &err);if (err) { mr->size =int128_zero ();object_unparent (OBJECT (mr));
softmmu/physmem.c +10 -14
@@ -2108,12 +2108,14 @@ RAMBlock *qemu_ram_alloc_internal(ram_addr_t size, ram_addr_t max_size,void (*resized)(const char *,uint64_t length,void *host), - void *host, bool resizeable, bool share, + void *host, uint32_t ram_flags, MemoryRegion *mr, Error **errp) { RAMBlock *new_block;Error *local_err =NULL ; +assert ((ram_flags & ~(RAM_SHARED |RAM_RESIZEABLE )) ==0 ); + size =HOST_PAGE_ALIGN (size); max_size =HOST_PAGE_ALIGN (max_size); new_block =g_malloc0 (sizeof (*new_block));
@@ -2125,15 +2127,10 @@ RAMBlock *qemu_ram_alloc_internal(ram_addr_t size, ram_addr_t max_size, new_block->fd =-1 ; new_block->page_size = qemu_real_host_page_size; new_block->host = host; + new_block->flags = ram_flags;if (host) { new_block->flags |=RAM_PREALLOC ; } -if (share) { - new_block->flags |=RAM_SHARED ; - } -if (resizeable) { - new_block->flags |=RAM_RESIZEABLE ; - }ram_block_add (new_block, &local_err);if (local_err) {g_free (new_block);
@@ -2146,15 +2143,14 @@ RAMBlock *qemu_ram_alloc_internal(ram_addr_t size, ram_addr_t max_size,RAMBlock *qemu_ram_alloc_from_ptr (ram_addr_t size,void *host,MemoryRegion *mr,Error **errp) { -return qemu_ram_alloc_internal (size, size,NULL , host, false, - false, mr, errp); +return qemu_ram_alloc_internal (size, size,NULL , host,0 , mr, errp); } -RAMBlock *qemu_ram_alloc (ram_addr_t size,bool share, +RAMBlock *qemu_ram_alloc (ram_addr_t size,uint32_t ram_flags,MemoryRegion *mr,Error **errp) { -return qemu_ram_alloc_internal (size, size,NULL ,NULL , false, - share, mr, errp); +assert ((ram_flags & ~RAM_SHARED ) ==0 ); +return qemu_ram_alloc_internal (size, size,NULL ,NULL , ram_flags, mr, errp); } RAMBlock *qemu_ram_alloc_resizeable(ram_addr_t size, ram_addr_t maxsz,
@@ -2163,8 +2159,8 @@ RAMBlock *qemu_ram_alloc_resizeable(ram_addr_t size, ram_addr_t maxsz, void *host), MemoryRegion *mr, Error **errp) { - return qemu_ram_alloc_internal(size, maxsz, resized, NULL, true, -false ,mr ,errp ); + return qemu_ram_alloc_internal(size, maxsz, resized, NULL, +RAM_RESIZEABLE ,mr ,errp ); }static void reclaim_ramblock (RAMBlock *block)
Signature · 1 line
2.30.2
Re: [PATCH v5 05/14] softmmu/memory: Pass ram_flags to memory_region_init_ram_shared_nomigrate()
Hi David,
Quoted 7 lines · David Hildenbrand
Let's forward
ram_flagsinstead, renamingmemory_region_init_ram_shared_nomigrate()intomemory_region_init_ram_flags_nomigrate(). Forward flags toqemu_ram_alloc()andqemu_ram_alloc_internal().Reviewed-by Peter Xu <[email protected]>Signed-off-by David Hildenbrand <[email protected]>
Quoted 7 lines
--- backends/hostmem-ram.c | 6 +++-- hw/m68k/next-cube.c | 4 ++-- include/exec/memory.h | 24 +++++++++---------- include/exec/ram_addr.h | 2 +- .../memory-region-housekeeping.cocci | 8 +++---- softmmu/memory.c | 20 ++++++++--------
OK up to here, but the qemu_ram_alloc_internal() changes in softmmu/physmem.c belong to a different patch (except the line adding "new_block->flags = ram_flags"). Do you mind splitting it?
Quoted 69 lines
softmmu/physmem.c +10
-14@@ -2108,12 +2108,14 @@ RAMBlock *qemu_ram_alloc_internal(ram_addr_t size, ram_addr_t max_size,void (*resized)(const char *,uint64_t length,void *host), - void *host, bool resizeable, bool share, + void *host, uint32_t ram_flags, MemoryRegion *mr, Error **errp) { RAMBlock *new_block;Error *local_err =NULL ; +assert ((ram_flags & ~(RAM_SHARED |RAM_RESIZEABLE )) ==0 ); + size =HOST_PAGE_ALIGN (size); max_size =HOST_PAGE_ALIGN (max_size); new_block =g_malloc0 (sizeof (*new_block));@@ -2125,15 +2127,10 @@ RAMBlock *qemu_ram_alloc_internal(ram_addr_t size, ram_addr_t max_size, new_block->fd =-1 ; new_block->page_size = qemu_real_host_page_size; new_block->host = host; + new_block->flags = ram_flags;if (host) { new_block->flags |=RAM_PREALLOC ; } -if (share) { - new_block->flags |=RAM_SHARED ; - } -if (resizeable) { - new_block->flags |=RAM_RESIZEABLE ; - }ram_block_add (new_block, &local_err);if (local_err) {g_free (new_block);@@ -2146,15 +2143,14 @@ RAMBlock *qemu_ram_alloc_internal(ram_addr_t size, ram_addr_t max_size,RAMBlock *qemu_ram_alloc_from_ptr (ram_addr_t size,void *host,MemoryRegion *mr,Error **errp) { -return qemu_ram_alloc_internal (size, size,NULL , host, false, - false, mr, errp); +return qemu_ram_alloc_internal (size, size,NULL , host,0 , mr, errp); } -RAMBlock *qemu_ram_alloc (ram_addr_t size,bool share, +RAMBlock *qemu_ram_alloc (ram_addr_t size,uint32_t ram_flags,MemoryRegion *mr,Error **errp) { -return qemu_ram_alloc_internal (size, size,NULL ,NULL , false, - share, mr, errp); +assert ((ram_flags & ~RAM_SHARED ) ==0 ); +return qemu_ram_alloc_internal (size, size,NULL ,NULL , ram_flags, mr, errp); } RAMBlock *qemu_ram_alloc_resizeable(ram_addr_t size, ram_addr_t maxsz,@@ -2163,8 +2159,8 @@ RAMBlock *qemu_ram_alloc_resizeable(ram_addr_t size, ram_addr_t maxsz, void *host), MemoryRegion *mr, Error **errp) { - return qemu_ram_alloc_internal(size, maxsz, resized, NULL, true, -false ,mr ,errp ); + return qemu_ram_alloc_internal(size, maxsz, resized, NULL, +RAM_RESIZEABLE ,mr ,errp ); }static void reclaim_ramblock (RAMBlock *block)
Re: [PATCH v5 05/14] softmmu/memory: Pass ram_flags to memory_region_init_ram_shared_nomigrate()
Quoted 18 lines · Philippe Mathieu-Daudé
Hi David,
Quoted 7 lines · David Hildenbrand
Let's forward
ram_flagsinstead, renamingmemory_region_init_ram_shared_nomigrate()intomemory_region_init_ram_flags_nomigrate(). Forward flags toqemu_ram_alloc()andqemu_ram_alloc_internal().Reviewed-by Peter Xu <[email protected]>Signed-off-by David Hildenbrand <[email protected]>Quoted 7 lines
--- backends/hostmem-ram.c | 6 +++-- hw/m68k/next-cube.c | 4 ++-- include/exec/memory.h | 24 +++++++++---------- include/exec/ram_addr.h | 2 +- .../memory-region-housekeeping.cocci | 8 +++---- softmmu/memory.c | 20 ++++++++--------
Quoted 5 lines
OK up to here, but the
qemu_ram_alloc_internal()changes insoftmmu/physmem.cbelong to a different patch (except the line adding "new_block->flags=ram_flags"). Do you mind splitting it?
Can you elaborate? Temporarily passing both "ram_flags" and "bool resizeable, bool share" to qemu_ram_alloc_internal()?
I don't see a big benefit in doing that besides even more effective changes in two individual patches. But maybe if you elaborate, i can see what you would like to see :)
Thanks!
Signature · 3 lines
Thanks, David / dhildenb
Re: [PATCH v5 05/14] softmmu/memory: Pass ram_flags to memory_region_init_ram_shared_nomigrate()
Quoted 25 lines · David Hildenbrand
Quoted 18 lines · Philippe Mathieu-Daudé
Hi David,
Quoted 7 lines · David Hildenbrand
Let's forward
ram_flagsinstead, renamingmemory_region_init_ram_shared_nomigrate()intomemory_region_init_ram_flags_nomigrate(). Forward flags toqemu_ram_alloc()andqemu_ram_alloc_internal().Reviewed-by Peter Xu <[email protected]>Signed-off-by David Hildenbrand <[email protected]>Quoted 7 lines
---
backends/hostmem-ram.c | 6 +++-- hw/m68k/next-cube.c | 4 ++-- include/exec/memory.h | 24 +++++++++---------- include/exec/ram_addr.h | 2 +- .../memory-region-housekeeping.cocci | 8 +++---- softmmu/memory.c | 20 ++++++++--------Quoted 5 lines
OK up to here, but the
qemu_ram_alloc_internal()changes insoftmmu/physmem.cbelong to a different patch (except the line adding "new_block->flags=ram_flags"). Do you mind splitting it?
Quoted 6 lines
Can you elaborate? Temporarily passing both "
ram_flags" and "bool resizeable, bool share" toqemu_ram_alloc_internal()?I don't see a big benefit in doing that besides even more effective changes in two individual patches. But maybe if you elaborate, i can see what you would like to see :)
In this patch I see
1/ change a parameter and propagate it
2/ adapt assertions
I'd rather review the assertions modified / cleaned in another patch, simply because it required me 2 different mental efforts to review the first part and the second part. But maybe it is not possible, so I'll review the 2nd part here.
softmmu/physmem.c RAMBlock *qemu_ram_alloc_internal(ram_addr_t
Quoted 5 lines
softmmu/physmem.c +0
-0@@ -2108,12 +2108,14 @@ RAMBlock *qemu_ram_alloc_internal(ram_addr_t
size, ram_addr_t max_size,
softmmu/physmem.c RAMBlock *qemu_ram_alloc_internal(ram_addr_t size, ram_addr_t max_size,
Quoted 4 lines
softmmu/physmem.c +0
-1void (*resized)(const char *,uint64_t length, void *host), - void *host, bool resizeable, bool
share,
softmmu/physmem.c RAMBlock *qemu_ram_alloc_internal(ram_addr_t size, ram_addr_t max_size, · line 2116
Quoted 6 lines
softmmu/physmem.c +1
-0+ void *host, uint32_t ram_flags, MemoryRegion *mr, Error **errp) { RAMBlock *new_block;Error *local_err =NULL ;
Maybe also:
assert(!host || (ram_flags & RAM_PREALLOC));
softmmu/physmem.c RAMBlock *qemu_ram_alloc_internal(ram_addr_t
Quoted 6 lines
softmmu/physmem.c +2
-0+assert ((ram_flags & ~(RAM_SHARED |RAM_RESIZEABLE )) ==0 ); + size =HOST_PAGE_ALIGN (size); max_size =HOST_PAGE_ALIGN (max_size); new_block =g_malloc0 (sizeof (*new_block));@@ -2125,15 +2127,10 @@ RAMBlock *qemu_ram_alloc_internal(ram_addr_t
size, ram_addr_t max_size,
softmmu/physmem.c RAMBlock *qemu_ram_alloc_internal(ram_addr_t size, ram_addr_t max_size, · line 2133
Quoted 7 lines
softmmu/physmem.c +1
-0new_block->fd =-1 ; new_block->page_size = qemu_real_host_page_size; new_block->host = host; + new_block->flags = ram_flags;if (host) { new_block->flags |=RAM_PREALLOC ; }
We could also remove this statement ...
softmmu/physmem.c RAMBlock *qemu_ram_alloc_internal(ram_addr_t
Quoted 10 lines
softmmu/physmem.c +0
-6-if (share) { - new_block->flags |=RAM_SHARED ; - } -if (resizeable) { - new_block->flags |=RAM_RESIZEABLE ; - }ram_block_add (new_block, &local_err);if (local_err) {g_free (new_block);@@ -2146,15 +2143,14 @@ RAMBlock *qemu_ram_alloc_internal(ram_addr_t
size, ram_addr_t max_size,
softmmu/physmem.c RAMBlock *qemu_ram_alloc_internal(ram_addr_t size, ram_addr_t max_size, · line 2150
Quoted 5 lines
softmmu/physmem.c +0
-2RAMBlock *qemu_ram_alloc_from_ptr (ram_addr_t size,void *host,MemoryRegion *mr,Error **errp) { -return qemu_ram_alloc_internal (size, size,NULL , host, false, - false, mr, errp);
... by passing RAM_PREALLOC here.
softmmu/physmem.c RAMBlock *qemu_ram_alloc_internal(ram_addr_t size, ram_addr_t max_size,
Quoted 11 lines
softmmu/physmem.c +4
-3+return qemu_ram_alloc_internal (size, size,NULL , host,0 , mr, errp); } -RAMBlock *qemu_ram_alloc (ram_addr_t size,bool share, +RAMBlock *qemu_ram_alloc (ram_addr_t size,uint32_t ram_flags,MemoryRegion *mr,Error **errp) { -return qemu_ram_alloc_internal (size, size,NULL ,NULL , false, - share, mr, errp); +assert ((ram_flags & ~RAM_SHARED ) ==0 ); + return qemu_ram_alloc_internal(size, size, NULL, NULL, ram_flags,
mr, errp);
softmmu/physmem.c RAMBlock *qemu_ram_alloc_resizeable(ram_addr_t
Quoted 4 lines
softmmu/physmem.c +0
-0} RAMBlock *qemu_ram_alloc_resizeable(ram_addr_t size, ram_addr_t maxsz,@@ -2163,8 +2159,8 @@ RAMBlock *qemu_ram_alloc_resizeable(ram_addr_t
size, ram_addr_t maxsz,
Quoted 11 lines
softmmu/physmem.c +2
-2void *host), MemoryRegion *mr, Error **errp) { - return qemu_ram_alloc_internal(size, maxsz, resized, NULL, true, -false ,mr ,errp ); + return qemu_ram_alloc_internal(size, maxsz, resized, NULL, +RAM_RESIZEABLE ,mr ,errp ); }static void reclaim_ramblock (RAMBlock *block)
Re: [PATCH v5 05/14] softmmu/memory: Pass ram_flags to memory_region_init_ram_shared_nomigrate()
Quoted 35 lines · Philippe Mathieu-Daudé
Quoted 25 lines · David Hildenbrand
Quoted 18 lines · Philippe Mathieu-Daudé
Hi David,
Quoted 7 lines · David Hildenbrand
Let's forward
ram_flagsinstead, renamingmemory_region_init_ram_shared_nomigrate()intomemory_region_init_ram_flags_nomigrate(). Forward flags toqemu_ram_alloc()andqemu_ram_alloc_internal().Reviewed-by Peter Xu <[email protected]>Signed-off-by David Hildenbrand <[email protected]>Quoted 7 lines
--- backends/hostmem-ram.c | 6 +++-- hw/m68k/next-cube.c | 4 ++-- include/exec/memory.h | 24 +++++++++---------- include/exec/ram_addr.h | 2 +- .../memory-region-housekeeping.cocci | 8 +++---- softmmu/memory.c | 20 ++++++++--------Quoted 5 lines
OK up to here, but the
qemu_ram_alloc_internal()changes insoftmmu/physmem.cbelong to a different patch (except the line adding "new_block->flags=ram_flags"). Do you mind splitting it?Quoted 6 lines
Can you elaborate? Temporarily passing both "
ram_flags" and "bool resizeable, bool share" toqemu_ram_alloc_internal()?I don't see a big benefit in doing that besides even more effective changes in two individual patches. But maybe if you elaborate, i can see what you would like to see :)
In this patch I see
Quoted 7 lines
1/ change a parameter and propagate it
2/ adapt assertionsI'd rather review the assertions modified / cleaned in another patch, simply because it required me 2 different mental efforts to review the first part and the second part. But maybe it is not possible, so I'll review the 2nd part here.
Well, previously you could pass in "bool resizeable, bool share", now you can pass in ram_flags with RAM_SHARED, RAM_RESIZEABLE. So that assertion part actually looked fairly straight forward to me.
Quoted 19 lines
softmmu/physmem.c RAMBlock *qemu_ram_alloc_internal(ram_addr_t
Quoted 6 lines
softmmu/physmem.c +0
-0@@ -2108,12 +2108,14 @@ RAMBlock *qemu_ram_alloc_internal(ram_addr_tsize,
ram_addr_tmax_size,softmmu/physmem.c RAMBlock *qemu_ram_alloc_internal(ram_addr_t size, ram_addr_t max_size,
Quoted 4 lines
softmmu/physmem.c +0
-1void (*resized)(const char *,uint64_t length, void *host), - void *host, bool resizeable, boolshare,
softmmu/physmem.c RAMBlock *qemu_ram_alloc_internal(ram_addr_t size, ram_addr_t max_size, · line 2116
Quoted 6 lines
softmmu/physmem.c +1
-0+ void *host, uint32_t ram_flags, MemoryRegion *mr, Error **errp) { RAMBlock *new_block;Error *local_err =NULL ;
Quoted 3 lines
Maybe also:
assert(!host || (ram_flags & RAM_PREALLOC));
It should be even stricter I think
assert(!host ^ (ram_flags & RAM_PREALLOC));
I'd move that change definitely to a separate patch.
Thanks!
Signature · 3 lines
Thanks, David / dhildenb
Re: [PATCH v5 05/14] softmmu/memory: Pass ram_flags to memory_region_init_ram_shared_nomigrate()
In reply to Philippe Mathieu-DaudéQuoted 29 lines · Philippe Mathieu-Daudé
Quoted 28 lines · David Hildenbrand
Quoted 18 lines · Philippe Mathieu-Daudé
Hi David,
Quoted 7 lines · David Hildenbrand
Let's forward
ram_flagsinstead, renamingmemory_region_init_ram_shared_nomigrate()intomemory_region_init_ram_flags_nomigrate(). Forward flags toqemu_ram_alloc()andqemu_ram_alloc_internal().Reviewed-by Peter Xu <[email protected]>Signed-off-by David Hildenbrand <[email protected]>Quoted 7 lines
--- backends/hostmem-ram.c | 6 +++-- hw/m68k/next-cube.c | 4 ++-- include/exec/memory.h | 24 +++++++++---------- include/exec/ram_addr.h | 2 +- .../memory-region-housekeeping.cocci | 8 +++---- softmmu/memory.c | 20 ++++++++--------Quoted 5 lines
OK up to here, but the
qemu_ram_alloc_internal()changes insoftmmu/physmem.cbelong to a different patch (except the line adding "new_block->flags=ram_flags"). Do you mind splitting it?Can you elaborate? Temporarily passing both "
ram_flags" and "bool resizeable, bool share" toqemu_ram_alloc_internal()?
Quoted 8 lines
Quoted 3 lines
I don't see a big benefit in doing that besides even more effective changes in two individual patches. But maybe if you elaborate, i can see what you would like to see :)
In this patch I see
1/ change a parameter and propagate it
2/ adapt assertions
FWIW, I'll separate the qemu_ram_alloc*() changes from the memory_region_init_ram_shared_nomigrate() changes.
Signature · 3 lines
Thanks, David / dhildenb
PATCH v5 6/14 util/mmap-alloc: Pass flags instead of separate bools to qemu_ram_mmap()
In reply to David HildenbrandLet's pass flags instead of bools to prepare for passing other flags and update the documentation of qemu_ram_mmap(). Introduce new QEMU_MAP_ flags that abstract the mmap() PROT_ and MAP_ flag handling and simplify it.
We expose only flags that are currently supported by qemu_ram_mmap(). Maybe, we'll see qemu_mmap() in the future as well that can implement these flags.
Note: We don't use MAP_ flags as some flags (e.g., MAP_SYNC) are only defined for some systems and we want to always be able to identify these flags reliably inside qemu_ram_mmap() -- for example, to properly warn when some future flags are not available or effective on a system. Also, this way we can simplify PROT_ handling as well.
--- include/qemu/mmap-alloc.h | 16 +++++++++------- include/qemu/osdep.h | 18 ++++++++++++++++++ softmmu/physmem.c | 8 +++++--- util/mmap-alloc.c | 15 ++++++++------- util/oslib-posix.c | 3 ++- 5 files changed, 42 insertions(+), 18 deletions(-)
include/qemu/mmap-alloc.h +9 -7
@@ -7,18 +7,22 @@ size_t qemu_fd_getpagesize(int fd);size_t qemu_mempath_getpagesize (const char *mem_path);/** -* qemu_ram_mmap: mmap the specified file or device. +* qemu_ram_mmap: mmap anonymous memory, the specified file or device. +* +* mmap() abstraction to map guest RAM, simplifying flag handling, taking +* care of alignment requirements and installing guard pages. * * Parameters: * @fd: the file or the device to mmap * @size: the number of bytes to be mmaped * @align: if not zero, specify the alignment of the starting mapping address; * otherwise, the alignment in use will be determined by QEMU. -* @readonly: true for a read-only mapping, false for read/write. -* @shared: map has RAM_SHARED flag. -* @is_pmem: map has RAM_PMEM flag. +* @qemu_map_flags: QEMU_MAP_* flags * @map_offset: map starts at offset of map_offset from the start of fd * +* Internally, MAP_PRIVATE, MAP_ANONYMOUS and MAP_SHARED_VALIDATE are set +* implicitly based on other parameters. +* * Return: * On success, return a pointer to the mapped area. * On failure, return MAP_FAILED.
@@ -26,9 +30,7 @@ size_t qemu_mempath_getpagesize(const char *mem_path);void *qemu_ram_mmap (int fd,size_t size,size_t align, -bool readonly, -bool shared, -bool is_pmem, +uint32_t qemu_map_flags,off_t map_offset);void qemu_ram_munmap (int fd,void *ptr,size_t size);
include/qemu/osdep.h +18 -0
@@ -347,6 +347,24 @@ void *qemu_anon_ram_alloc(size_t size, uint64_t *align, bool shared);void qemu_vfree (void *ptr);void qemu_anon_ram_free (void *ptr,size_t size); +/* +* Abstraction of PROT_ and MAP_ flags as passed to mmap(), for example, +* consumed by qemu_ram_mmap(). +*/ + +/* Map PROT_READ instead of PROT_READ | PROT_WRITE. */ +#define QEMU_MAP_READONLY (1 << 0) + +/* Use MAP_SHARED instead of MAP_PRIVATE. */ +#define QEMU_MAP_SHARED (1 << 1) + +/* +* Use MAP_SYNC | MAP_SHARED_VALIDATE if supported. Ignored without +* QEMU_MAP_SHARED. If mapping fails, warn and fallback to !QEMU_MAP_SYNC. +*/ +#define QEMU_MAP_SYNC (1 << 2) + +#define QEMU_MADV_INVALID -1#if defined(CONFIG_MADVISE )
softmmu/physmem.c +5 -3
@@ -1533,6 +1533,7 @@ static void *file_ram_alloc(RAMBlock *block,off_t offset, Error **errp) { + uint32_t qemu_map_flags;void *area; block->page_size =qemu_fd_getpagesize (fd);
@@ -1580,9 +1581,10 @@ static void *file_ram_alloc(RAMBlock *block,perror ("ftruncate" ); } - area =qemu_ram_mmap (fd, memory, block->mr->align, readonly, - block->flags &RAM_SHARED , block->flags &RAM_PMEM , - offset); + qemu_map_flags = readonly ?QEMU_MAP_READONLY :0 ; + qemu_map_flags |= (block->flags &RAM_SHARED ) ?QEMU_MAP_SHARED :0 ; + qemu_map_flags |= (block->flags &RAM_PMEM ) ?QEMU_MAP_SYNC :0 ; + area =qemu_ram_mmap (fd, memory, block->mr->align, qemu_map_flags, offset);if (area ==MAP_FAILED ) {error_setg_errno (errp, errno,"unable to map backing store for guest RAM" );
util/mmap-alloc.c +8 -7
@@ -118,9 +118,12 @@ static void *mmap_reserve(size_t size, int fd)* Activate memory in a reserved region from the given fd (if any), to make * it accessible. */ -static void *mmap_activate (void *ptr,size_t size,int fd,bool readonly, -bool shared,bool is_pmem,off_t map_offset) +static void *mmap_activate (void *ptr,size_t size,int fd, +uint32_t qemu_map_flags,off_t map_offset) { +const bool readonly = qemu_map_flags &QEMU_MAP_READONLY ; +const bool shared = qemu_map_flags &QEMU_MAP_SHARED ; +const bool sync = qemu_map_flags &QEMU_MAP_SYNC ;const int prot =PROT_READ | (readonly ?0 :PROT_WRITE );int map_sync_flags =0 ;int flags =MAP_FIXED ;
@@ -128,7 +131,7 @@ static void *mmap_activate(void *ptr, size_t size, int fd, bool readonly, flags |= fd ==-1 ?MAP_ANONYMOUS :0 ; flags |= shared ?MAP_SHARED :MAP_PRIVATE ; -if (shared && is_pmem) { +if (shared && sync) { map_sync_flags =MAP_SYNC |MAP_SHARED_VALIDATE ; }
@@ -173,9 +176,7 @@ static inline size_t mmap_guard_pagesize(int fd)void *qemu_ram_mmap (int fd,size_t size,size_t align, -bool readonly, -bool shared, -bool is_pmem, +uint32_t qemu_map_flags,off_t map_offset) {const size_t guard_pagesize =mmap_guard_pagesize (fd);
@@ -199,7 +200,7 @@ void *qemu_ram_mmap(int fd, offset =QEMU_ALIGN_UP ((uintptr_t )guardptr, align) - (uintptr_t )guardptr; - ptr =mmap_activate (guardptr + offset, size, fd, readonly, shared, is_pmem, + ptr =mmap_activate (guardptr + offset, size, fd, qemu_map_flags, map_offset);if (ptr ==MAP_FAILED ) {munmap (guardptr, total);
util/oslib-posix.c +2 -1
@@ -229,8 +229,9 @@ void *qemu_memalign(size_t alignment, size_t size)/* alloc shared memory pages */ void *qemu_anon_ram_alloc (size_t size,uint64_t *alignment,bool shared) { +const uint32_t qemu_map_flags = shared ?QEMU_MAP_SHARED :0 ;size_t align =QEMU_VMALLOC_ALIGN ; -void *ptr =qemu_ram_mmap (-1 , size, align, false, shared, false,0 ); +void *ptr =qemu_ram_mmap (-1 , size, align, qemu_map_flags,0 );if (ptr ==MAP_FAILED ) {return NULL ;
Signature · 1 line
2.30.2
PATCH v5 7/14 memory: Introduce RAM_NORESERVE and wire it up in qemu_ram_mmap()
In reply to David HildenbrandLet's introduce RAM_NORESERVE, allowing mmap'ing with MAP_NORESERVE. The new flag has the following semantics:
"
RAM is mmap-ed with MAP_NORESERVE. When set, reserving swap space (or huge pages if applicable) is skipped: will bail out if not supported. When not set, the OS will do the reservation, if supported for the memory type. "
Allow passing it into:
- memory_region_init_ram_nomigrate()
- memory_region_init_resizeable_ram()
- memory_region_init_ram_from_file()
... and teach qemu_ram_mmap() and qemu_anon_ram_alloc() about the flag. Bail out if the flag is not supported, which is the case right now for both, POSIX and win32. We will add Linux support next and allow specifying RAM_NORESERVE via memory backends.
The target use case is virtio-mem, which dynamically exposes memory inside a large, sparse memory area to the VM.
--- include/exec/cpu-common.h | 1 + include/exec/memory.h | 15 ++++++++++++--- include/exec/ram_addr.h | 3 ++- include/qemu/osdep.h | 9 ++++++++- migration/ram.c | 3 +-- softmmu/physmem.c | 15 +++++++++++---- util/mmap-alloc.c | 7 +++++++ util/oslib-posix.c | 6 ++++-- util/oslib-win32.c | 13 ++++++++++++- 9 files changed, 58 insertions(+), 14 deletions(-)
include/exec/cpu-common.h +1 -0
@@ -58,6 +58,7 @@ void *qemu_ram_get_host_addr(RAMBlock *rb);ram_addr_t qemu_ram_get_offset (RAMBlock *rb);ram_addr_t qemu_ram_get_used_length (RAMBlock *rb);bool qemu_ram_is_shared (RAMBlock *rb); +bool qemu_ram_is_noreserve (RAMBlock *rb);bool qemu_ram_is_uf_zeroable (RAMBlock *rb);void qemu_ram_set_uf_zeroable (RAMBlock *rb);bool qemu_ram_is_migratable (RAMBlock *rb);
include/exec/memory.h +12 -3
@@ -155,6 +155,13 @@ typedef struct IOMMUTLBEvent {*/ #define RAM_UF_WRITEPROTECT (1 << 6) +/* +* RAM is mmap-ed with MAP_NORESERVE. When set, reserving swap space (or huge +* pages if applicable) is skipped: will bail out if not supported. When not +* set, the OS will do the reservation, if supported for the memory type. +*/ +#define RAM_NORESERVE (1 << 7) + static inline void iommu_notifier_init(IOMMUNotifier *n, IOMMUNotify fn, IOMMUNotifierFlag flags, hwaddr start, hwaddr end,
@@ -937,7 +944,7 @@ void memory_region_init_ram_nomigrate(MemoryRegion *mr,* @name: Region name, becomes part of RAMBlock name used in migration stream * must be unique within any device * @size: size of the region. -* @ram_flags: RamBlock flags. Supported flags: RAM_SHARED. +* @ram_flags: RamBlock flags. Supported flags: RAM_SHARED, RAM_NORESERVE. * @errp: pointer to Error*, to store an error if it happens. * * Note that this function does not do anything to cause the data in the
@@ -991,7 +998,8 @@ void memory_region_init_resizeable_ram(MemoryRegion *mr,* @size: size of the region. * @align: alignment of the region base address; if 0, the default alignment * (getpagesize()) will be used. -* @ram_flags: RamBlock flags. Supported flags: RAM_SHARED, RAM_PMEM. +* @ram_flags: RamBlock flags. Supported flags: RAM_SHARED, RAM_PMEM, +* RAM_NORESERVE, * @path: the path in which to allocate the RAM. * @readonly: true to open @path for reading, false for read/write. * @errp: pointer to Error*, to store an error if it happens.
@@ -1017,7 +1025,8 @@ void memory_region_init_ram_from_file(MemoryRegion *mr,* @owner: the object that tracks the region's reference count * @name: the name of the region. * @size: size of the region. -* @ram_flags: RamBlock flags. Supported flags: RAM_SHARED, RAM_PMEM. +* @ram_flags: RamBlock flags. Supported flags: RAM_SHARED, RAM_PMEM, +* RAM_NORESERVE. * @fd: the fd to mmap. * @offset: offset within the file referenced by fd * @errp: pointer to Error*, to store an error if it happens.
include/exec/ram_addr.h +2 -1
@@ -104,7 +104,8 @@ long qemu_maxrampagesize(void);* Parameters: * @size: the size in bytes of the ram block * @mr: the memory region where the ram block is -* @ram_flags: RamBlock flags. Supported flags: RAM_SHARED, RAM_PMEM. +* @ram_flags: RamBlock flags. Supported flags: RAM_SHARED, RAM_PMEM, +* RAM_NORESERVE. * @mem_path or @fd: specify the backing file or device * @readonly: true to open @path for reading, false for read/write. * @errp: pointer to Error*, to store an error if it happens
include/qemu/osdep.h +8 -1
@@ -343,7 +343,8 @@ extern int daemon(int, int);int qemu_daemon (int nochdir,int noclose);void *qemu_try_memalign (size_t alignment,size_t size);void *qemu_memalign (size_t alignment,size_t size); -void *qemu_anon_ram_alloc (size_t size,uint64_t *align,bool shared); +void *qemu_anon_ram_alloc (size_t size,uint64_t *align,bool shared, +bool noreserve);void qemu_vfree (void *ptr);void qemu_anon_ram_free (void *ptr,size_t size);
@@ -364,6 +365,12 @@ void qemu_anon_ram_free(void *ptr, size_t size);*/ #define QEMU_MAP_SYNC (1 << 2) +/* +* Use MAP_NORESERVE to skip reservation of swap space (or huge pages if +* applicable). Bail out if not supported/effective. +*/ +#define QEMU_MAP_NORESERVE (1 << 3) +#define QEMU_MADV_INVALID -1
migration/ram.c +1 -2
@@ -3371,8 +3371,7 @@ int colo_init_ram_cache(void) WITH_RCU_READ_LOCK_GUARD() {RAMBLOCK_FOREACH_NOT_IGNORED (block) { block->colo_cache =qemu_anon_ram_alloc (block->used_length, -NULL , - false); +NULL , false, false);if (!block->colo_cache) { error_report("%s: Can't alloc memory for COLO cache of block %s," "size 0x" RAM_ADDR_FMT, __func__, block->idstr,
softmmu/physmem.c +11 -4
@@ -1584,6 +1584,7 @@ static void *file_ram_alloc(RAMBlock *block, qemu_map_flags = readonly ?QEMU_MAP_READONLY :0 ; qemu_map_flags |= (block->flags &RAM_SHARED ) ?QEMU_MAP_SHARED :0 ; qemu_map_flags |= (block->flags &RAM_PMEM ) ?QEMU_MAP_SYNC :0 ; + qemu_map_flags |= (block->flags &RAM_NORESERVE ) ?QEMU_MAP_NORESERVE :0 ; area =qemu_ram_mmap (fd, memory, block->mr->align, qemu_map_flags, offset);if (area ==MAP_FAILED ) { error_setg_errno(errp, errno,
@@ -1704,6 +1705,11 @@ bool qemu_ram_is_shared(RAMBlock *rb)return rb->flags &RAM_SHARED ; } +bool qemu_ram_is_noreserve (RAMBlock *rb) +{ +return rb->flags &RAM_NORESERVE ; +} +/* Note: Only set at the start of postcopy */ bool qemu_ram_is_uf_zeroable (RAMBlock *rb) {
@@ -1931,6 +1937,7 @@ static void dirty_memory_extend(ram_addr_t old_ram_size,static void ram_block_add (RAMBlock *new_block,Error **errp) { +const bool noreserve =qemu_ram_is_noreserve (new_block);const bool shared =qemu_ram_is_shared (new_block);RAMBlock *block;RAMBlock *last_block =NULL ;
@@ -1954,7 +1961,7 @@ static void ram_block_add(RAMBlock *new_block, Error **errp) }else { new_block->host =qemu_anon_ram_alloc (new_block->max_length, &new_block->mr->align, - shared); + shared, noreserve);if (!new_block->host) { error_setg_errno(errp, errno, "cannot set up guest memory '%s'",
@@ -2025,7 +2032,7 @@ RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, MemoryRegion *mr,int64_t file_size, file_align;/* Just support these ram flags by now. */ -assert ((ram_flags & ~(RAM_SHARED |RAM_PMEM )) ==0 ); +assert ((ram_flags & ~(RAM_SHARED |RAM_PMEM |RAM_NORESERVE )) ==0 );if (xen_enabled ()) {error_setg (errp,"-mem-path not supported with Xen" );
@@ -2116,7 +2123,7 @@ RAMBlock *qemu_ram_alloc_internal(ram_addr_t size, ram_addr_t max_size,RAMBlock *new_block;Error *local_err =NULL ; -assert ((ram_flags & ~(RAM_SHARED |RAM_RESIZEABLE )) ==0 ); +assert ((ram_flags & ~(RAM_SHARED |RAM_RESIZEABLE |RAM_NORESERVE )) ==0 ); size =HOST_PAGE_ALIGN (size); max_size =HOST_PAGE_ALIGN (max_size);
@@ -2151,7 +2158,7 @@ RAMBlock *qemu_ram_alloc_from_ptr(ram_addr_t size, void *host,RAMBlock *qemu_ram_alloc (ram_addr_t size,uint32_t ram_flags,MemoryRegion *mr,Error **errp) { -assert ((ram_flags & ~RAM_SHARED ) ==0 ); +assert ((ram_flags & ~(RAM_SHARED |RAM_NORESERVE )) ==0 );return qemu_ram_alloc_internal (size, size,NULL ,NULL , ram_flags, mr, errp); }
util/mmap-alloc.c +7 -0
@@ -20,6 +20,7 @@#include "qemu/osdep.h" #include "qemu/mmap-alloc.h" #include "qemu/host-utils.h" +#include "qemu/error-report.h" #define HUGETLBFS_MAGIC 0x958458f6
@@ -121,6 +122,7 @@ static void *mmap_reserve(size_t size, int fd)static void *mmap_activate (void *ptr,size_t size,int fd,uint32_t qemu_map_flags,off_t map_offset) { +const bool noreserve = qemu_map_flags &QEMU_MAP_NORESERVE ;const bool readonly = qemu_map_flags &QEMU_MAP_READONLY ;const bool shared = qemu_map_flags &QEMU_MAP_SHARED ;const bool sync = qemu_map_flags &QEMU_MAP_SYNC ;
@@ -129,6 +131,11 @@ static void *mmap_activate(void *ptr, size_t size, int fd,int flags =MAP_FIXED ;void *activated_ptr; +if (noreserve) { +error_report ("Skipping reservation of swap space is not supported" ); +return MAP_FAILED ; + } + flags |= fd ==-1 ?MAP_ANONYMOUS :0 ; flags |= shared ?MAP_SHARED :MAP_PRIVATE ;if (shared && sync) {
util/oslib-posix.c +4 -2
@@ -227,9 +227,11 @@ void *qemu_memalign(size_t alignment, size_t size) }/* alloc shared memory pages */ -void *qemu_anon_ram_alloc (size_t size,uint64_t *alignment,bool shared) +void *qemu_anon_ram_alloc (size_t size,uint64_t *alignment,bool shared, +bool noreserve) { -const uint32_t qemu_map_flags = shared ?QEMU_MAP_SHARED :0 ; +const uint32_t qemu_map_flags = (shared ?QEMU_MAP_SHARED :0 ) | + (noreserve ?QEMU_MAP_NORESERVE :0 );size_t align =QEMU_VMALLOC_ALIGN ;void *ptr =qemu_ram_mmap (-1 , size, align, qemu_map_flags,0 );
util/oslib-win32.c +12 -1
@@ -39,6 +39,7 @@#include "trace.h" #include "qemu/sockets.h" #include "qemu/cutils.h" +#include "qemu/error-report.h" #include <malloc.h> /* this must come after including "trace.h" */
@@ -77,10 +78,20 @@ static int get_allocation_granularity(void)return system_info.dwAllocationGranularity; } -void *qemu_anon_ram_alloc (size_t size,uint64_t *align,bool shared) +void *qemu_anon_ram_alloc (size_t size,uint64_t *align,bool shared, +bool noreserve) {void *ptr; +if (noreserve) { +/* +* We need a MEM_COMMIT before accessing any memory in a MEM_RESERVE +* area; we cannot easily mimic POSIX MAP_NORESERVE semantics. +*/ +error_report ("Skipping reservation of swap space is not supported." ); +return NULL ; + } + ptr =VirtualAlloc (NULL , size,MEM_COMMIT ,PAGE_READWRITE );trace_qemu_anon_ram_alloc (size, ptr);
Signature · 1 line
2.30.2
Re: [PATCH v5 07/14] memory: Introduce RAM_NORESERVE and wire it up in qemu_ram_mmap()
Quoted 24 lines · David Hildenbrand
Let's introduce
RAM_NORESERVE, allowing mmap'ing withMAP_NORESERVE. The new flag has the following semantics:"
RAM is mmap-ed withMAP_NORESERVE. When set, reserving swap space (or huge pages if applicable) is skipped: will bail out if not supported. When not set, the OS will do the reservation, if supported for the memory type. "Allow passing it into:
-memory_region_init_ram_nomigrate()
-memory_region_init_resizeable_ram()
-memory_region_init_ram_from_file()... and teach
qemu_ram_mmap()andqemu_anon_ram_alloc()about the flag. Bail out if the flag is not supported, which is the case right now for both, POSIX and win32. We will add Linux support next and allow specifyingRAM_NORESERVEvia memory backends.The target use case is virtio-mem, which dynamically exposes memory inside a large, sparse memory area to the VM.
Reviewed-by Peter Xu <[email protected]>Signed-off-by David Hildenbrand <[email protected]>
Quoted 11 lines
--- include/exec/cpu-common.h | 1 + include/exec/memory.h | 15 ++++++++++++--- include/exec/ram_addr.h | 3 ++- include/qemu/osdep.h | 9 ++++++++- migration/ram.c | 3 +-- softmmu/physmem.c | 15 +++++++++++---- util/mmap-alloc.c | 7 +++++++ util/oslib-posix.c | 6 ++++-- util/oslib-win32.c | 13 ++++++++++++- 9 files changed, 58 insertions(+), 14 deletions(-)
PATCH v5 8/14 util/mmap-alloc: Support RAM_NORESERVE via MAP_NORESERVE under Linux
In reply to David HildenbrandLet's support RAM_NORESERVE via MAP_NORESERVE on Linux. The flag has no effect on most shared mappings - except for hugetlbfs and anonymous memory.
Linux man page:
"MAP_NORESERVE: Do not reserve swap space for this mapping. When swap space is reserved, one has the guarantee that it is possible to modify the mapping. When swap space is not reserved one might get SIGSEGV upon a write if no physical memory is available. See also the discussion of the file /proc/sys/vm/overcommit_memory in proc(5). In kernels before 2.6, this flag had effect only for private writable mappings."
Note that the "guarantee" part is wrong with memory overcommit in Linux.
Also, in Linux hugetlbfs is treated differently - we configure reservation of huge pages from the pool, not reservation of swap space (huge pages cannot be swapped).
The rough behavior is [1]:
a) !Hugetlbfs:
1) Without MAP_NORESERVE *or* with memory overcommit under Linux disabled ("/proc/sys/vm/overcommit_memory == 2"), the following accounting/reservation happens:
For a file backed map
SHARED or READ-only - 0 cost (the file is the map not swap) PRIVATE WRITABLE - size of mapping per instance
For an anonymous or /dev/zero map
SHARED - size of mapping
PRIVATE READ-only - 0 cost (but of little use) PRIVATE WRITABLE - size of mapping per instance
2) With MAP_NORESERVE, no accounting/reservation happens.
b) Hugetlbfs:
1) Without MAP_NORESERVE, huge pages are reserved.
2) With MAP_NORESERVE, no huge pages are reserved.
Note: With "/proc/sys/vm/overcommit_memory == 0", we were already able to configure it for !hugetlbfs globally; this toggle now allows configuring it more fine-grained, not for the whole system.
The target use case is virtio-mem, which dynamically exposes memory inside a large, sparse memory area to the VM.
[1] https://www.kernel.org/doc/Documentation/vm/overcommit-accounting
--- include/qemu/osdep.h | 3 ++ softmmu/physmem.c | 1 + util/mmap-alloc.c | 69 ++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 71 insertions(+), 2 deletions(-)
include/qemu/osdep.h +3 -0
@@ -176,6 +176,9 @@ extern int daemon(int, int);#ifndef MAP_FIXED_NOREPLACE #define MAP_FIXED_NOREPLACE 0#endif +#ifndef MAP_NORESERVE +#define MAP_NORESERVE 0 +#endif #ifndef ENOMEDIUM #define ENOMEDIUM ENODEV#endif
softmmu/physmem.c +1 -0
@@ -2229,6 +2229,7 @@ void qemu_ram_remap(ram_addr_t addr, ram_addr_t length) flags =MAP_FIXED ; flags |= block->flags &RAM_SHARED ?MAP_SHARED :MAP_PRIVATE ; + flags |= block->flags &RAM_NORESERVE ?MAP_NORESERVE :0 ;if (block->fd >=0 ) { area =mmap (vaddr, length,PROT_READ |PROT_WRITE , flags, block->fd, offset);
util/mmap-alloc.c +67 -2
92 lines not on this page · raw message
Signature · 1 line
2.30.2
PATCH v5 9/14 hostmem: Wire up RAM_NORESERVE via "reserve" property
In reply to David HildenbrandLet's provide a way to control the use of RAM_NORESERVE via memory backends using the "reserve" property which defaults to true (old behavior).
Only Linux currently supports clearing the flag (and support is checked at runtime, depending on the setting of "/proc/sys/vm/overcommit_memory"). Windows and other POSIX systems will bail out with "reserve=false".
The target use case is virtio-mem, which dynamically exposes memory inside a large, sparse memory area to the VM. This essentially allows avoiding to set "/proc/sys/vm/overcommit_memory == 0") when using virtio-mem and also supporting hugetlbfs in the future.
--- backends/hostmem-file.c | 11 ++++++----- backends/hostmem-memfd.c | 1 + backends/hostmem-ram.c | 1 + backends/hostmem.c | 32 ++++++++++++++++++++++++++++++++ include/sysemu/hostmem.h | 2 +- qapi/qom.json | 4 ++++ 6 files changed, 45 insertions(+), 6 deletions(-)
backends/hostmem-file.c +6 -5
@@ -40,6 +40,7 @@ file_backend_memory_alloc(HostMemoryBackend *backend, Error **errp) object_get_typename(OBJECT(backend)));#else HostMemoryBackendFile *fb =MEMORY_BACKEND_FILE (backend); +uint32_t ram_flags;gchar *name;if (!backend->size) {
@@ -52,11 +53,11 @@ file_backend_memory_alloc(HostMemoryBackend *backend, Error **errp) } name =host_memory_backend_get_name (backend); -memory_region_init_ram_from_file (&backend->mr,OBJECT (backend), - name, - backend->size, fb->align, - (backend->share ?RAM_SHARED :0 ) | - (fb->is_pmem ?RAM_PMEM :0 ), + ram_flags = backend->share ?RAM_SHARED :0 ; + ram_flags |= backend->reserve ?0 :RAM_NORESERVE ; + ram_flags |= fb->is_pmem ?RAM_PMEM :0 ; +memory_region_init_ram_from_file (&backend->mr,OBJECT (backend), name, + backend->size, fb->align, ram_flags, fb->mem_path, fb->readonly, errp);g_free (name);#endif
backends/hostmem-memfd.c +1 -0
@@ -55,6 +55,7 @@ memfd_backend_memory_alloc(HostMemoryBackend *backend, Error **errp) name =host_memory_backend_get_name (backend); ram_flags = backend->share ?RAM_SHARED :0 ; + ram_flags |= backend->reserve ?0 :RAM_NORESERVE ;memory_region_init_ram_from_fd (&backend->mr,OBJECT (backend), name, backend->size, ram_flags, fd,0 , errp);g_free (name);
backends/hostmem-ram.c +1 -0
@@ -29,6 +29,7 @@ ram_backend_memory_alloc(HostMemoryBackend *backend, Error **errp) name =host_memory_backend_get_name (backend); ram_flags = backend->share ?RAM_SHARED :0 ; + ram_flags |= backend->reserve ?0 :RAM_NORESERVE ;memory_region_init_ram_flags_nomigrate (&backend->mr,OBJECT (backend), name, backend->size, ram_flags, errp);g_free (name);
backends/hostmem.c +32 -0
@@ -217,6 +217,11 @@ static void host_memory_backend_set_prealloc(Object *obj, bool value,Error *local_err =NULL ;HostMemoryBackend *backend =MEMORY_BACKEND (obj); +if (!backend->reserve && value) { +error_setg (errp,"'prealloc=on' and 'reserve=off' are incompatible" ); +return ; + } +if (!host_memory_backend_mr_inited (backend)) { backend->prealloc = value;return ;
@@ -268,6 +273,7 @@ static void host_memory_backend_init(Object *obj)/* TODO: convert access to globals to compat properties */ backend->merge =machine_mem_merge (machine); backend->dump =machine_dump_guest_core (machine); + backend->reserve = true; backend->prealloc_threads =1 ; }
@@ -426,6 +432,28 @@ static void host_memory_backend_set_share(Object *o, bool value, Error **errp) backend->share = value; } +static bool host_memory_backend_get_reserve (Object *o,Error **errp) +{ +HostMemoryBackend *backend =MEMORY_BACKEND (o); + +return backend->reserve; +} + +static void host_memory_backend_set_reserve (Object *o,bool value,Error **errp) +{ +HostMemoryBackend *backend =MEMORY_BACKEND (o); + +if (host_memory_backend_mr_inited (backend)) { +error_setg (errp,"cannot change property value" ); +return ; + } +if (backend->prealloc && !value) { +error_setg (errp,"'prealloc=on' and 'reserve=off' are incompatible" ); +return ; + } + backend->reserve = value; +} +static bool host_memory_backend_get_use_canonical_path (Object *obj,Error **errp) {
@@ -494,6 +522,10 @@ host_memory_backend_class_init(ObjectClass *oc, void *data) host_memory_backend_get_share, host_memory_backend_set_share);object_class_property_set_description (oc,"share" ,"Mark the memory as private to QEMU or shared" ); +object_class_property_add_bool (oc,"reserve" , + host_memory_backend_get_reserve, host_memory_backend_set_reserve); +object_class_property_set_description (oc,"reserve" , +"Reserve swap space (or huge pages) if applicable" );/* * Do not delete/rename option. This option must be considered stable * (as if it didn't have the 'x-' prefix including deprecation period) as
include/sysemu/hostmem.h +1 -1
@@ -64,7 +64,7 @@ struct HostMemoryBackend {/* protected */ uint64_t size;bool merge, dump, use_canonical_path; -bool prealloc, is_mapped, share; +bool prealloc, is_mapped, share, reserve;uint32_t prealloc_threads;DECLARE_BITMAP (host_nodes,MAX_NODES +1 );HostMemPolicy policy;
qapi/qom.json +4 -0
@@ -545,6 +545,9 @@ # @share: if false, the memory is private to QEMU; if true, it is shared # (default: false) # +# @reserve: if true, reserve swap space (or huge pages) if applicable +# default: true) +# # @size: size of the memory region in bytes # # @x-use-canonical-path-for-ramblock-id: if true, the canoncial path is used
@@ -566,6 +569,7 @@ '*prealloc': 'bool', '*prealloc-threads': 'uint32', '*share': 'bool', + '*reserve': 'bool', 'size': 'size', '*x-use-canonical-path-for-ramblock-id': 'bool' } }
Signature · 1 line
2.30.2
PATCH v5 10/14 qmp: Clarify memory backend properties returned via query-memdev
In reply to David HildenbrandWe return information on the currently configured memory backends and don't configure them, so decribe what the currently set properties express.
--- qapi/machine.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
qapi/machine.json +3 -3
@@ -790,11 +790,11 @@ # # @size: memory backend size # -# @merge: enables or disables memory merge support +# @merge: whether memory merge support is enabled # -# @dump: includes memory backend's memory in a core dump or not +# @dump: whether memory backend's memory is included in a core dump # -# @prealloc: enables or disables memory preallocation +# @prealloc: whether memory was preallocated # # @host-nodes: host nodes for its memory policy #
Signature · 1 line
2.30.2
Re: [PATCH v5 10/14] qmp: Clarify memory backend properties returned via query-memdev
Quoted 4 lines · David Hildenbrand
We return information on the currently configured memory backends and don't configure them, so decribe what the currently set properties express.
Quoted 8 lines
Suggested-by Markus Armbruster <[email protected]>Cc Eric Blake <[email protected]>Cc Markus Armbruster <[email protected]>Cc Igor Mammedov <[email protected]>Signed-off-by David Hildenbrand <[email protected]>--- qapi/machine.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
PATCH v5 11/14 qmp: Include "share" property of memory backends
In reply to David HildenbrandLet's include the property, which can be helpful when debugging, for example, to spot misuse of MAP_PRIVATE which can result in some ugly corner cases (e.g., double-memory consumption on shmem).
Use the same description we also use for describing the property.
--- hw/core/machine-qmp-cmds.c | 1 + qapi/machine.json | 3 +++ 2 files changed, 4 insertions(+)
hw/core/machine-qmp-cmds.c +1 -0
@@ -174,6 +174,7 @@ static int query_memdev(Object *obj, void *opaque) m->merge =object_property_get_bool (obj,"merge" , &error_abort); m->dump =object_property_get_bool (obj,"dump" , &error_abort); m->prealloc =object_property_get_bool (obj,"prealloc" , &error_abort); + m->share =object_property_get_bool (obj,"share" , &error_abort); m->policy =object_property_get_enum (obj,"policy" ,"HostMemPolicy" , &error_abort); host_nodes = object_property_get_qobject(obj,
qapi/machine.json +3 -0
@@ -796,6 +796,8 @@ # # @prealloc: whether memory was preallocated # +# @share: whether memory is private to QEMU or shared (since 6.1) +# # @host-nodes: host nodes for its memory policy # # @policy: memory policy of memory backend
@@ -809,6 +811,7 @@ 'merge': 'bool', 'dump': 'bool', 'prealloc': 'bool', + 'share': 'bool', 'host-nodes': ['uint16'], 'policy': 'HostMemPolicy' }}
Signature · 1 line
2.30.2
Re: [PATCH v5 11/14] qmp: Include "share" property of memory backends
Quoted 6 lines · David Hildenbrand
Let's include the property, which can be helpful when debugging, for example, to spot misuse of
MAP_PRIVATEwhich can result in some ugly corner cases (e.g., double-memory consumption on shmem).Use the same description we also use for describing the property.
Quoted 8 lines
Cc Eric Blake <[email protected]>Cc Markus Armbruster <[email protected]>Cc Igor Mammedov <[email protected]>Signed-off-by David Hildenbrand <[email protected]>--- hw/core/machine-qmp-cmds.c | 1 + qapi/machine.json | 3 +++ 2 files changed, 4 insertions(+)
PATCH v5 12/14 hmp: Print "share" property of memory backends with "info memdev"
In reply to David HildenbrandLet's print the property.
--- hw/core/machine-hmp-cmds.c | 2 ++ 1 file changed, 2 insertions(+)
hw/core/machine-hmp-cmds.c +2 -0
@@ -110,6 +110,8 @@ void hmp_info_memdev(Monitor *mon, const QDict *qdict) m->value->dump ? "true" : "false");monitor_printf (mon," prealloc: %s\n" , m->value->prealloc ?"true" :"false" ); +monitor_printf (mon," share: %s\n" , + m->value->share ?"true" :"false" );monitor_printf (mon," policy: %s\n" ,HostMemPolicy_str (m->value->policy));visit_complete (v, &str);
Signature · 1 line
2.30.2
Re: [PATCH v5 12/14] hmp: Print "share" property of memory backends with "info memdev"
Quoted 6 lines · * David Hildenbrand ([email protected]) wrote:
Let's print the property.
Cc Markus Armbruster <[email protected]>Cc Eric Blake <[email protected]>Cc Igor Mammedov <[email protected]>Signed-off-by David Hildenbrand <[email protected]>
Quoted 20 lines
--- hw/core/machine-hmp-cmds.c | 2 ++ 1 file changed, 2 insertions(+)hw/core/machine-hmp-cmds.c +2
-0@@ -110,6 +110,8 @@ void hmp_info_memdev(Monitor *mon, const QDict *qdict) m->value->dump ? "true" : "false");monitor_printf (mon," prealloc: %s\n" , m->value->prealloc ?"true" :"false" ); +monitor_printf (mon," share: %s\n" , + m->value->share ?"true" :"false" );monitor_printf (mon," policy: %s\n" ,HostMemPolicy_str (m->value->policy));visit_complete (v, &str);Signature · 1 line
2.30.2
Signature · 1 line
Dr. David Alan Gilbert / [email protected] / Manchester, UK
Re: [PATCH v5 12/14] hmp: Print "share" property of memory backends with "info memdev"
In reply to David HildenbrandQuoted 9 lines · David Hildenbrand
Let's print the property.
Cc Markus Armbruster <[email protected]>Cc Eric Blake <[email protected]>Cc Igor Mammedov <[email protected]>Signed-off-by David Hildenbrand <[email protected]>--- hw/core/machine-hmp-cmds.c | 2 ++ 1 file changed, 2 insertions(+)
PATCH v5 13/14 qmp: Include "reserve" property of memory backends
In reply to David HildenbrandLet's include the new property.
--- hw/core/machine-qmp-cmds.c | 1 + qapi/machine.json | 4 ++++ 2 files changed, 5 insertions(+)
hw/core/machine-qmp-cmds.c +1 -0
@@ -175,6 +175,7 @@ static int query_memdev(Object *obj, void *opaque) m->dump =object_property_get_bool (obj,"dump" , &error_abort); m->prealloc =object_property_get_bool (obj,"prealloc" , &error_abort); m->share =object_property_get_bool (obj,"share" , &error_abort); + m->reserve =object_property_get_bool (obj,"reserve" , &error_abort); m->policy =object_property_get_enum (obj,"policy" ,"HostMemPolicy" , &error_abort); host_nodes = object_property_get_qobject(obj,
qapi/machine.json +4 -0
@@ -798,6 +798,9 @@ # # @share: whether memory is private to QEMU or shared (since 6.1) # +# @reserve: whether swap space (or huge pages) was reserved if applicable +# (since 6.1) +# # @host-nodes: host nodes for its memory policy # # @policy: memory policy of memory backend
@@ -812,6 +815,7 @@ 'dump': 'bool', 'prealloc': 'bool', 'share': 'bool', + 'reserve': 'bool', 'host-nodes': ['uint16'], 'policy': 'HostMemPolicy' }}
Signature · 1 line
2.30.2
Re: [PATCH v5 13/14] qmp: Include "reserve" property of memory backends
Quoted 10 lines · David Hildenbrand
Let's include the new property.
Cc Eric Blake <[email protected]>Cc Markus Armbruster <[email protected]>Cc Igor Mammedov <[email protected]>Signed-off-by David Hildenbrand <[email protected]>--- hw/core/machine-qmp-cmds.c | 1 + qapi/machine.json | 4 ++++ 2 files changed, 5 insertions(+)
PATCH v5 14/14 hmp: Print "reserve" property of memory backends with "info memdev"
In reply to David HildenbrandLet's print the new property.
--- hw/core/machine-hmp-cmds.c | 2 ++ 1 file changed, 2 insertions(+)
hw/core/machine-hmp-cmds.c +2 -0
@@ -112,6 +112,8 @@ void hmp_info_memdev(Monitor *mon, const QDict *qdict) m->value->prealloc ? "true" : "false");monitor_printf (mon," share: %s\n" , m->value->share ?"true" :"false" ); +monitor_printf (mon," reserve: %s\n" , + m->value->reserve ?"true" :"false" );monitor_printf (mon," policy: %s\n" ,HostMemPolicy_str (m->value->policy));visit_complete (v, &str);
Signature · 1 line
2.30.2
Re: [PATCH v5 14/14] hmp: Print "reserve" property of memory backends with "info memdev"
Quoted 10 lines · David Hildenbrand
Let's print the new property.
Reviewed-by Dr. David Alan Gilbert <[email protected]>Cc Markus Armbruster <[email protected]>Cc Eric Blake <[email protected]>Cc Igor Mammedov <[email protected]>Signed-off-by David Hildenbrand <[email protected]>--- hw/core/machine-hmp-cmds.c | 2 ++ 1 file changed, 2 insertions(+)