From: David Hildenbrand <david@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Marcel Apfelbaum" <mapfelba@redhat.com>,
"Murilo Opsfelder Araujo" <muriloo@linux.ibm.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"David Hildenbrand" <david@redhat.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
"Peter Xu" <peterx@redhat.com>, "Greg Kurz" <groug@kaod.org>,
"Stefan Hajnoczi" <stefanha@redhat.com>,
"Igor Mammedov" <imammedo@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PATCH v5 03/14] util/mmap-alloc: Factor out activating of memory to mmap_activate()
Date: Tue, 13 Apr 2021 11:14:10 +0200 [thread overview]
Message-ID: <20210413091421.7707-4-david@redhat.com> (raw)
In-Reply-To: <20210413091421.7707-1-david@redhat.com>
We want to activate memory within a reserved memory region, to make it
accessible. Let's factor that out.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Acked-by: Murilo Opsfelder Araujo <muriloo@linux.ibm.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
---
util/mmap-alloc.c | 94 +++++++++++++++++++++++++----------------------
1 file changed, 50 insertions(+), 44 deletions(-)
diff --git a/util/mmap-alloc.c b/util/mmap-alloc.c
index 223d66219c..0e2bd7bc0e 100644
--- a/util/mmap-alloc.c
+++ b/util/mmap-alloc.c
@@ -114,6 +114,52 @@ static void *mmap_reserve(size_t size, int fd)
return mmap(0, size, PROT_NONE, flags, fd, 0);
}
+/*
+ * Activate memory in a reserved region from the given fd (if any), to make
+ * it accessible.
+ */
+static void *mmap_activate(void *ptr, size_t size, int fd, bool readonly,
+ bool shared, bool is_pmem, off_t map_offset)
+{
+ const int prot = PROT_READ | (readonly ? 0 : PROT_WRITE);
+ int map_sync_flags = 0;
+ int flags = MAP_FIXED;
+ void *activated_ptr;
+
+ flags |= fd == -1 ? MAP_ANONYMOUS : 0;
+ flags |= shared ? MAP_SHARED : MAP_PRIVATE;
+ if (shared && is_pmem) {
+ map_sync_flags = MAP_SYNC | MAP_SHARED_VALIDATE;
+ }
+
+ activated_ptr = mmap(ptr, size, prot, flags | map_sync_flags, fd,
+ map_offset);
+ if (activated_ptr == MAP_FAILED && map_sync_flags) {
+ if (errno == ENOTSUP) {
+ char *proc_link = g_strdup_printf("/proc/self/fd/%d", fd);
+ char *file_name = g_malloc0(PATH_MAX);
+ int len = readlink(proc_link, file_name, PATH_MAX - 1);
+
+ if (len < 0) {
+ len = 0;
+ }
+ file_name[len] = '\0';
+ fprintf(stderr, "Warning: requesting persistence across crashes "
+ "for backend file %s failed. Proceeding without "
+ "persistence, data might become corrupted in case of host "
+ "crash.\n", file_name);
+ g_free(proc_link);
+ g_free(file_name);
+ }
+ /*
+ * If mmap failed with MAP_SHARED_VALIDATE | MAP_SYNC, we will try
+ * again without these flags to handle backwards compatibility.
+ */
+ activated_ptr = mmap(ptr, size, prot, flags, fd, map_offset);
+ }
+ return activated_ptr;
+}
+
static inline size_t mmap_guard_pagesize(int fd)
{
#if defined(__powerpc64__) && defined(__linux__)
@@ -133,13 +179,8 @@ void *qemu_ram_mmap(int fd,
off_t map_offset)
{
const size_t guard_pagesize = mmap_guard_pagesize(fd);
- int prot;
- int flags;
- int map_sync_flags = 0;
- size_t offset;
- size_t total;
- void *guardptr;
- void *ptr;
+ size_t offset, total;
+ void *ptr, *guardptr;
/*
* Note: this always allocates at least one extra page of virtual address
@@ -156,45 +197,10 @@ void *qemu_ram_mmap(int fd,
/* Always align to host page size */
assert(align >= guard_pagesize);
- flags = MAP_FIXED;
- flags |= fd == -1 ? MAP_ANONYMOUS : 0;
- flags |= shared ? MAP_SHARED : MAP_PRIVATE;
- if (shared && is_pmem) {
- map_sync_flags = MAP_SYNC | MAP_SHARED_VALIDATE;
- }
-
offset = QEMU_ALIGN_UP((uintptr_t)guardptr, align) - (uintptr_t)guardptr;
- prot = PROT_READ | (readonly ? 0 : PROT_WRITE);
-
- ptr = mmap(guardptr + offset, size, prot,
- flags | map_sync_flags, fd, map_offset);
-
- if (ptr == MAP_FAILED && map_sync_flags) {
- if (errno == ENOTSUP) {
- char *proc_link, *file_name;
- int len;
- proc_link = g_strdup_printf("/proc/self/fd/%d", fd);
- file_name = g_malloc0(PATH_MAX);
- len = readlink(proc_link, file_name, PATH_MAX - 1);
- if (len < 0) {
- len = 0;
- }
- file_name[len] = '\0';
- fprintf(stderr, "Warning: requesting persistence across crashes "
- "for backend file %s failed. Proceeding without "
- "persistence, data might become corrupted in case of host "
- "crash.\n", file_name);
- g_free(proc_link);
- g_free(file_name);
- }
- /*
- * if map failed with MAP_SHARED_VALIDATE | MAP_SYNC,
- * we will remove these flags to handle compatibility.
- */
- ptr = mmap(guardptr + offset, size, prot, flags, fd, map_offset);
- }
-
+ ptr = mmap_activate(guardptr + offset, size, fd, readonly, shared, is_pmem,
+ map_offset);
if (ptr == MAP_FAILED) {
munmap(guardptr, total);
return MAP_FAILED;
--
2.30.2
next prev parent reply other threads:[~2021-04-13 9:20 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-13 9:14 [PATCH v5 00/14] RAM_NORESERVE, MAP_NORESERVE and hostmem "reserve" property David Hildenbrand
2021-04-13 9:14 ` [PATCH v5 01/14] util/mmap-alloc: Factor out calculation of the pagesize for the guard page David Hildenbrand
2021-04-13 9:14 ` [PATCH v5 02/14] util/mmap-alloc: Factor out reserving of a memory region to mmap_reserve() David Hildenbrand
2021-04-13 9:14 ` David Hildenbrand [this message]
2021-04-13 9:14 ` [PATCH v5 04/14] softmmu/memory: Pass ram_flags to qemu_ram_alloc_from_fd() David Hildenbrand
2021-04-20 9:52 ` Philippe Mathieu-Daudé
2021-04-20 10:18 ` Philippe Mathieu-Daudé
2021-04-20 10:36 ` David Hildenbrand
2021-04-20 10:45 ` Philippe Mathieu-Daudé
2021-04-20 11:03 ` David Hildenbrand
2021-04-13 9:14 ` [PATCH v5 05/14] softmmu/memory: Pass ram_flags to memory_region_init_ram_shared_nomigrate() David Hildenbrand
2021-04-20 10:20 ` Philippe Mathieu-Daudé
2021-04-20 10:27 ` David Hildenbrand
2021-04-20 10:40 ` Philippe Mathieu-Daudé
2021-04-20 11:10 ` David Hildenbrand
2021-04-20 11:43 ` David Hildenbrand
2021-04-13 9:14 ` [PATCH v5 06/14] util/mmap-alloc: Pass flags instead of separate bools to qemu_ram_mmap() David Hildenbrand
2021-04-13 9:14 ` [PATCH v5 07/14] memory: Introduce RAM_NORESERVE and wire it up in qemu_ram_mmap() David Hildenbrand
2021-04-20 10:25 ` Philippe Mathieu-Daudé
2021-04-13 9:14 ` [PATCH v5 08/14] util/mmap-alloc: Support RAM_NORESERVE via MAP_NORESERVE under Linux David Hildenbrand
2021-04-13 9:14 ` [PATCH v5 09/14] hostmem: Wire up RAM_NORESERVE via "reserve" property David Hildenbrand
2021-04-13 9:14 ` [PATCH v5 10/14] qmp: Clarify memory backend properties returned via query-memdev David Hildenbrand
2021-04-20 10:27 ` Philippe Mathieu-Daudé
2021-04-13 9:14 ` [PATCH v5 11/14] qmp: Include "share" property of memory backends David Hildenbrand
2021-04-20 10:28 ` Philippe Mathieu-Daudé
2021-04-13 9:14 ` [PATCH v5 12/14] hmp: Print "share" property of memory backends with "info memdev" David Hildenbrand
2021-04-14 18:56 ` Dr. David Alan Gilbert
2021-04-20 10:46 ` Philippe Mathieu-Daudé
2021-04-13 9:14 ` [PATCH v5 13/14] qmp: Include "reserve" property of memory backends David Hildenbrand
2021-04-20 10:47 ` Philippe Mathieu-Daudé
2021-04-13 9:14 ` [PATCH v5 14/14] hmp: Print "reserve" property of memory backends with "info memdev" David Hildenbrand
2021-04-20 10:49 ` Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210413091421.7707-4-david@redhat.com \
--to=david@redhat.com \
--cc=dgilbert@redhat.com \
--cc=ehabkost@redhat.com \
--cc=groug@kaod.org \
--cc=imammedo@redhat.com \
--cc=mapfelba@redhat.com \
--cc=mst@redhat.com \
--cc=muriloo@linux.ibm.com \
--cc=pbonzini@redhat.com \
--cc=peterx@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).