[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 18/24] vhost: add migration block if memfd failed
From: |
marcandre . lureau |
Subject: |
[Qemu-devel] [PATCH v7 18/24] vhost: add migration block if memfd failed |
Date: |
Thu, 1 Oct 2015 19:24:02 +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 ff577b5..2632436 100644
--- a/util/memfd.c
+++ b/util/memfd.c
@@ -141,3 +141,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 v7 08/24] vhost-user: add vhost_user_requires_shm_log(), (continued)
- [Qemu-devel] [PATCH v7 08/24] vhost-user: add vhost_user_requires_shm_log(), marcandre . lureau, 2015/10/08
- [Qemu-devel] [PATCH v7 11/24] vhost-user: add a migration blocker, marcandre . lureau, 2015/10/08
- [Qemu-devel] [PATCH v7 10/24] vhost-user: send log shm fd along with log_base, marcandre . lureau, 2015/10/08
- [Qemu-devel] [PATCH v7 13/24] vhost-user: document migration log, marcandre . lureau, 2015/10/08
- [Qemu-devel] [PATCH v7 12/24] vhost: use a function for each call, marcandre . lureau, 2015/10/08
[Qemu-devel] [PATCH v7 15/24] vhost user: add support of live migration, marcandre . lureau, 2015/10/08
[Qemu-devel] [PATCH v7 18/24] vhost: add migration block if memfd failed,
marcandre . lureau <=
[Qemu-devel] [PATCH v7 16/24] vhost user: add rarp sending after live migration for legacy guest, marcandre . lureau, 2015/10/08
[Qemu-devel] [PATCH v7 24/24] vhost-user-test: check ownership during migration, marcandre . lureau, 2015/10/08
[Qemu-devel] [PATCH v7 01/24] configure: probe for memfd, marcandre . lureau, 2015/10/08
[Qemu-devel] [PATCH v7 07/24] vhost: add vhost_set_log_base op, marcandre . lureau, 2015/10/08
[Qemu-devel] [PATCH v7 17/24] vhost-user: use an enum helper for features mask, marcandre . lureau, 2015/10/08
[Qemu-devel] [PATCH v7 20/24] vhost-user-test: remove useless static check, marcandre . lureau, 2015/10/08