nvdimm: read-only file support
v2 cover nvdimm: read-only file support
v2:
* s/the the/the/ in documentation [Philippe]
* Assign nvdimm->unarmed earlier [Philippe]
There is currently no way to back an NVDIMM with a read-only file so it can be safely shared between untrusted guests.
Introduce an -object memory-backend-file,readonly=on|off option.
Julio Montes sent an earlier patch here:
https://patchew.org/QEMU/[email protected]/
Eric Ernst requested this feature again for Kata Containers so I gave it a try.
Stefan Hajnoczi (3):
memory: add readonly support to memory_region_init_ram_from_file()
hostmem-file: add readonly=on|off option
nvdimm: honor -object memory-backend-file,readonly=on option
docs/nvdimm.txt | 8 +++++++- include/exec/memory.h | 2 ++ include/exec/ram_addr.h | 5 +++-- include/qemu/mmap-alloc.h | 2 ++ backends/hostmem-file.c | 26 +++++++++++++++++++++++++- exec.c | 18 +++++++++++------- hw/mem/nvdimm.c | 4 ++++ softmmu/memory.c | 7 +++++-- util/mmap-alloc.c | 10 ++++++---- util/oslib-posix.c | 2 +- qemu-options.hx | 5 ++++- 11 files changed, 70 insertions(+), 19 deletions(-)
Signature · 1 line
2.26.2
PATCH v2 1/3 memory: add readonly support to memory_region_init_ram_from_file()
There is currently no way to open(O_RDONLY) and mmap(PROT_READ) when creating a memory region from a file. This functionality is needed since the underlying host file may not allow writing.
Add a bool readonly argument to memory_region_init_ram_from_file() and the APIs it calls.
Extend memory_region_init_ram_from_file() rather than introducing a memory_region_init_rom_from_file() API so that callers can easily make a choice between read/write and read-only at runtime without calling different APIs.
No new RAMBlock flag is introduced for read-only because it's unclear whether RAMBlocks need to know that they are read-only. Pass a bool readonly argument instead.
Both of these design decisions can be changed in the future. It just seemed like the simplest approach to me.
--- include/exec/memory.h | 2 ++ include/exec/ram_addr.h | 5 +++-- include/qemu/mmap-alloc.h | 2 ++ backends/hostmem-file.c | 2 +- exec.c | 18 +++++++++++------- softmmu/memory.c | 7 +++++-- util/mmap-alloc.c | 10 ++++++---- util/oslib-posix.c | 2 +- 8 files changed, 31 insertions(+), 17 deletions(-)
include/exec/memory.h +2 -0
@@ -879,6 +879,7 @@ void memory_region_init_resizeable_ram(MemoryRegion *mr,* - RAM_PMEM: the memory is persistent memory * Other bits are ignored now. * @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. * * Note that this function does not do anything to cause the data in the
@@ -891,6 +892,7 @@ void memory_region_init_ram_from_file(MemoryRegion *mr,uint64_t align, uint32_t ram_flags, const char *path, + bool readonly, Error **errp);/**
include/exec/ram_addr.h +3 -2
@@ -110,6 +110,7 @@ long qemu_maxrampagesize(void);* - RAM_PMEM: the backend @mem_path or @fd is persistent memory * Other bits are ignored. * @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 * * Return:
@@ -118,9 +119,9 @@ long qemu_maxrampagesize(void);*/ RAMBlock *qemu_ram_alloc_from_file (ram_addr_t size,MemoryRegion *mr,uint32_t ram_flags,const char *mem_path, -Error **errp); +bool readonly,Error **errp);RAMBlock *qemu_ram_alloc_from_fd (ram_addr_t size,MemoryRegion *mr, -uint32_t ram_flags,int fd, +uint32_t ram_flags,int fd,bool readonly,Error **errp); RAMBlock *qemu_ram_alloc_from_ptr(ram_addr_t size, void *host,
include/qemu/mmap-alloc.h +2 -0
@@ -14,6 +14,7 @@ size_t qemu_mempath_getpagesize(const char *mem_path);* @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. *
@@ -24,6 +25,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);
backends/hostmem-file.c +1 -1
@@ -58,7 +58,7 @@ file_backend_memory_alloc(HostMemoryBackend *backend, Error **errp) backend->size, fb->align, (backend->share ?RAM_SHARED :0 ) | (fb->is_pmem ?RAM_PMEM :0 ), - fb->mem_path, errp); + fb->mem_path, false, errp);g_free (name);#endif }
exec.c +11 -7
@@ -1770,6 +1770,7 @@ static int64_t get_file_align(int fd)static int file_ram_open (const char *path,const char *region_name, +bool readonly,bool *created,Error **errp) {
@@ -1780,7 +1781,7 @@ static int file_ram_open(const char *path, *created = false;for (;;) { - fd =open (path,O_RDWR ); + fd =open (path, readonly ?O_RDONLY :O_RDWR );if (fd >=0 ) {/* @path names an existing file, use it */ break ;
@@ -1832,6 +1833,7 @@ static int file_ram_open(const char *path,static void *file_ram_alloc (RAMBlock *block,ram_addr_t memory,int fd, +bool readonly,bool truncate,Error **errp) {
@@ -1882,7 +1884,7 @@ static void *file_ram_alloc(RAMBlock *block,perror ("ftruncate" ); } - area =qemu_ram_mmap (fd, memory, block->mr->align, + area =qemu_ram_mmap (fd, memory, block->mr->align, readonly, block->flags &RAM_SHARED , block->flags &RAM_PMEM );if (area ==MAP_FAILED ) { error_setg_errno(errp, errno,
@@ -2314,7 +2316,7 @@ static void ram_block_add(RAMBlock *new_block, Error **errp, bool shared)#ifdef CONFIG_POSIX RAMBlock *qemu_ram_alloc_from_fd (ram_addr_t size,MemoryRegion *mr, -uint32_t ram_flags,int fd, +uint32_t ram_flags,int fd,bool readonly,Error **errp) {RAMBlock *new_block;
@@ -2368,7 +2370,8 @@ RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, MemoryRegion *mr, new_block->used_length = size; new_block->max_length = size; new_block->flags = ram_flags; - new_block->host =file_ram_alloc (new_block, size, fd, !file_size, errp); + new_block->host =file_ram_alloc (new_block, size, fd, readonly, + !file_size, errp);if (!new_block->host) {g_free (new_block);return NULL ;
@@ -2387,18 +2390,19 @@ RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, MemoryRegion *mr,RAMBlock *qemu_ram_alloc_from_file (ram_addr_t size,MemoryRegion *mr,uint32_t ram_flags,const char *mem_path, -Error **errp) +bool readonly,Error **errp) {int fd;bool created;RAMBlock *block; - fd =file_ram_open (mem_path,memory_region_name (mr), &created, errp); + fd =file_ram_open (mem_path,memory_region_name (mr), readonly, &created, + errp);if (fd <0 ) {return NULL ; } - block =qemu_ram_alloc_from_fd (size, mr, ram_flags, fd, errp); + block =qemu_ram_alloc_from_fd (size, mr, ram_flags, fd, readonly, errp);if (!block) {if (created) {unlink (mem_path);
softmmu/memory.c +5 -2
@@ -1553,15 +1553,18 @@ void memory_region_init_ram_from_file(MemoryRegion *mr,uint64_t align, uint32_t ram_flags, const char *path, + bool readonly, Error **errp) { Error *err = NULL;memory_region_init (mr, owner, name, size); mr->ram = true; + mr->readonly = readonly; mr->terminates = true; mr->destructor = memory_region_destructor_ram; mr->align = align; - mr->ram_block =qemu_ram_alloc_from_file (size, mr, ram_flags, path, &err); + mr->ram_block =qemu_ram_alloc_from_file (size, mr, ram_flags, path, + readonly, &err); mr->dirty_log_mask =tcg_enabled () ? (1 <<DIRTY_MEMORY_CODE ) :0 ;if (err) { mr->size =int128_zero ();
@@ -1585,7 +1588,7 @@ void memory_region_init_ram_from_fd(MemoryRegion *mr, mr->destructor = memory_region_destructor_ram; mr->ram_block =qemu_ram_alloc_from_fd (size, mr, share ?RAM_SHARED :0 , - fd, &err); + fd, false, &err); mr->dirty_log_mask =tcg_enabled () ? (1 <<DIRTY_MEMORY_CODE ) :0 ;if (err) { mr->size =int128_zero ();
util/mmap-alloc.c +6 -4
@@ -85,9 +85,11 @@ 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) { +int prot;int flags;int map_sync_flags =0 ;int guardfd;
@@ -146,8 +148,9 @@ void *qemu_ram_mmap(int fd, offset =QEMU_ALIGN_UP ((uintptr_t )guardptr, align) - (uintptr_t )guardptr; - ptr =mmap (guardptr + offset, size,PROT_READ |PROT_WRITE , - flags | map_sync_flags, fd,0 ); + prot =PROT_READ | (readonly ?0 :PROT_WRITE ); + + ptr =mmap (guardptr + offset, size, prot, flags | map_sync_flags, fd,0 );if (ptr ==MAP_FAILED && map_sync_flags) {if (errno ==ENOTSUP ) {
@@ -171,8 +174,7 @@ void *qemu_ram_mmap(int fd,* if map failed with MAP_SHARED_VALIDATE | MAP_SYNC, * we will remove these flags to handle compatibility. */ - ptr =mmap (guardptr + offset, size,PROT_READ |PROT_WRITE , - flags, fd,0 ); + ptr =mmap (guardptr + offset, size, prot, flags, fd,0 ); }if (ptr ==MAP_FAILED ) {
util/oslib-posix.c +1 -1
@@ -227,7 +227,7 @@ void *qemu_memalign(size_t alignment, size_t size)void *qemu_anon_ram_alloc (size_t size,uint64_t *alignment,bool shared) {size_t align =QEMU_VMALLOC_ALIGN ; -void *ptr =qemu_ram_mmap (-1 , size, align, shared, false); +void *ptr =qemu_ram_mmap (-1 , size, align, false, shared, false);if (ptr ==MAP_FAILED ) {return NULL ;
Signature · 1 line
2.26.2
Re: [PATCH v2 1/3] memory: add readonly support to memory_region_init_ram_from_file()
Quoted 16 lines · On Wed, 16 Sep 2020 10:51:48 +0100 Stefan Hajnoczi <[email protected]> wrote:
There is currently no way to
open(O_RDONLY)andmmap(PROT_READ)when creating a memory region from a file. This functionality is needed since the underlying host file may not allow writing.Add a bool readonly argument to
memory_region_init_ram_from_file()and the APIs it calls.Extend
memory_region_init_ram_from_file()rather than introducing amemory_region_init_rom_from_file()API so that callers can easily make a choice between read/write and read-only at runtime without calling different APIs.No new RAMBlock flag is introduced for read-only because it's unclear whether RAMBlocks need to know that they are read-only. Pass a bool readonly argument instead.
Quoted 6 lines
Both of these design decisions can be changed in the future. It just seemed like the simplest approach to me.
Reviewed-by Philippe Mathieu-Daudé <[email protected]>Signed-off-by Stefan Hajnoczi <[email protected]>
Quoted 252 lines
--- include/exec/memory.h | 2 ++ include/exec/ram_addr.h | 5 +++-- include/qemu/mmap-alloc.h | 2 ++ backends/hostmem-file.c | 2 +- exec.c | 18 +++++++++++------- softmmu/memory.c | 7 +++++-- util/mmap-alloc.c | 10 ++++++---- util/oslib-posix.c | 2 +- 8 files changed, 31 insertions(+), 17 deletions(-)include/exec/memory.h +2
-0@@ -879,6 +879,7 @@ void memory_region_init_resizeable_ram(MemoryRegion *mr,* - RAM_PMEM: the memory is persistent memory * Other bits are ignored now. * @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. * * Note that this function does not do anything to cause the data in the @@ -891,6 +892,7 @@ void memory_region_init_ram_from_file(MemoryRegion *mr,uint64_t align, uint32_t ram_flags, const char *path, + bool readonly, Error **errp);/** include/exec/ram_addr.h +3
-2@@ -110,6 +110,7 @@ long qemu_maxrampagesize(void);* - RAM_PMEM: the backend @mem_path or @fd is persistent memory * Other bits are ignored. * @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 * * Return: @@ -118,9 +119,9 @@ long qemu_maxrampagesize(void);*/ RAMBlock *qemu_ram_alloc_from_file (ram_addr_t size,MemoryRegion *mr,uint32_t ram_flags,const char *mem_path, -Error **errp); +bool readonly,Error **errp);RAMBlock *qemu_ram_alloc_from_fd (ram_addr_t size,MemoryRegion *mr, -uint32_t ram_flags,int fd, +uint32_t ram_flags,int fd,bool readonly,Error **errp); RAMBlock *qemu_ram_alloc_from_ptr(ram_addr_t size, void *host,include/qemu/mmap-alloc.h +2
-0@@ -14,6 +14,7 @@ size_t qemu_mempath_getpagesize(const char *mem_path);* @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. * @@ -24,6 +25,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);backends/hostmem-file.c +1
-1@@ -58,7 +58,7 @@ file_backend_memory_alloc(HostMemoryBackend *backend, Error **errp) backend->size, fb->align, (backend->share ?RAM_SHARED :0 ) | (fb->is_pmem ?RAM_PMEM :0 ), - fb->mem_path, errp); + fb->mem_path, false, errp);g_free (name);#endif }exec.c +11
-7@@ -1770,6 +1770,7 @@ static int64_t get_file_align(int fd)static int file_ram_open (const char *path,const char *region_name, +bool readonly,bool *created,Error **errp) {@@ -1780,7 +1781,7 @@ static int file_ram_open(const char *path, *created = false;for (;;) { - fd =open (path,O_RDWR ); + fd =open (path, readonly ?O_RDONLY :O_RDWR );if (fd >=0 ) {/* @path names an existing file, use it */ break ;@@ -1832,6 +1833,7 @@ static int file_ram_open(const char *path,static void *file_ram_alloc (RAMBlock *block,ram_addr_t memory,int fd, +bool readonly,bool truncate,Error **errp) {@@ -1882,7 +1884,7 @@ static void *file_ram_alloc(RAMBlock *block,perror ("ftruncate" ); } - area =qemu_ram_mmap (fd, memory, block->mr->align, + area =qemu_ram_mmap (fd, memory, block->mr->align, readonly, block->flags &RAM_SHARED , block->flags &RAM_PMEM );if (area ==MAP_FAILED ) { error_setg_errno(errp, errno,@@ -2314,7 +2316,7 @@ static void ram_block_add(RAMBlock *new_block, Error **errp, bool shared)#ifdef CONFIG_POSIX RAMBlock *qemu_ram_alloc_from_fd (ram_addr_t size,MemoryRegion *mr, -uint32_t ram_flags,int fd, +uint32_t ram_flags,int fd,bool readonly,Error **errp) {RAMBlock *new_block;@@ -2368,7 +2370,8 @@ RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, MemoryRegion *mr, new_block->used_length = size; new_block->max_length = size; new_block->flags = ram_flags; - new_block->host =file_ram_alloc (new_block, size, fd, !file_size, errp); + new_block->host =file_ram_alloc (new_block, size, fd, readonly, + !file_size, errp);if (!new_block->host) {g_free (new_block);return NULL ;@@ -2387,18 +2390,19 @@ RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, MemoryRegion *mr,RAMBlock *qemu_ram_alloc_from_file (ram_addr_t size,MemoryRegion *mr,uint32_t ram_flags,const char *mem_path, -Error **errp) +bool readonly,Error **errp) {int fd;bool created;RAMBlock *block; - fd =file_ram_open (mem_path,memory_region_name (mr), &created, errp); + fd =file_ram_open (mem_path,memory_region_name (mr), readonly, &created, + errp);if (fd <0 ) {return NULL ; } - block =qemu_ram_alloc_from_fd (size, mr, ram_flags, fd, errp); + block =qemu_ram_alloc_from_fd (size, mr, ram_flags, fd, readonly, errp);if (!block) {if (created) {unlink (mem_path);softmmu/memory.c +5
-2@@ -1553,15 +1553,18 @@ void memory_region_init_ram_from_file(MemoryRegion *mr,uint64_t align, uint32_t ram_flags, const char *path, + bool readonly, Error **errp) { Error *err = NULL;memory_region_init (mr, owner, name, size); mr->ram = true; + mr->readonly = readonly; mr->terminates = true; mr->destructor = memory_region_destructor_ram; mr->align = align; - mr->ram_block =qemu_ram_alloc_from_file (size, mr, ram_flags, path, &err); + mr->ram_block =qemu_ram_alloc_from_file (size, mr, ram_flags, path, + readonly, &err); mr->dirty_log_mask =tcg_enabled () ? (1 <<DIRTY_MEMORY_CODE ) :0 ;if (err) { mr->size =int128_zero ();@@ -1585,7 +1588,7 @@ void memory_region_init_ram_from_fd(MemoryRegion *mr, mr->destructor = memory_region_destructor_ram; mr->ram_block =qemu_ram_alloc_from_fd (size, mr, share ?RAM_SHARED :0 , - fd, &err); + fd, false, &err); mr->dirty_log_mask =tcg_enabled () ? (1 <<DIRTY_MEMORY_CODE ) :0 ;if (err) { mr->size =int128_zero ();util/mmap-alloc.c +6
-4@@ -85,9 +85,11 @@ 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) { +int prot;int flags;int map_sync_flags =0 ;int guardfd;@@ -146,8 +148,9 @@ void *qemu_ram_mmap(int fd, offset =QEMU_ALIGN_UP ((uintptr_t )guardptr, align) - (uintptr_t )guardptr; - ptr =mmap (guardptr + offset, size,PROT_READ |PROT_WRITE , - flags | map_sync_flags, fd,0 ); + prot =PROT_READ | (readonly ?0 :PROT_WRITE ); + + ptr =mmap (guardptr + offset, size, prot, flags | map_sync_flags, fd,0 );if (ptr ==MAP_FAILED && map_sync_flags) {if (errno ==ENOTSUP ) {@@ -171,8 +174,7 @@ void *qemu_ram_mmap(int fd,* if map failed with MAP_SHARED_VALIDATE | MAP_SYNC, * we will remove these flags to handle compatibility. */ - ptr =mmap (guardptr + offset, size,PROT_READ |PROT_WRITE , - flags, fd,0 ); + ptr =mmap (guardptr + offset, size, prot, flags, fd,0 ); }if (ptr ==MAP_FAILED ) {util/oslib-posix.c +1
-1@@ -227,7 +227,7 @@ void *qemu_memalign(size_t alignment, size_t size)void *qemu_anon_ram_alloc (size_t size,uint64_t *alignment,bool shared) {size_t align =QEMU_VMALLOC_ALIGN ; -void *ptr =qemu_ram_mmap (-1 , size, align, shared, false); +void *ptr =qemu_ram_mmap (-1 , size, align, false, shared, false);if (ptr ==MAP_FAILED ) {return NULL ;
PATCH v2 2/3 hostmem-file: add readonly=on|off option
In reply to Stefan HajnocziLet -object memory-backend-file work on read-only files when the readonly=on option is given. This can be used to share the contents of a file between multiple guests while preventing them from consuming Copy-on-Write memory if guests dirty the pages, for example.
--- backends/hostmem-file.c | 26 +++++++++++++++++++++++++- qemu-options.hx | 5 ++++- 2 files changed, 29 insertions(+), 2 deletions(-)
backends/hostmem-file.c +25 -1
@@ -31,6 +31,7 @@ struct HostMemoryBackendFile {uint64_t align;bool discard_data;bool is_pmem; +bool readonly; }; static void
@@ -58,7 +59,7 @@ file_backend_memory_alloc(HostMemoryBackend *backend, Error **errp) backend->size, fb->align, (backend->share ?RAM_SHARED :0 ) | (fb->is_pmem ?RAM_PMEM :0 ), - fb->mem_path, false, errp); + fb->mem_path, fb->readonly, errp);g_free (name);#endif }
@@ -153,6 +154,26 @@ static void file_memory_backend_set_pmem(Object *o, bool value, Error **errp) fb->is_pmem = value; } +static bool file_memory_backend_get_readonly (Object *o,Error **errp) +{ +return MEMORY_BACKEND_FILE (o)->readonly; +} + +static void file_memory_backend_set_readonly (Object *o,bool value, +Error **errp) +{ +HostMemoryBackend *backend =MEMORY_BACKEND (o); +HostMemoryBackendFile *fb =MEMORY_BACKEND_FILE (o); + +if (host_memory_backend_mr_inited (backend)) { +error_setg (errp,"cannot change property 'readonly' of %s." , +object_get_typename (o)); +return ; + } + + fb->readonly = value; +} +static void file_backend_unparent (Object *obj) {HostMemoryBackend *backend =MEMORY_BACKEND (obj);
@@ -184,6 +205,9 @@ file_backend_class_init(ObjectClass *oc, void *data) NULL, NULL);object_class_property_add_bool (oc,"pmem" , file_memory_backend_get_pmem, file_memory_backend_set_pmem); +object_class_property_add_bool (oc,"readonly" , + file_memory_backend_get_readonly, + file_memory_backend_set_readonly); }static void file_backend_instance_finalize (Object *o)
qemu-options.hx +4 -1
@@ -4369,7 +4369,7 @@ SRST they are specified. Note that the 'id' property must be set. These objects are placed in the '/objects' path. - ``-object memory-backend-file,id=id,size=size,mem-path=dir,share=on|off,discard-data=on|off,merge=on|off,dump=on|off,prealloc=on|off,host-nodes=host-nodes,policy=default|preferred|bind|interleave,align=align`` + ``-object memory-backend-file,id=id,size=size,mem-path=dir,share=on|off,discard-data=on|off,merge=on|off,dump=on|off,prealloc=on|off,host-nodes=host-nodes,policy=default|preferred|bind|interleave,align=align,readonly=on|off`` Creates a memory file backend object, which can be used to back the guest RAM with huge pages.
@@ -4452,6 +4452,9 @@ SRST 4.15) and the filesystem of ``mem-path`` mounted with DAX option. + The ``readonly`` option specifies whether the backing file is opened + read-only or read-write (default). + ``-object memory-backend-ram,id=id,merge=on|off,dump=on|off,share=on|off,prealloc=on|off,size=size,host-nodes=host-nodes,policy=default|preferred|bind|interleave`` Creates a memory backend object, which can be used to back the guest RAM. Memory backend objects offer more control than the
Signature · 1 line
2.26.2
Re: [PATCH v2 2/3] hostmem-file: add readonly=on|off option
Quoted 8 lines · On Wed, 16 Sep 2020 10:51:49 +0100 Stefan Hajnoczi <[email protected]> wrote:
Let -object memory-backend-file work on read-only files when the readonly=on option is given. This can be used to share the contents of a file between multiple guests while preventing them from consuming Copy-on-Write memory if guests dirty the pages, for example.
Reviewed-by Philippe Mathieu-Daudé <[email protected]>Signed-off-by Stefan Hajnoczi <[email protected]>
cosmetic/style nits only
s/Object *o/Object *obj/
for consistency with the rest of the code in file.
Quoted 27 lines
--- backends/hostmem-file.c | 26 +++++++++++++++++++++++++- qemu-options.hx | 5 ++++- 2 files changed, 29 insertions(+), 2 deletions(-)backends/hostmem-file.c +2
-1@@ -31,6 +31,7 @@ struct HostMemoryBackendFile {uint64_t align;bool discard_data;bool is_pmem; +bool readonly; }; static void@@ -58,7 +59,7 @@ file_backend_memory_alloc(HostMemoryBackend *backend, Error **errp) backend->size, fb->align, (backend->share ?RAM_SHARED :0 ) | (fb->is_pmem ?RAM_PMEM :0 ), - fb->mem_path, false, errp); + fb->mem_path, fb->readonly, errp);g_free (name);#endif }
backends/hostmem-file.c static void file_memory_backend_set_pmem(Object *o, bool value, Error **errp) · line 159
Quoted 6 lines
backends/hostmem-file.c +3
-0@@ -153,6 +154,26 @@ static void file_memory_backend_set_pmem(Object *o, bool value, Error **errp) fb->is_pmem = value; } +static bool file_memory_backend_get_readonly (Object *o,Error **errp) +{ +return MEMORY_BACKEND_FILE (o)->readonly;
I thought using macro this way not acceptable and one should use
HostMemoryBackendFile *fb = MEMORY_BACKEND_FILE(o);
return fb->readonly;
Quoted 53 lines
backends/hostmem-file.c +20
-0+} + +static void file_memory_backend_set_readonly (Object *o,bool value, +Error **errp) +{ +HostMemoryBackend *backend =MEMORY_BACKEND (o); +HostMemoryBackendFile *fb =MEMORY_BACKEND_FILE (o); + +if (host_memory_backend_mr_inited (backend)) { +error_setg (errp,"cannot change property 'readonly' of %s." , +object_get_typename (o)); +return ; + } + + fb->readonly = value; +} +static void file_backend_unparent (Object *obj) {HostMemoryBackend *backend =MEMORY_BACKEND (obj);@@ -184,6 +205,9 @@ file_backend_class_init(ObjectClass *oc, void *data) NULL, NULL);object_class_property_add_bool (oc,"pmem" , file_memory_backend_get_pmem, file_memory_backend_set_pmem); +object_class_property_add_bool (oc,"readonly" , + file_memory_backend_get_readonly, + file_memory_backend_set_readonly); }static void file_backend_instance_finalize (Object *o)qemu-options.hx +4
-1@@ -4369,7 +4369,7 @@ SRST they are specified. Note that the 'id' property must be set. These objects are placed in the '/objects' path. - ``-object memory-backend-file,id=id,size=size,mem-path=dir,share=on|off,discard-data=on|off,merge=on|off,dump=on|off,prealloc=on|off,host-nodes=host-nodes,policy=default|preferred|bind|interleave,align=align`` + ``-object memory-backend-file,id=id,size=size,mem-path=dir,share=on|off,discard-data=on|off,merge=on|off,dump=on|off,prealloc=on|off,host-nodes=host-nodes,policy=default|preferred|bind|interleave,align=align,readonly=on|off`` Creates a memory file backend object, which can be used to back the guest RAM with huge pages.@@ -4452,6 +4452,9 @@ SRST 4.15) and the filesystem of ``mem-path`` mounted with DAX option. + The ``readonly`` option specifies whether the backing file is opened + read-only or read-write (default). + ``-object memory-backend-ram,id=id,merge=on|off,dump=on|off,share=on|off,prealloc=on|off,size=size,host-nodes=host-nodes,policy=default|preferred|bind|interleave`` Creates a memory backend object, which can be used to back the guest RAM. Memory backend objects offer more control than the
Re: [PATCH v2 2/3] hostmem-file: add readonly=on|off option
Quoted 12 lines · Igor Mammedov
Quoted 8 lines · On Wed, 16 Sep 2020 10:51:49 +0100 Stefan Hajnoczi <[email protected]> wrote:
Let -object memory-backend-file work on read-only files when the readonly=on option is given. This can be used to share the contents of a file between multiple guests while preventing them from consuming Copy-on-Write memory if guests dirty the pages, for example.
Reviewed-by Philippe Mathieu-Daudé <[email protected]>Signed-off-by Stefan Hajnoczi <[email protected]>
Quoted 5 lines
cosmetic/style nits only
s/Object *o/Object *obj/
for consistency with the rest of the code in file.
Will fix.
Quoted 10 lines
backends/hostmem-file.c static void file_memory_backend_set_pmem(Object *o, bool value, Error **errp) · line 159
Quoted 7 lines
backends/hostmem-file.c +3
-0@@ -153,6 +154,26 @@ static void file_memory_backend_set_pmem(Object *o, bool value, Error **errp) fb->is_pmem = value; } +static bool file_memory_backend_get_readonly (Object *o,Error **errp) +{ +return MEMORY_BACKEND_FILE (o)->readonly;I thought using macro this way not acceptable and one should use
Quoted 3 lines
HostMemoryBackendFile *fb =
MEMORY_BACKEND_FILE(o);return
fb->readonly;
I'm not sure where this is forbidden or why? I've updated the patch as suggested anyway.
Stefan
Re: [PATCH v2 2/3] hostmem-file: add readonly=on|off option
Quoted 31 lines · Stefan Hajnoczi
Quoted 12 lines · Igor Mammedov
Quoted 8 lines · On Wed, 16 Sep 2020 10:51:49 +0100 Stefan Hajnoczi <[email protected]> wrote:
Let -object memory-backend-file work on read-only files when the readonly=on option is given. This can be used to share the contents of a file between multiple guests while preventing them from consuming Copy-on-Write memory if guests dirty the pages, for example.
Reviewed-by Philippe Mathieu-Daudé <[email protected]>Signed-off-by Stefan Hajnoczi <[email protected]>Quoted 5 lines
cosmetic/style nits only
s/Object *o/Object *obj/
for consistency with the rest of the code in file.
Will fix.
Quoted 10 lines
backends/hostmem-file.c static void file_memory_backend_set_pmem(Object *o, bool value, Error **errp) · line 159
Quoted 7 lines
backends/hostmem-file.c +3
-0@@ -153,6 +154,26 @@ static void file_memory_backend_set_pmem(Object *o, bool value, Error **errp) fb->is_pmem = value; } +static bool file_memory_backend_get_readonly (Object *o,Error **errp) +{ +return MEMORY_BACKEND_FILE (o)->readonly;I thought using macro this way not acceptable and one should use
Quoted 6 lines
Quoted 3 lines
HostMemoryBackendFile *fb =
MEMORY_BACKEND_FILE(o);return
fb->readonly;I'm not sure where this is forbidden or why? I've updated the patch as suggested anyway.
I have a vague memory of seeing this documented somewhere, but I can't find it anywhere in the QOM documentation or git log.
I don't think we need to make this a rule, though.
Signature · 1 line
Eduardo
PATCH v2 3/3 nvdimm: honor -object memory-backend-file, readonly=on option
In reply to Stefan HajnocziMake it possible to present read-only files to the guest as "unarmed" NVDIMMs. The Linux NVDIMM device (/dev/pmemX) is read-only.
--- docs/nvdimm.txt | 8 +++++++- hw/mem/nvdimm.c | 4 ++++ 2 files changed, 11 insertions(+), 1 deletion(-)
docs/nvdimm.txt +7 -1
@@ -17,7 +17,7 @@ following command line options: -machine pc,nvdimm -m $RAM_SIZE,slots=$N,maxmem=$MAX_SIZE - -object memory-backend-file,id=mem1,share=on,mem-path=$PATH,size=$NVDIMM_SIZE + -object memory-backend-file,id=mem1,share=on,mem-path=$PATH,size=$NVDIMM_SIZE,readonly=off -device nvdimm,id=nvdimm1,memdev=mem1 Where,
@@ -42,6 +42,12 @@ Where, "share=off", then guest writes won't be applied to the backend file and thus will be invisible to other guests. + "readonly=on/off" controls whether the file $PATH is opened read-only or + read/write (default). "readonly=on" sets the ACPI NFIT NVDIMM Region Mapping + Structure "NVDIMM State Flags" Bit 3 indicating that the device is "unarmed" + and cannot accept persistent writes. Linux guest drivers set the device to + read-only when this bit is present. + - "device nvdimm,id=nvdimm1,memdev=mem1" creates a virtual NVDIMM device whose storage is provided by above memory backend device.
hw/mem/nvdimm.c +4 -0
@@ -146,6 +146,10 @@ static void nvdimm_prepare_memory_region(NVDIMMDevice *nvdimm, Error **errp)return ; } +if (memory_region_is_rom (mr)) { + nvdimm->unarmed = true;/* this device is read-only */ + } + nvdimm->nvdimm_mr =g_new (MemoryRegion,1 );memory_region_init_alias (nvdimm->nvdimm_mr,OBJECT (dimm),"nvdimm-memory" , mr,0 , pmem_size);
Signature · 1 line
2.26.2
Re: [PATCH v2 3/3] nvdimm: honor -object memory-backend-file, readonly=on option
Quoted 42 lines · On Wed, 16 Sep 2020 10:51:50 +0100 Stefan Hajnoczi <[email protected]> wrote:
Make it possible to present read-only files to the guest as "unarmed" NVDIMMs. The Linux NVDIMM device (
/dev/pmemX) is read-only.Reviewed-by Philippe Mathieu-Daudé <[email protected]>Signed-off-by Stefan Hajnoczi <[email protected]>--- docs/nvdimm.txt | 8 +++++++- hw/mem/nvdimm.c | 4 ++++ 2 files changed, 11 insertions(+), 1 deletion(-)docs/nvdimm.txt +7
-1@@ -17,7 +17,7 @@ following command line options: -machine pc,nvdimm -m $RAM_SIZE,slots=$N,maxmem=$MAX_SIZE - -object memory-backend-file,id=mem1,share=on,mem-path=$PATH,size=$NVDIMM_SIZE + -object memory-backend-file,id=mem1,share=on,mem-path=$PATH,size=$NVDIMM_SIZE,readonly=off -device nvdimm,id=nvdimm1,memdev=mem1 Where,@@ -42,6 +42,12 @@ Where, "share=off", then guest writes won't be applied to the backend file and thus will be invisible to other guests. + "readonly=on/off" controls whether the file $PATH is opened read-only or + read/write (default). "readonly=on" sets the ACPI NFIT NVDIMM Region Mapping + Structure "NVDIMM State Flags" Bit 3 indicating that the device is "unarmed" + and cannot accept persistent writes. Linux guest drivers set the device to + read-only when this bit is present. + - "device nvdimm,id=nvdimm1,memdev=mem1" creates a virtual NVDIMM device whose storage is provided by above memory backend device.hw/mem/nvdimm.c +0
-0
hw/mem/nvdimm.c static void nvdimm_prepare_memory_region(NVDIMMDevice *nvdimm, Error **errp) · line 151
Quoted 6 lines
hw/mem/nvdimm.c +3
-0@@ -146,6 +146,10 @@ static void nvdimm_prepare_memory_region(NVDIMMDevice *nvdimm, Error **errp)return ; } +if (memory_region_is_rom (mr)) { + nvdimm->unarmed = true;/* this device is read-only */ + }
we probably should error out in case 'backend,readonly=true + nvdimm,unarmed=false' instead of silently ignoring user's input
Quoted 3 lines
hw/mem/nvdimm.c +0
-0nvdimm->nvdimm_mr =g_new (MemoryRegion,1 );memory_region_init_alias (nvdimm->nvdimm_mr,OBJECT (dimm),"nvdimm-memory" , mr,0 , pmem_size);
Re: [PATCH v2 3/3] nvdimm: honor -object memory-backend-file, readonly=on option
Quoted 10 lines · Igor Mammedov
Quoted 8 lines · On Wed, 16 Sep 2020 10:51:50 +0100 Stefan Hajnoczi <[email protected]> wrote:
hw/mem/nvdimm.c +0
-0@@ -146,6 +146,10 @@ static void nvdimm_prepare_memory_region(NVDIMMDevice *nvdimm, Error **errp)return ; }
Quoted 5 lines
hw/mem/nvdimm.c static void nvdimm_prepare_memory_region(NVDIMMDevice *nvdimm, Error **errp) · line 151
Quoted 3 lines
hw/mem/nvdimm.c +3
-0+if (memory_region_is_rom (mr)) { + nvdimm->unarmed = true;/* this device is read-only */ + }we probably should error out in case 'backend,readonly=true + nvdimm,unarmed=false' instead of silently ignoring user's input
Will fix.
Quoted 3 lines · Stefan Hajnoczi
v2:
* s/the the/the/ in documentation [Philippe]
* Assignnvdimm->unarmedearlier [Philippe]
Ping
Quoted 31 lines
There is currently no way to back an NVDIMM with a read-only file so it can be safely shared between untrusted guests.
Introduce an -object memory-backend-file,readonly=on|off option.
Julio Montes sent an earlier patch here:
https://patchew.org/QEMU/[email protected]/Eric Ernst requested this feature again for Kata Containers so I gave it a try.
Stefan Hajnoczi (3):
memory: add readonly support tomemory_region_init_ram_from_file()
hostmem-file: add readonly=on|off option
nvdimm: honor -object memory-backend-file,readonly=on optiondocs/nvdimm.txt | 8 +++++++- include/exec/memory.h | 2 ++ include/exec/ram_addr.h | 5 +++-- include/qemu/mmap-alloc.h | 2 ++ backends/hostmem-file.c | 26 +++++++++++++++++++++++++- exec.c | 18 +++++++++++------- hw/mem/nvdimm.c | 4 ++++ softmmu/memory.c | 7 +++++-- util/mmap-alloc.c | 10 ++++++---- util/oslib-posix.c | 2 +- qemu-options.hx | 5 ++++- 11 files changed, 70 insertions(+), 19 deletions(-)Signature · 1 line
2.26.2
Quoted 12 lines · Stefan Hajnoczi
v2:
* s/the the/the/ in documentation [Philippe]
* Assignnvdimm->unarmedearlier [Philippe]There is currently no way to back an NVDIMM with a read-only file so it can be safely shared between untrusted guests.
Introduce an -object memory-backend-file,readonly=on|off option.
Julio Montes sent an earlier patch here:
https://patchew.org/QEMU/[email protected]/
Quoted 7 lines
Eric Ernst requested this feature again for Kata Containers so I gave it a try.
Stefan Hajnoczi (3):
memory: add readonly support tomemory_region_init_ram_from_file()
hostmem-file: add readonly=on|off option
nvdimm: honor -object memory-backend-file,readonly=on option
(I just quickly modified kata-runtime to unconditionally pass readonly=on and verified that the root filesystem couldn't be remounted as rw)
Is this a candidate for 6.0?
Regards,
Liam
Quoted 13 lines
docs/nvdimm.txt | 8 +++++++- include/exec/memory.h | 2 ++ include/exec/ram_addr.h | 5 +++-- include/qemu/mmap-alloc.h | 2 ++ backends/hostmem-file.c | 26 +++++++++++++++++++++++++- exec.c | 18 +++++++++++------- hw/mem/nvdimm.c | 4 ++++ softmmu/memory.c | 7 +++++-- util/mmap-alloc.c | 10 ++++++---- util/oslib-posix.c | 2 +- qemu-options.hx | 5 ++++- 11 files changed, 70 insertions(+), 19 deletions(-)
Quoted 22 lines · Liam Merwick
Quoted 12 lines · Stefan Hajnoczi
v2:
* s/the the/the/ in documentation [Philippe]
* Assignnvdimm->unarmedearlier [Philippe]There is currently no way to back an NVDIMM with a read-only file so it can be safely shared between untrusted guests.
Introduce an -object memory-backend-file,readonly=on|off option.
Julio Montes sent an earlier patch here:
https://patchew.org/QEMU/[email protected]/Quoted 7 lines
Eric Ernst requested this feature again for Kata Containers so I gave it a try.
Stefan Hajnoczi (3):
memory: add readonly support tomemory_region_init_ram_from_file()
hostmem-file: add readonly=on|off option
nvdimm: honor -object memory-backend-file,readonly=on option
Quoted 7 lines
Reviewed-by Liam Merwick <[email protected]>Tested-by Liam Merwick <[email protected]>(I just quickly modified kata-runtime to unconditionally pass readonly=on and verified that the root filesystem couldn't be remounted as rw)
Is this a candidate for 6.0?
Thanks! Yes, this is for 6.0.
Stefan