qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: marcandre.lureau@redhat.com
To: qemu-devel@nongnu.org
Cc: haifeng.lin@huawei.com, mst@redhat.com, thibaut.collet@6wind.com,
	jasowang@redhat.com, pbonzini@redhat.com,
	"Marc-André Lureau" <marcandre.lureau@redhat.com>
Subject: [Qemu-devel] [PATCH v8 06/27] util: add memfd helpers
Date: Fri,  9 Oct 2015 17:17:20 +0200	[thread overview]
Message-ID: <1444403861-3240-7-git-send-email-marcandre.lureau@redhat.com> (raw)
In-Reply-To: <1444403861-3240-1-git-send-email-marcandre.lureau@redhat.com>

From: Marc-André Lureau <marcandre.lureau@redhat.com>

Add qemu_memfd_alloc/free() helpers.

The function helps to allocate and seal shared memory.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 include/qemu/memfd.h |  4 +++
 util/memfd.c         | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 75 insertions(+), 1 deletion(-)

diff --git a/include/qemu/memfd.h b/include/qemu/memfd.h
index 8b1fe6a..950fb88 100644
--- a/include/qemu/memfd.h
+++ b/include/qemu/memfd.h
@@ -17,4 +17,8 @@
 #define F_SEAL_WRITE    0x0008  /* prevent writes */
 #endif
 
+void *qemu_memfd_alloc(const char *name, size_t size, unsigned int seals,
+                       int *fd);
+void qemu_memfd_free(void *ptr, size_t size, int fd);
+
 #endif /* QEMU_MEMFD_H */
diff --git a/util/memfd.c b/util/memfd.c
index c509692..c119483 100644
--- a/util/memfd.c
+++ b/util/memfd.c
@@ -27,6 +27,11 @@
 
 #include "qemu/osdep.h"
 
+#include <glib.h>
+#include <glib/gprintf.h>
+
+#include <sys/mman.h>
+
 #include "qemu/memfd.h"
 
 #ifdef CONFIG_MEMFD
@@ -35,7 +40,7 @@
 #include <sys/syscall.h>
 #include <asm/unistd.h>
 
-inline static int memfd_create(const char *name, unsigned int flags)
+static int memfd_create(const char *name, unsigned int flags)
 {
 #ifdef __NR_memfd_create
     return syscall(__NR_memfd_create, name, flags);
@@ -52,3 +57,68 @@ inline static int memfd_create(const char *name, unsigned int flags)
 #ifndef MFD_ALLOW_SEALING
 #define MFD_ALLOW_SEALING 0x0002U
 #endif
+
+/*
+ * This is a best-effort helper for shared memory allocation, with
+ * optional sealing. The helper will do his best to allocate using
+ * memfd with sealing, but may fallback on other methods without
+ * sealing.
+ */
+void *qemu_memfd_alloc(const char *name, size_t size, unsigned int seals,
+                       int *fd)
+{
+    void *ptr;
+    int mfd = -1;
+
+    *fd = -1;
+
+#ifdef CONFIG_LINUX
+    if (seals) {
+        mfd = memfd_create(name, MFD_ALLOW_SEALING | MFD_CLOEXEC);
+    }
+
+    if (mfd == -1) {
+        /* some systems have memfd without sealing */
+        mfd = memfd_create(name, MFD_CLOEXEC);
+        seals = 0;
+    }
+#endif
+
+    if (mfd != -1) {
+        if (ftruncate(mfd, size) == -1) {
+            perror("ftruncate");
+            close(mfd);
+            return NULL;
+        }
+
+        if (seals && fcntl(mfd, F_ADD_SEALS, seals) == -1) {
+            perror("fcntl");
+            close(mfd);
+            return NULL;
+        }
+    } else {
+        perror("memfd");
+        return NULL;
+    }
+
+    ptr = mmap(0, size, PROT_READ | PROT_WRITE, MAP_SHARED, mfd, 0);
+    if (ptr == MAP_FAILED) {
+        perror("mmap");
+        close(mfd);
+        return NULL;
+    }
+
+    *fd = mfd;
+    return ptr;
+}
+
+void qemu_memfd_free(void *ptr, size_t size, int fd)
+{
+    if (ptr) {
+        munmap(ptr, size);
+    }
+
+    if (fd != -1) {
+        close(fd);
+    }
+}
-- 
2.4.3

  parent reply	other threads:[~2015-10-09 15:18 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-09 15:17 [Qemu-devel] [PATCH v8 00/27] vhost-user: add migration support marcandre.lureau
2015-10-09 15:17 ` [Qemu-devel] [PATCH v8 01/27] exec: factor out duplicate mmap code marcandre.lureau
2015-10-09 15:17 ` [Qemu-devel] [PATCH v8 02/27] configure: probe for memfd marcandre.lureau
2015-10-09 15:17 ` [Qemu-devel] [PATCH v8 03/27] linux-headers: add unistd.h marcandre.lureau
2015-10-09 15:17 ` [Qemu-devel] [PATCH v8 04/27] build-sys: split util-obj- on multi-lines marcandre.lureau
2015-10-09 15:17 ` [Qemu-devel] [PATCH v8 05/27] util: add linux-only memfd fallback marcandre.lureau
2015-10-09 15:17 ` marcandre.lureau [this message]
2015-10-09 15:17 ` [Qemu-devel] [PATCH v8 07/27] util: add fallback for qemu_memfd_alloc() marcandre.lureau
2015-10-09 15:17 ` [Qemu-devel] [PATCH v8 08/27] vhost: document log resizing marcandre.lureau
2015-10-09 15:17 ` [Qemu-devel] [PATCH v8 09/27] vhost: add vhost_set_log_base op marcandre.lureau
2015-10-09 15:17 ` [Qemu-devel] [PATCH v8 10/27] vhost-user: add vhost_user_requires_shm_log() marcandre.lureau
2015-10-09 15:17 ` [Qemu-devel] [PATCH v8 11/27] vhost: alloc shareable log marcandre.lureau
2015-10-09 15:17 ` [Qemu-devel] [PATCH v8 12/27] vhost-user: send log shm fd along with log_base marcandre.lureau
2015-10-09 15:17 ` [Qemu-devel] [PATCH v8 13/27] vhost-user: add a migration blocker marcandre.lureau
2015-10-09 15:17 ` [Qemu-devel] [PATCH v8 14/27] vhost: use a function for each call marcandre.lureau
2015-10-09 15:17 ` [Qemu-devel] [PATCH v8 15/27] vhost-user: document migration log marcandre.lureau
2015-10-09 15:17 ` [Qemu-devel] [PATCH v8 16/27] net: add trace_vhost_user_event marcandre.lureau
2015-10-09 15:17 ` [Qemu-devel] [PATCH v8 17/27] vhost user: add support of live migration marcandre.lureau
2015-10-09 15:17 ` [Qemu-devel] [PATCH v8 18/27] vhost user: add rarp sending after live migration for legacy guest marcandre.lureau
2015-10-09 15:17 ` [Qemu-devel] [PATCH v8 19/27] vhost-user: use an enum helper for features mask marcandre.lureau
2015-10-09 15:17 ` [Qemu-devel] [PATCH v8 20/27] vhost: add migration block if memfd failed marcandre.lureau
2015-10-09 15:17 ` [Qemu-devel] [PATCH v8 21/27] vhost-user-test: move wait_for_fds() out marcandre.lureau
2015-10-09 15:17 ` [Qemu-devel] [PATCH v8 22/27] vhost-user-test: remove useless static check marcandre.lureau
2015-10-09 15:17 ` [Qemu-devel] [PATCH v8 23/27] vhost-user-test: wrap server in TestServer struct marcandre.lureau
2015-10-09 15:17 ` [Qemu-devel] [PATCH v8 24/27] vhost-user-test: learn to tweak various qemu arguments marcandre.lureau
2015-10-09 15:17 ` [Qemu-devel] [PATCH v8 25/27] vhost-user-test: add live-migration test marcandre.lureau
2015-10-09 15:17 ` [Qemu-devel] [PATCH v8 26/27] vhost-user-test: check ownership during migration marcandre.lureau
2015-10-09 15:17 ` [Qemu-devel] [PATCH v8 27/27] seccomp: add memfd_create to whitelist marcandre.lureau
2015-10-09 15:21   ` Eduardo Otubo
2015-10-12 15:56 ` [Qemu-devel] [PATCH v8 00/27] vhost-user: add migration support Thibaut Collet
2015-10-13 12:19   ` Thibaut Collet
2015-10-18  8:21     ` Michael S. Tsirkin
2015-10-19 13:22       ` Thibaut Collet
2015-10-19 15:39         ` Michael S. Tsirkin
2015-10-19 16:42           ` Thibaut Collet
2015-10-19 21:12             ` Michael S. Tsirkin
2015-10-20  6:30               ` Thibaut Collet
2015-10-20 10:21                 ` Michael S. Tsirkin
2015-10-20 11:47                   ` Thibaut Collet

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=1444403861-3240-7-git-send-email-marcandre.lureau@redhat.com \
    --to=marcandre.lureau@redhat.com \
    --cc=haifeng.lin@huawei.com \
    --cc=jasowang@redhat.com \
    --cc=mst@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=thibaut.collet@6wind.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).