diff mbox

[PULL,27/38] vhost: add migration block if memfd failed

Message ID 1445423133-5119-28-git-send-email-mst@redhat.com
State New
Headers show

Commit Message

Michael S. Tsirkin Oct. 21, 2015, 10:28 a.m. UTC 
From: Marc-André Lureau <marcandre.lureau@redhat.com>

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Tested-by: Thibaut Collet <thibaut.collet@6wind.com>
---
 include/qemu/memfd.h |  2 ++
 hw/virtio/vhost.c    |  3 +++
 util/memfd.c         | 22 ++++++++++++++++++++++
 3 files changed, 27 insertions(+)
diff mbox

Patch

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/hw/virtio/vhost.c b/hw/virtio/vhost.c
index 2e78e4b..feeaaa4 100644
--- a/hw/virtio/vhost.c
+++ b/hw/virtio/vhost.c
@@ -1019,6 +1019,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/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;
+}