diff options
author | Stefan Hajnoczi <stefanha@redhat.com> | 2019-08-30 10:30:56 +0100 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-09-16 12:32:21 +0200 |
commit | 72d41eb4b8f923de91e8f06dc20aa86b0a9155fb (patch) | |
tree | f7983fc765558472fc89962142374e4c6f286869 /include/qemu/osdep.h | |
parent | 41a2635124117d1fac7e45b3cafa2c1ac68417fd (diff) | |
download | qemu-72d41eb4b8f923de91e8f06dc20aa86b0a9155fb.zip qemu-72d41eb4b8f923de91e8f06dc20aa86b0a9155fb.tar.gz qemu-72d41eb4b8f923de91e8f06dc20aa86b0a9155fb.tar.bz2 |
memory: fetch pmem size in get_file_size()
Neither stat(2) nor lseek(2) report the size of Linux devdax pmem
character device nodes. Commit 314aec4a6e06844937f1677f6cba21981005f389
("hostmem-file: reject invalid pmem file sizes") added code to
hostmem-file.c to fetch the size from sysfs and compare against the
user-provided size=NUM parameter:
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;
}
It turns out that exec.c:qemu_ram_alloc_from_fd() already has an
equivalent size check but it skips devdax pmem character devices because
lseek(2) returns 0:
if (file_size > 0 && file_size < size) {
error_setg(errp, "backing store %s size 0x%" PRIx64
" does not match 'size' option 0x" RAM_ADDR_FMT,
mem_path, file_size, size);
return NULL;
}
This patch moves the devdax pmem file size code into get_file_size() so
that we check the memory size in a single place:
qemu_ram_alloc_from_fd(). This simplifies the code and makes it more
general.
This also fixes the problem that hostmem-file only checks the devdax
pmem file size when the pmem=on parameter is given. An unchecked
size=NUM parameter can lead to SIGBUS in QEMU so we must always fetch
the file size for Linux devdax pmem character device nodes.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20190830093056.12572-1-stefanha@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'include/qemu/osdep.h')
-rw-r--r-- | include/qemu/osdep.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index af2b91f..c7d242f 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -571,19 +571,6 @@ 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 * |