121 lines
4.3 KiB
Diff
121 lines
4.3 KiB
Diff
From 5e258b59991284cf2e6bfcac04ff2de01dc83005 Mon Sep 17 00:00:00 2001
|
|
From: "plai@redhat.com" <plai@redhat.com>
|
|
Date: Tue, 20 Aug 2019 16:12:48 +0100
|
|
Subject: [PATCH 01/11] util/mmap-alloc: Add a 'is_pmem' parameter to
|
|
qemu_ram_mmap
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
RH-Author: plai@redhat.com
|
|
Message-id: <1566317571-5697-2-git-send-email-plai@redhat.com>
|
|
Patchwork-id: 90084
|
|
O-Subject: [RHEL8.2 qemu-kvm PATCH 1/4] util/mmap-alloc: Add a 'is_pmem' parameter to qemu_ram_mmap
|
|
Bugzilla: 1539282
|
|
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
RH-Acked-by: Pankaj Gupta <pagupta@redhat.com>
|
|
RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
|
From: Zhang Yi <yi.z.zhang@linux.intel.com>
|
|
|
|
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 <haozhong.zhang@intel.com>
|
|
Signed-off-by: Zhang Yi <yi.z.zhang@linux.intel.com>
|
|
Reviewed-by: Pankaj Gupta <pagupta@redhat.com>
|
|
Message-Id: <786c46862cfeb253ee0ea2f44d62ffe76edb7fa4.1549555521.git.yi.z.zhang@linux.intel.com>
|
|
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
|
Reviewed-by: Pankaj Gupta <pagupta@redhat.com>
|
|
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
(cherry picked from commit 2ac0f1621c9be59eebc844fa10361a84fd726185)
|
|
Signed-off-by: Paul Lai <plai@redhat.com>
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
---
|
|
exec.c | 2 +-
|
|
include/qemu/mmap-alloc.h | 21 ++++++++++++++++++++-
|
|
util/mmap-alloc.c | 6 +++++-
|
|
util/oslib-posix.c | 2 +-
|
|
4 files changed, 27 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/exec.c b/exec.c
|
|
index 9028700..a79eaa3 100644
|
|
--- a/exec.c
|
|
+++ b/exec.c
|
|
@@ -1669,7 +1669,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/include/qemu/mmap-alloc.h b/include/qemu/mmap-alloc.h
|
|
index 50385e3..190688a 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(void *ptr, size_t size);
|
|
|
|
diff --git a/util/mmap-alloc.c b/util/mmap-alloc.c
|
|
index 2fd8cbc..55d1890 100644
|
|
--- a/util/mmap-alloc.c
|
|
+++ b/util/mmap-alloc.c
|
|
@@ -73,7 +73,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)
|
|
{
|
|
/*
|
|
* Note: this always allocates at least one extra page of virtual address
|
|
diff --git a/util/oslib-posix.c b/util/oslib-posix.c
|
|
index 13b6f8d..c36b2bb 100644
|
|
--- a/util/oslib-posix.c
|
|
+++ b/util/oslib-posix.c
|
|
@@ -130,7 +130,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;
|
|
--
|
|
1.8.3.1
|
|
|