hostmem-file: reject invalid pmem file sizes
PATCH v2 1/1 hostmem-file: reject invalid pmem file sizes
Guests started with NVDIMMs larger than the underlying host file produce confusing errors inside the guest. This happens because the guest accesses pages beyond the end of the file.
Check the pmem file size on startup and print a clear error message if the size is invalid.
---
v2:
* Propagate qemu_get_pmem_size() errors [Igor]
include/qemu/osdep.h | 13 ++++++++++ backends/hostmem-file.c | 22 +++++++++++++++++ util/oslib-posix.c | 53 +++++++++++++++++++++++++++++++++++++++++ util/oslib-win32.c | 5 ++++ 4 files changed, 93 insertions(+)
include/qemu/osdep.h +13 -0
@@ -570,6 +570,19 @@ void qemu_set_tty_echo(int fd, bool echo);void os_mem_prealloc (int fd,char *area,size_t sz,int smp_cpus,Error **errp); +/** +* qemu_get_pmem_size: +* @filename: path to a pmem file +* @errp: pointer to a NULL-initialized error object +* +* Determine the size of a persistent memory file. Besides supporting files on +* DAX file systems, this function also supports Linux devdax character +* devices. +* +* Returns: the size or 0 on failure +*/ +uint64_t qemu_get_pmem_size (const char *filename,Error **errp); +/** * qemu_get_pid_name: * @pid: pid of a process
backends/hostmem-file.c +22 -0
@@ -46,6 +46,28 @@ file_backend_memory_alloc(HostMemoryBackend *backend, Error **errp)gchar *name;#endif +/* +* Verify pmem file size since starting a guest with an incorrect size +* leads to confusing failures inside the guest. +*/ +if (fb->is_pmem && fb->mem_path) { +Error *local_err =NULL ; +uint64_t size; + + size =qemu_get_pmem_size (fb->mem_path, &local_err); +if (!size) { +error_propagate (errp, local_err); +return ; + } + +if (backend->size > size) { +error_setg (errp,"size property %" PRIu64" is larger than " +"pmem file \"%s\" size %" PRIu64, backend->size, + fb->mem_path, size); +return ; + } + } +if (!backend->size) {error_setg (errp,"can't create backend with size 0" );return ;
util/oslib-posix.c +53 -0
59 lines not on this page · raw message
util/oslib-win32.c +5 -0
@@ -560,6 +560,11 @@ void os_mem_prealloc(int fd, char *area, size_t memory, int smp_cpus, } } +uint64_t qemu_get_pmem_size (const char *filename,Error **errp) +{ +error_setg (errp,"pmem support not available" ); +return 0 ; +}char *qemu_get_pid_name (pid_t pid) {
Signature · 1 line
2.20.1
Quoted 68 lines · Stefan Hajnoczi
Guests started with NVDIMMs larger than the underlying host file produce confusing errors inside the guest. This happens because the guest accesses pages beyond the end of the file.
Check the pmem file size on startup and print a clear error message if the size is invalid.
Cc Haozhong Zhang <[email protected]>Cc Zhang Yi <[email protected]>Cc Eduardo Habkost <[email protected]>Cc Igor Mammedov <[email protected]>Signed-off-by Stefan Hajnoczi <[email protected]>---
v2:
* Propagateqemu_get_pmem_size()errors [Igor]include/qemu/osdep.h | 13 ++++++++++ backends/hostmem-file.c | 22 +++++++++++++++++ util/oslib-posix.c | 53 +++++++++++++++++++++++++++++++++++++++++ util/oslib-win32.c | 5 ++++ 4 files changed, 93 insertions(+)include/qemu/osdep.h +11
-0@@ -570,6 +570,19 @@ void qemu_set_tty_echo(int fd, bool echo);void os_mem_prealloc (int fd,char *area,size_t sz,int smp_cpus,Error **errp); +/** +* qemu_get_pmem_size: +* @filename: path to a pmem file +* @errp: pointer to a NULL-initialized error object +* +* Determine the size of a persistent memory file. Besides supporting files on +* DAX file systems, this function also supports Linux devdax character +* devices. +* +* Returns: the size or 0 on failure +/** * qemu_get_pid_name: * @pid: pid of a process backends/hostmem-file.c +15
-0@@ -46,6 +46,28 @@ file_backend_memory_alloc(HostMemoryBackend *backend, Error **errp)gchar *name;#endif +/* +* Verify pmem file size since starting a guest with an incorrect size +* leads to confusing failures inside the guest. +*/ +if (fb->is_pmem && fb->mem_path) { +Error *local_err =NULL ; +uint64_t size; + + size =qemu_get_pmem_size (fb->mem_path, &local_err); +if (!size) { +error_propagate (errp, local_err); +return ; + } + +if (backend->size > size) {
backends/hostmem-file.c file_backend_memory_alloc(HostMemoryBackend *backend, Error **errp) · line 73
Quoted 10 lines
backends/hostmem-file.c +7
-0+error_setg (errp,"size property %" PRIu64" is larger than " +"pmem file \"%s\" size %" PRIu64, backend->size, + fb->mem_path, size); +return ; + } + } +if (!backend->size) {error_setg (errp,"can't create backend with size 0" );return ;
Would it be reasonable to move the above check after checking size and mem_path?
Quoted 83 lines
util/oslib-posix.c +53
-0@@ -500,6 +500,59 @@ void os_mem_prealloc(int fd, char *area, size_t memory, int smp_cpus, } } +uint64_t qemu_get_pmem_size (const char *filename,Error **errp) +{ +struct stat st; + +if (stat (filename, &st) <0 ) { +error_setg (errp,"unable to stat pmem file \"%s\"" , filename); +return 0 ; + } + +#if defined(__linux__) +/* Special handling for devdax character devices */ +if (S_ISCHR (st.st_mode)) { +char *subsystem_path =NULL ; +char *subsystem =NULL ; +char *size_path =NULL ; +char *size_str =NULL ; +uint64_t ret =0 ; + + subsystem_path =g_strdup_printf ("/sys/dev/char/%d:%d/subsystem" , +major (st.st_rdev),minor (st.st_rdev)); + subsystem =g_file_read_link (subsystem_path,NULL ); +if (!subsystem) { +error_setg (errp,"unable to read subsystem for pmem file \"%s\"" , + filename); + goto devdax_err; + } + +if (!g_str_has_suffix (subsystem,"/dax" )) { +error_setg (errp,"pmem file \"%s\" is not a dax device" , filename); + goto devdax_err; + } + + size_path =g_strdup_printf ("/sys/dev/char/%d:%d/size" , +major (st.st_rdev),minor (st.st_rdev)); +if (!g_file_get_contents (size_path, &size_str,NULL ,NULL )) { +error_setg (errp,"unable to read size for pmem file \"%s\"" , + size_path); + goto devdax_err; + } + + ret =g_ascii_strtoull (size_str,NULL ,0 ); + +devdax_err: +g_free (size_str); +g_free (size_path); +g_free (subsystem); +g_free (subsystem_path); +return ret; + } +#endif /* defined(__linux__) */ + +return st.st_size; +}char *qemu_get_pid_name (pid_t pid) {util/oslib-win32.c +5
-0@@ -560,6 +560,11 @@ void os_mem_prealloc(int fd, char *area, size_t memory, int smp_cpus, } } +uint64_t qemu_get_pmem_size (const char *filename,Error **errp) +{ +error_setg (errp,"pmem support not available" ); +return 0 ; +}char *qemu_get_pid_name (pid_t pid) {Signature · 1 line
2.20.1
Signature · 2 lines
Wei Yang Help you, Help me
Quoted 29 lines · Wei Yang
Quoted 28 lines · Stefan Hajnoczi
backends/hostmem-file.c +20
-0@@ -46,6 +46,28 @@ file_backend_memory_alloc(HostMemoryBackend *backend, Error **errp)gchar *name;#endif +/* +* Verify pmem file size since starting a guest with an incorrect size +* leads to confusing failures inside the guest. +*/ +if (fb->is_pmem && fb->mem_path) { +Error *local_err =NULL ; +uint64_t size; + + size =qemu_get_pmem_size (fb->mem_path, &local_err); +if (!size) { +error_propagate (errp, local_err); +return ; + } + +if (backend->size > size) { +error_setg (errp,"size property %" PRIu64" is larger than " +"pmem file \"%s\" size %" PRIu64, backend->size, + fb->mem_path, size); +return ; + }
Quoted 8 lines
backends/hostmem-file.c file_backend_memory_alloc(HostMemoryBackend *backend, Error **errp) · line 73
Quoted 5 lines
backends/hostmem-file.c +2
-0+ } +if (!backend->size) {error_setg (errp,"can't create backend with size 0" );return ;Would it be reasonable to move the above check after checking size and
mem_path?
Thanks, will fix in v3.
Stefan
Quoted 67 lines · Stefan Hajnoczi
Guests started with NVDIMMs larger than the underlying host file produce confusing errors inside the guest. This happens because the guest accesses pages beyond the end of the file.
Check the pmem file size on startup and print a clear error message if the size is invalid.
Cc Haozhong Zhang <[email protected]>Cc Zhang Yi <[email protected]>Cc Eduardo Habkost <[email protected]>Cc Igor Mammedov <[email protected]>Signed-off-by Stefan Hajnoczi <[email protected]>---
v2:
* Propagateqemu_get_pmem_size()errors [Igor]include/qemu/osdep.h | 13 ++++++++++ backends/hostmem-file.c | 22 +++++++++++++++++ util/oslib-posix.c | 53 +++++++++++++++++++++++++++++++++++++++++ util/oslib-win32.c | 5 ++++ 4 files changed, 93 insertions(+)include/qemu/osdep.h +13
-0@@ -570,6 +570,19 @@ void qemu_set_tty_echo(int fd, bool echo);void os_mem_prealloc (int fd,char *area,size_t sz,int smp_cpus,Error **errp); +/** +* qemu_get_pmem_size: +* @filename: path to a pmem file +* @errp: pointer to a NULL-initialized error object +* +* Determine the size of a persistent memory file. Besides supporting files on +* DAX file systems, this function also supports Linux devdax character +* devices. +* +* Returns: the size or 0 on failure +*/ +uint64_t qemu_get_pmem_size (const char *filename,Error **errp); +/** * qemu_get_pid_name: * @pid: pid of a process backends/hostmem-file.c +12
-0@@ -46,6 +46,28 @@ file_backend_memory_alloc(HostMemoryBackend *backend, Error **errp)gchar *name;#endif +/* +* Verify pmem file size since starting a guest with an incorrect size +* leads to confusing failures inside the guest. +*/ +if (fb->is_pmem && fb->mem_path) { +Error *local_err =NULL ; +uint64_t size; + + size =qemu_get_pmem_size (fb->mem_path, &local_err); +if (!size) { +error_propagate (errp, local_err); +return ;
backends/hostmem-file.c file_backend_memory_alloc(HostMemoryBackend *backend, Error **errp) · line 70
Quoted 10 lines
backends/hostmem-file.c +10
-0+ } + +if (backend->size > size) { +error_setg (errp,"size property %" PRIu64" is larger than " +"pmem file \"%s\" size %" PRIu64, backend->size, + fb->mem_path, size); +return ; + } + } +
-mem-path is only supported on POSIX host.
So how about put this in the last code block before doing the real memory region init?
BTW, I suggest to cleanup file_backend_memory_alloc() to make POSIX/non-POSIX situation clear to understand.
Quoted 86 lines
backends/hostmem-file.c +0
-0if (!backend->size) {error_setg (errp,"can't create backend with size 0" );return ;util/oslib-posix.c +53
-0@@ -500,6 +500,59 @@ void os_mem_prealloc(int fd, char *area, size_t memory, int smp_cpus, } } +uint64_t qemu_get_pmem_size (const char *filename,Error **errp) +{ +struct stat st; + +if (stat (filename, &st) <0 ) { +error_setg (errp,"unable to stat pmem file \"%s\"" , filename); +return 0 ; + } + +#if defined(__linux__) +/* Special handling for devdax character devices */ +if (S_ISCHR (st.st_mode)) { +char *subsystem_path =NULL ; +char *subsystem =NULL ; +char *size_path =NULL ; +char *size_str =NULL ; +uint64_t ret =0 ; + + subsystem_path =g_strdup_printf ("/sys/dev/char/%d:%d/subsystem" , +major (st.st_rdev),minor (st.st_rdev)); + subsystem =g_file_read_link (subsystem_path,NULL ); +if (!subsystem) { +error_setg (errp,"unable to read subsystem for pmem file \"%s\"" , + filename); + goto devdax_err; + } + +if (!g_str_has_suffix (subsystem,"/dax" )) { +error_setg (errp,"pmem file \"%s\" is not a dax device" , filename); + goto devdax_err; + } + + size_path =g_strdup_printf ("/sys/dev/char/%d:%d/size" , +major (st.st_rdev),minor (st.st_rdev)); +if (!g_file_get_contents (size_path, &size_str,NULL ,NULL )) { +error_setg (errp,"unable to read size for pmem file \"%s\"" , + size_path); + goto devdax_err; + } + + ret =g_ascii_strtoull (size_str,NULL ,0 ); + +devdax_err: +g_free (size_str); +g_free (size_path); +g_free (subsystem); +g_free (subsystem_path); +return ret; + } +#endif /* defined(__linux__) */ + +return st.st_size; +}char *qemu_get_pid_name (pid_t pid) {util/oslib-win32.c +5
-0@@ -560,6 +560,11 @@ void os_mem_prealloc(int fd, char *area, size_t memory, int smp_cpus, } } +uint64_t qemu_get_pmem_size (const char *filename,Error **errp) +{ +error_setg (errp,"pmem support not available" ); +return 0 ; +}char *qemu_get_pid_name (pid_t pid) {Signature · 1 line
2.20.1
Signature · 2 lines
Wei Yang Help you, Help me
Quoted 81 lines · On Wed, 13 Feb 2019 16:53:54 +0800 Wei Yang <[email protected]>…
Quoted 67 lines · Stefan Hajnoczi
Guests started with NVDIMMs larger than the underlying host file produce confusing errors inside the guest. This happens because the guest accesses pages beyond the end of the file.
Check the pmem file size on startup and print a clear error message if the size is invalid.
Cc Haozhong Zhang <[email protected]>Cc Zhang Yi <[email protected]>Cc Eduardo Habkost <[email protected]>Cc Igor Mammedov <[email protected]>Signed-off-by Stefan Hajnoczi <[email protected]>---
v2:
* Propagateqemu_get_pmem_size()errors [Igor]include/qemu/osdep.h | 13 ++++++++++ backends/hostmem-file.c | 22 +++++++++++++++++ util/oslib-posix.c | 53 +++++++++++++++++++++++++++++++++++++++++ util/oslib-win32.c | 5 ++++ 4 files changed, 93 insertions(+)include/qemu/osdep.h +13
-0@@ -570,6 +570,19 @@ void qemu_set_tty_echo(int fd, bool echo);void os_mem_prealloc (int fd,char *area,size_t sz,int smp_cpus,Error **errp); +/** +* qemu_get_pmem_size: +* @filename: path to a pmem file +* @errp: pointer to a NULL-initialized error object +* +* Determine the size of a persistent memory file. Besides supporting files on +* DAX file systems, this function also supports Linux devdax character +* devices. +* +* Returns: the size or 0 on failure +*/ +uint64_t qemu_get_pmem_size (const char *filename,Error **errp); +/** * qemu_get_pid_name: * @pid: pid of a process backends/hostmem-file.c +12
-0@@ -46,6 +46,28 @@ file_backend_memory_alloc(HostMemoryBackend *backend, Error **errp)gchar *name;#endif +/* +* Verify pmem file size since starting a guest with an incorrect size +* leads to confusing failures inside the guest. +*/ +if (fb->is_pmem && fb->mem_path) { +Error *local_err =NULL ; +uint64_t size; + + size =qemu_get_pmem_size (fb->mem_path, &local_err); +if (!size) { +error_propagate (errp, local_err); +return ;backends/hostmem-file.c file_backend_memory_alloc(HostMemoryBackend *backend, Error **errp) · line 70
Quoted 10 lines
backends/hostmem-file.c +10
-0+ } + +if (backend->size > size) { +error_setg (errp,"size property %" PRIu64" is larger than " +"pmem file \"%s\" size %" PRIu64, backend->size, + fb->mem_path, size); +return ; + } + } +-mem-path is only supported on POSIX host.
Quoted 2 lines
So how about put this in the last code block before doing the real memory region init?
Indeed, evaluating file would be better done only if we didn't fail size/mempath checks first.
Quoted 2 lines
BTW, I suggest to cleanup
file_backend_memory_alloc()to make POSIX/non-POSIX situation clear to understand.
that's a separate patch, I'll reply with it here so Sefan could pick it (due to conflicts the change would create)
Quoted 88 lines
Quoted 87 lines
backends/hostmem-file.c +0
-0if (!backend->size) {error_setg (errp,"can't create backend with size 0" );return ;util/oslib-posix.c +53
-0@@ -500,6 +500,59 @@ void os_mem_prealloc(int fd, char *area, size_t memory, int smp_cpus, } } +uint64_t qemu_get_pmem_size (const char *filename,Error **errp) +{ +struct stat st; + +if (stat (filename, &st) <0 ) { +error_setg (errp,"unable to stat pmem file \"%s\"" , filename); +return 0 ; + } + +#if defined(__linux__) +/* Special handling for devdax character devices */ +if (S_ISCHR (st.st_mode)) { +char *subsystem_path =NULL ; +char *subsystem =NULL ; +char *size_path =NULL ; +char *size_str =NULL ; +uint64_t ret =0 ; + + subsystem_path =g_strdup_printf ("/sys/dev/char/%d:%d/subsystem" , +major (st.st_rdev),minor (st.st_rdev)); + subsystem =g_file_read_link (subsystem_path,NULL ); +if (!subsystem) { +error_setg (errp,"unable to read subsystem for pmem file \"%s\"" , + filename); + goto devdax_err; + } + +if (!g_str_has_suffix (subsystem,"/dax" )) { +error_setg (errp,"pmem file \"%s\" is not a dax device" , filename); + goto devdax_err; + } + + size_path =g_strdup_printf ("/sys/dev/char/%d:%d/size" , +major (st.st_rdev),minor (st.st_rdev)); +if (!g_file_get_contents (size_path, &size_str,NULL ,NULL )) { +error_setg (errp,"unable to read size for pmem file \"%s\"" , + size_path); + goto devdax_err; + } + + ret =g_ascii_strtoull (size_str,NULL ,0 ); + +devdax_err: +g_free (size_str); +g_free (size_path); +g_free (subsystem); +g_free (subsystem_path); +return ret; + } +#endif /* defined(__linux__) */ + +return st.st_size; +}char *qemu_get_pid_name (pid_t pid) {util/oslib-win32.c +5
-0@@ -560,6 +560,11 @@ void os_mem_prealloc(int fd, char *area, size_t memory, int smp_cpus, } } +uint64_t qemu_get_pmem_size (const char *filename,Error **errp) +{ +error_setg (errp,"pmem support not available" ); +return 0 ; +}char *qemu_get_pid_name (pid_t pid) {Signature · 1 line
2.20.1
PATCH 1/1 hostmem: simplify ifdef-s in file_backend_memory_alloc()
In reply to Stefan Hajnoczicleanup file_backend_memory_alloc() by using one CONFIG_POSIX ifdef instead of several ones within the function to make it simpler to follow.
---
Cc: Haozhong Zhang <[email protected]>
Cc: Zhang Yi <[email protected]>
Cc: Eduardo Habkost <[email protected]>
Cc: Stefan Hajnoczi <[email protected]>
CC: Wei Yang <[email protected]>
--- backends/hostmem-file.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
backends/hostmem-file.c +4 -5
@@ -41,10 +41,12 @@ struct HostMemoryBackendFile {static void file_backend_memory_alloc (HostMemoryBackend *backend,Error **errp) { +#ifndef CONFIG_POSIX +error_setg (errp,"backend '%s' not supported on this host" , +object_get_typename (OBJECT (backend))); +#else HostMemoryBackendFile *fb =MEMORY_BACKEND_FILE (backend); -#ifdef CONFIG_POSIX gchar *name; -#endif if (!backend->size) {error_setg (errp,"can't create backend with size 0" );
@@ -54,9 +56,6 @@ file_backend_memory_alloc(HostMemoryBackend *backend, Error **errp)error_setg (errp,"mem-path property not set" );return ; } -#ifndef CONFIG_POSIX -error_setg (errp,"-mem-path not supported on this host" ); -#else backend->force_prealloc = mem_prealloc; name =host_memory_backend_get_name (backend); memory_region_init_ram_from_file(&backend->mr, OBJECT(backend),
Signature · 1 line
2.18.1
Re: [Qemu-devel] [PATCH] hostmem: simplify ifdef-s in file_backend_memory_alloc()
Quoted 5 lines · Igor Mammedov
cleanup
file_backend_memory_alloc()by using oneCONFIG_POSIXifdef instead of several ones within the function to make it simpler to follow.Signed-off-by Igor Mammedov <[email protected]>Suggested-by Wei Yang <[email protected]>
Quoted 42 lines
---
Cc: Haozhong Zhang <[email protected]>
Cc: Zhang Yi <[email protected]>
Cc: Eduardo Habkost <[email protected]>
Cc: Stefan Hajnoczi <[email protected]>
CC: Wei Yang <[email protected]>
---backends/hostmem-file.c| 9 ++++-----1 file changed, 4 insertions(+), 5 deletions(-)backends/hostmem-file.c +0
-0@@ -41,10 +41,12 @@ struct HostMemoryBackendFile {static void
file_backend_memory_alloc(HostMemoryBackend *backend, Error **errp){backends/hostmem-file.c +4
-5+#ifndef CONFIG_POSIX +error_setg (errp,"backend '%s' not supported on this host" , +object_get_typename (OBJECT (backend))); +#else HostMemoryBackendFile *fb =MEMORY_BACKEND_FILE (backend); -#ifdef CONFIG_POSIX gchar *name; -#endif if (!backend->size) {error_setg (errp,"can't create backend with size 0" );@@ -54,9 +56,6 @@ file_backend_memory_alloc(HostMemoryBackend *backend, Error **errp)error_setg (errp,"mem-path property not set" );return ; } -#ifndef CONFIG_POSIX -error_setg (errp,"-mem-path not supported on this host" ); -#else backend->force_prealloc = mem_prealloc; name =host_memory_backend_get_name (backend); memory_region_init_ram_from_file(&backend->mr, OBJECT(backend),Signature · 1 line
2.18.1
Signature · 2 lines
Wei Yang Help you, Help me