[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 13/38] util: add memfd helpers
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 13/38] util: add memfd helpers |
Date: |
Wed, 21 Oct 2015 13:27:14 +0300 |
From: Marc-André Lureau <address@hidden>
Add qemu_memfd_alloc/free() helpers.
The function helps to allocate and seal shared memory.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Tested-by: Thibaut Collet <address@hidden>
---
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);
+ }
+}
--
MST
- [Qemu-devel] [PULL 02/38] exec: factor out duplicate mmap code, (continued)
- [Qemu-devel] [PULL 02/38] exec: factor out duplicate mmap code, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 03/38] net: don't set native endianness, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 04/38] tests: re-enable vhost-user-test, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 06/38] pc-dimm: add vhost slots limit check before commiting to hotplug, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 07/38] vhost: fail backend intialization early, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 05/38] vhost: add vhost_has_free_slot() interface, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 08/38] virtio: add some migration doc, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 09/38] configure: probe for memfd, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 11/38] build-sys: split util-obj- on multi-lines, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 12/38] util: add linux-only memfd fallback, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 13/38] util: add memfd helpers,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 14/38] util: add fallback for qemu_memfd_alloc(), Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 15/38] vhost: document log resizing, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 16/38] vhost: add vhost_set_log_base op, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 10/38] linux-headers: add unistd.h, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 17/38] vhost-user: add vhost_user_requires_shm_log(), Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 18/38] vhost: alloc shareable log, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 19/38] vhost-user: send log shm fd along with log_base, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 20/38] vhost-user: add a migration blocker, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 22/38] vhost-user: document migration log, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 21/38] vhost: use a function for each call, Michael S. Tsirkin, 2015/10/21