[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v8 20/27] vhost: add migration block if memfd failed
From: |
marcandre . lureau |
Subject: |
[Qemu-devel] [PATCH v8 20/27] vhost: add migration block if memfd failed |
Date: |
Fri, 9 Oct 2015 17:17:34 +0200 |
From: Marc-André Lureau <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
---
hw/virtio/vhost.c | 3 +++
include/qemu/memfd.h | 2 ++
util/memfd.c | 22 ++++++++++++++++++++++
3 files changed, 27 insertions(+)
diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
index 1e8ee76..eaf8117 100644
--- a/hw/virtio/vhost.c
+++ b/hw/virtio/vhost.c
@@ -994,6 +994,9 @@ int vhost_dev_init(struct vhost_dev *hdev, void *opaque,
if (!(hdev->features & (0x1ULL << VHOST_F_LOG_ALL))) {
error_setg(&hdev->migration_blocker,
"Migration disabled: vhost lacks VHOST_F_LOG_ALL
feature.");
+ } else if (!qemu_memfd_check()) {
+ error_setg(&hdev->migration_blocker,
+ "Migration disabled: failed to allocate shared memory");
}
}
diff --git a/include/qemu/memfd.h b/include/qemu/memfd.h
index 950fb88..53858ed 100644
--- a/include/qemu/memfd.h
+++ b/include/qemu/memfd.h
@@ -2,6 +2,7 @@
#define QEMU_MEMFD_H
#include "config-host.h"
+#include <stdbool.h>
#ifndef F_LINUX_SPECIFIC_BASE
#define F_LINUX_SPECIFIC_BASE 1024
@@ -20,5 +21,6 @@
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);
+bool qemu_memfd_check(void);
#endif /* QEMU_MEMFD_H */
diff --git a/util/memfd.c b/util/memfd.c
index 4b23765..7c40691 100644
--- a/util/memfd.c
+++ b/util/memfd.c
@@ -138,3 +138,25 @@ void qemu_memfd_free(void *ptr, size_t size, int fd)
close(fd);
}
}
+
+enum {
+ MEMFD_KO,
+ MEMFD_OK,
+ MEMFD_TODO
+};
+
+bool qemu_memfd_check(void)
+{
+ static int memfd_check = MEMFD_TODO;
+
+ if (memfd_check == MEMFD_TODO) {
+ int fd;
+ void *ptr;
+
+ ptr = qemu_memfd_alloc("test", 4096, 0, &fd);
+ memfd_check = ptr ? MEMFD_OK : MEMFD_KO;
+ qemu_memfd_free(ptr, 4096, fd);
+ }
+
+ return memfd_check == MEMFD_OK;
+}
--
2.4.3
- [Qemu-devel] [PATCH v8 25/27] vhost-user-test: add live-migration test, (continued)
- [Qemu-devel] [PATCH v8 25/27] vhost-user-test: add live-migration test, marcandre . lureau, 2015/10/09
- [Qemu-devel] [PATCH v8 13/27] vhost-user: add a migration blocker, marcandre . lureau, 2015/10/09
- [Qemu-devel] [PATCH v8 24/27] vhost-user-test: learn to tweak various qemu arguments, marcandre . lureau, 2015/10/09
- [Qemu-devel] [PATCH v8 27/27] seccomp: add memfd_create to whitelist, marcandre . lureau, 2015/10/09
- [Qemu-devel] [PATCH v8 01/27] exec: factor out duplicate mmap code, marcandre . lureau, 2015/10/10
- [Qemu-devel] [PATCH v8 09/27] vhost: add vhost_set_log_base op, marcandre . lureau, 2015/10/10
- [Qemu-devel] [PATCH v8 04/27] build-sys: split util-obj- on multi-lines, marcandre . lureau, 2015/10/10
- [Qemu-devel] [PATCH v8 10/27] vhost-user: add vhost_user_requires_shm_log(), marcandre . lureau, 2015/10/10
- [Qemu-devel] [PATCH v8 19/27] vhost-user: use an enum helper for features mask, marcandre . lureau, 2015/10/10
- [Qemu-devel] [PATCH v8 20/27] vhost: add migration block if memfd failed,
marcandre . lureau <=
- [Qemu-devel] [PATCH v8 23/27] vhost-user-test: wrap server in TestServer struct, marcandre . lureau, 2015/10/10
- Re: [Qemu-devel] [PATCH v8 00/27] vhost-user: add migration support, Thibaut Collet, 2015/10/12
- Re: [Qemu-devel] [PATCH v8 00/27] vhost-user: add migration support, Thibaut Collet, 2015/10/13
- Re: [Qemu-devel] [PATCH v8 00/27] vhost-user: add migration support, Michael S. Tsirkin, 2015/10/18
- Re: [Qemu-devel] [PATCH v8 00/27] vhost-user: add migration support, Thibaut Collet, 2015/10/19
- Re: [Qemu-devel] [PATCH v8 00/27] vhost-user: add migration support, Michael S. Tsirkin, 2015/10/19
- Re: [Qemu-devel] [PATCH v8 00/27] vhost-user: add migration support, Thibaut Collet, 2015/10/19
- Re: [Qemu-devel] [PATCH v8 00/27] vhost-user: add migration support, Michael S. Tsirkin, 2015/10/19
- Re: [Qemu-devel] [PATCH v8 00/27] vhost-user: add migration support, Thibaut Collet, 2015/10/20
- Re: [Qemu-devel] [PATCH v8 00/27] vhost-user: add migration support, Michael S. Tsirkin, 2015/10/20