[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/11] util/mmap-alloc: Add a 'is_pmem' parameter to
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 08/11] util/mmap-alloc: Add a 'is_pmem' parameter to qemu_ram_mmap |
Date: |
Thu, 25 Apr 2019 14:56:56 -0300 |
From: Zhang Yi <address@hidden>
besides the existing 'shared' flags, we are going to add
'is_pmem' to qemu_ram_mmap(), which indicated the memory backend
file is a persist memory.
Signed-off-by: Haozhong Zhang <address@hidden>
Signed-off-by: Zhang Yi <address@hidden>
Reviewed-by: Pankaj Gupta <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Pankaj Gupta <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
include/qemu/mmap-alloc.h | 21 ++++++++++++++++++++-
exec.c | 2 +-
util/mmap-alloc.c | 6 +++++-
util/oslib-posix.c | 2 +-
4 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/include/qemu/mmap-alloc.h b/include/qemu/mmap-alloc.h
index ef04f0ed5b..eec98d82c1 100644
--- a/include/qemu/mmap-alloc.h
+++ b/include/qemu/mmap-alloc.h
@@ -7,7 +7,26 @@ size_t qemu_fd_getpagesize(int fd);
size_t qemu_mempath_getpagesize(const char *mem_path);
-void *qemu_ram_mmap(int fd, size_t size, size_t align, bool shared);
+/**
+ * qemu_ram_mmap: mmap the specified file or device.
+ *
+ * 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.
+ * @shared: map has RAM_SHARED flag.
+ * @is_pmem: map has RAM_PMEM flag.
+ *
+ * Return:
+ * On success, return a pointer to the mapped area.
+ * On failure, return MAP_FAILED.
+ */
+void *qemu_ram_mmap(int fd,
+ size_t size,
+ size_t align,
+ bool shared,
+ bool is_pmem);
void qemu_ram_munmap(int fd, void *ptr, size_t size);
diff --git a/exec.c b/exec.c
index f7f3cdbf4a..aa07432929 100644
--- a/exec.c
+++ b/exec.c
@@ -1883,7 +1883,7 @@ static void *file_ram_alloc(RAMBlock *block,
}
area = qemu_ram_mmap(fd, memory, block->mr->align,
- block->flags & RAM_SHARED);
+ block->flags & RAM_SHARED, block->flags & RAM_PMEM);
if (area == MAP_FAILED) {
error_setg_errno(errp, errno,
"unable to map backing store for guest RAM");
diff --git a/util/mmap-alloc.c b/util/mmap-alloc.c
index 8565885420..9713f4b960 100644
--- a/util/mmap-alloc.c
+++ b/util/mmap-alloc.c
@@ -75,7 +75,11 @@ size_t qemu_mempath_getpagesize(const char *mem_path)
return getpagesize();
}
-void *qemu_ram_mmap(int fd, size_t size, size_t align, bool shared)
+void *qemu_ram_mmap(int fd,
+ size_t size,
+ size_t align,
+ bool shared,
+ bool is_pmem)
{
int flags;
int guardfd;
diff --git a/util/oslib-posix.c b/util/oslib-posix.c
index 88dda9cd39..d97b1717d5 100644
--- a/util/oslib-posix.c
+++ b/util/oslib-posix.c
@@ -203,7 +203,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);
+ void *ptr = qemu_ram_mmap(-1, size, align, shared, false);
if (ptr == MAP_FAILED) {
return NULL;
--
2.18.0.rc1.1.g3f1ff2140
- [Qemu-devel] [PULL 00/11] Machine queue, 2019-04-25, Eduardo Habkost, 2019/04/25
- [Qemu-devel] [PULL 01/11] hw: add compat machines for 4.1, Eduardo Habkost, 2019/04/25
- [Qemu-devel] [PULL 02/11] vl.c: make find_default_machine() local, Eduardo Habkost, 2019/04/25
- [Qemu-devel] [PULL 03/11] vl.c: allocate TYPE_MACHINE list once during bootup, Eduardo Habkost, 2019/04/25
- [Qemu-devel] [PULL 04/11] vl: Clean up after previous commit, Eduardo Habkost, 2019/04/25
- [Qemu-devel] [PULL 05/11] vl: Simplify machine_parse(), Eduardo Habkost, 2019/04/25
- [Qemu-devel] [PULL 06/11] cpu: Rename parse_cpu_model() to parse_cpu_option(), Eduardo Habkost, 2019/04/25
- [Qemu-devel] [PULL 07/11] cpu: Fix crash with empty -cpu option, Eduardo Habkost, 2019/04/25
- [Qemu-devel] [PULL 08/11] util/mmap-alloc: Add a 'is_pmem' parameter to qemu_ram_mmap,
Eduardo Habkost <=
- [Qemu-devel] [PULL 09/11] scripts/update-linux-headers: add linux/mman.h, Eduardo Habkost, 2019/04/25
- [Qemu-devel] [PULL 10/11] linux-headers: add linux/mman.h., Eduardo Habkost, 2019/04/25
- [Qemu-devel] [PULL 11/11] util/mmap-alloc: support MAP_SYNC in qemu_ram_mmap(), Eduardo Habkost, 2019/04/25
- Re: [Qemu-devel] [PULL 00/11] Machine queue, 2019-04-25, Peter Maydell, 2019/04/26