Skip to contentSkip to conversation

backends/hostmem: Fix support of memory-backend-memfd in qemu_maxrampagesize()

PATCH Superseded Thomas Huth 2 participants 5 messages Aug 10, 2022 Arm STM32

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 backends/hostmem: Fix support of memory-backend-memfd in qemu_maxrampagesize()

It is currently not possible yet to use "memory-backend-memfd" on s390x with hugepages enabled. This problem is caused by qemu_maxrampagesize() not taking memory-backend-memfd objects into account yet, so the code in s390_memory_init() fails to enable the huge page support there via s390_set_max_pagesize(). Fix it by looking at the memory-backend-memfd in the host_memory_backend_pagesize() function, too.

---
 include/sysemu/hostmem.h |  8 +++++++-
 backends/hostmem-memfd.c |  2 --
 backends/hostmem.c       | 27 +++++++++++++++++----------
 3 files changed, 24 insertions(+), 13 deletions(-)
include/sysemu/hostmem.h +7 -1
index 9ff5c16963..d983ae6c01 100644
@@ -34,10 +34,16 @@ OBJECT_DECLARE_TYPE(HostMemoryBackend, HostMemoryBackendClass,
 /* hostmem-file.c */
 /**
  * @TYPE_MEMORY_BACKEND_FILE:
- * name of backend that uses mmap on a file descriptor
+ * name of backend that uses mmap on a file
  */
 #define TYPE_MEMORY_BACKEND_FILE "memory-backend-file"
 
+/* hostmem-memfd.c */
+/**
+ * @TYPE_MEMORY_BACKEND_MEMFD:
+ * name of backend that uses mmap on a memfd file descriptor
+ */
+#define TYPE_MEMORY_BACKEND_MEMFD "memory-backend-memfd"
 
 /**
  * HostMemoryBackendClass:
backends/hostmem-memfd.c +0 -2
index 3fc85c3db8..1ab2085e49 100644
@@ -18,8 +18,6 @@
 #include "qapi/error.h"
 #include "qom/object.h"
 
-#define TYPE_MEMORY_BACKEND_MEMFD "memory-backend-memfd"
-
 OBJECT_DECLARE_SIMPLE_TYPE(HostMemoryBackendMemfd, MEMORY_BACKEND_MEMFD)
 
 
backends/hostmem.c +17 -10
index 624bb7ecd3..ebce887105 100644
@@ -306,22 +306,29 @@ bool host_memory_backend_is_mapped(HostMemoryBackend *backend)
     return backend->is_mapped;
 }
 
-#ifdef __linux__
 size_t host_memory_backend_pagesize(HostMemoryBackend *memdev)
 {
+    size_t pagesize = 0;
+
+#ifdef __linux__
     Object *obj = OBJECT(memdev);
-    char *path = object_property_get_str(obj, "mem-path", NULL);
-    size_t pagesize = qemu_mempath_getpagesize(path);
 
-    g_free(path);
+    if (object_dynamic_cast(obj, TYPE_MEMORY_BACKEND_FILE)) {
+        char *path = object_property_get_str(obj, "mem-path", NULL);
+        pagesize = qemu_mempath_getpagesize(path);
+        g_free(path);
+    } else if (object_dynamic_cast(obj, TYPE_MEMORY_BACKEND_MEMFD) &&
+               object_property_get_bool(obj, "hugetlb", &error_abort)) {
+        pagesize = object_property_get_int(obj, "hugetlbsize", &error_abort);
+    }
+#endif
+
+    if (!pagesize) {
+        pagesize = qemu_real_host_page_size();
+    }
+
     return pagesize;
 }
-#else
-size_t host_memory_backend_pagesize(HostMemoryBackend *memdev)
-{
-    return qemu_real_host_page_size();
-}
-#endif
 
 static void
 host_memory_backend_memory_complete(UserCreatable *uc, Error **errp)
Signature · 1 line
2.31.1
#1 lore raw
Quoted 68 lines · Thomas Huth

It is currently not possible yet to use "memory-backend-memfd" on s390x with hugepages enabled. This problem is caused by qemu_maxrampagesize() not taking memory-backend-memfd objects into account yet, so the code in s390_memory_init() fails to enable the huge page support there via s390_set_max_pagesize(). Fix it by looking at the memory-backend-memfd in the host_memory_backend_pagesize() function, too.

---
 include/sysemu/hostmem.h |  8 +++++++-
 backends/hostmem-memfd.c |  2 --
 backends/hostmem.c       | 27 +++++++++++++++++----------
 3 files changed, 24 insertions(+), 13 deletions(-)
include/sysemu/hostmem.h +7 -1
index 9ff5c16963..d983ae6c01 100644
@@ -34,10 +34,16 @@ OBJECT_DECLARE_TYPE(HostMemoryBackend, HostMemoryBackendClass,
 /* hostmem-file.c */
 /**
  * @TYPE_MEMORY_BACKEND_FILE:
- * name of backend that uses mmap on a file descriptor
+ * name of backend that uses mmap on a file
  */
 #define TYPE_MEMORY_BACKEND_FILE "memory-backend-file"
 
+/* hostmem-memfd.c */
+/**
+ * @TYPE_MEMORY_BACKEND_MEMFD:
+ * name of backend that uses mmap on a memfd file descriptor
+ */
+#define TYPE_MEMORY_BACKEND_MEMFD "memory-backend-memfd"
 
 /**
  * HostMemoryBackendClass:
backends/hostmem-memfd.c +0 -2
index 3fc85c3db8..1ab2085e49 100644
@@ -18,8 +18,6 @@
 #include "qapi/error.h"
 #include "qom/object.h"
 
-#define TYPE_MEMORY_BACKEND_MEMFD "memory-backend-memfd"
-
 OBJECT_DECLARE_SIMPLE_TYPE(HostMemoryBackendMemfd, MEMORY_BACKEND_MEMFD)
 
 
backends/hostmem.c +3 -3
index 624bb7ecd3..ebce887105 100644
@@ -306,22 +306,29 @@ bool host_memory_backend_is_mapped(HostMemoryBackend *backend)
     return backend->is_mapped;
 }
 
-#ifdef __linux__
 size_t host_memory_backend_pagesize(HostMemoryBackend *memdev)
 {
+    size_t pagesize = 0;
+
+#ifdef __linux__
     Object *obj = OBJECT(memdev);
-    char *path = object_property_get_str(obj, "mem-path", NULL);
-    size_t pagesize = qemu_mempath_getpagesize(path);
 

backends/hostmem.c bool host_memory_backend_is_mapped(HostMemoryBackend *backend) · line 324

Quoted 10 lines
backends/hostmem.c +9 -1
-    g_free(path);
+    if (object_dynamic_cast(obj, TYPE_MEMORY_BACKEND_FILE)) {
+        char *path = object_property_get_str(obj, "mem-path", NULL);
+        pagesize = qemu_mempath_getpagesize(path);
+        g_free(path);
+    } else if (object_dynamic_cast(obj, TYPE_MEMORY_BACKEND_MEMFD) &&
+               object_property_get_bool(obj, "hugetlb", &error_abort)) {
+        pagesize = object_property_get_int(obj, "hugetlbsize", &error_abort);
+    }
+#endif

Why can't we simply rely on

qemu_ram_pagesize(memdev->mr.ram_block);

?

Signature · 3 lines
Thanks,

David / dhildenb
#2 lore raw
Quoted 82 lines · David Hildenbrand
Quoted 68 lines · Thomas Huth

It is currently not possible yet to use "memory-backend-memfd" on s390x with hugepages enabled. This problem is caused by qemu_maxrampagesize() not taking memory-backend-memfd objects into account yet, so the code in s390_memory_init() fails to enable the huge page support there via s390_set_max_pagesize(). Fix it by looking at the memory-backend-memfd in the host_memory_backend_pagesize() function, too.

---
  include/sysemu/hostmem.h |  8 +++++++-
  backends/hostmem-memfd.c |  2 --
  backends/hostmem.c       | 27 +++++++++++++++++----------
  3 files changed, 24 insertions(+), 13 deletions(-)
include/sysemu/hostmem.h +7 -1
index 9ff5c16963..d983ae6c01 100644
@@ -34,10 +34,16 @@ OBJECT_DECLARE_TYPE(HostMemoryBackend, HostMemoryBackendClass,
  /* hostmem-file.c */
  /**
   * @TYPE_MEMORY_BACKEND_FILE:
- * name of backend that uses mmap on a file descriptor
+ * name of backend that uses mmap on a file
   */
  #define TYPE_MEMORY_BACKEND_FILE "memory-backend-file"
 
+/* hostmem-memfd.c */
+/**
+ * @TYPE_MEMORY_BACKEND_MEMFD:
+ * name of backend that uses mmap on a memfd file descriptor
+ */
+#define TYPE_MEMORY_BACKEND_MEMFD "memory-backend-memfd"
 
  /**
   * HostMemoryBackendClass:
backends/hostmem-memfd.c +0 -2
index 3fc85c3db8..1ab2085e49 100644
@@ -18,8 +18,6 @@
  #include "qapi/error.h"
  #include "qom/object.h"
 
-#define TYPE_MEMORY_BACKEND_MEMFD "memory-backend-memfd"
-
  OBJECT_DECLARE_SIMPLE_TYPE(HostMemoryBackendMemfd, MEMORY_BACKEND_MEMFD)
 
 
backends/hostmem.c +3 -3
index 624bb7ecd3..ebce887105 100644
@@ -306,22 +306,29 @@ bool host_memory_backend_is_mapped(HostMemoryBackend *backend)
      return backend->is_mapped;
  }
 
-#ifdef __linux__
  size_t host_memory_backend_pagesize(HostMemoryBackend *memdev)
  {
+    size_t pagesize = 0;
+
+#ifdef __linux__
      Object *obj = OBJECT(memdev);
-    char *path = object_property_get_str(obj, "mem-path", NULL);
-    size_t pagesize = qemu_mempath_getpagesize(path);
 

backends/hostmem.c bool host_memory_backend_is_mapped(HostMemoryBackend *backend) · line 324

Quoted 10 lines
backends/hostmem.c +9 -1
-    g_free(path);
+    if (object_dynamic_cast(obj, TYPE_MEMORY_BACKEND_FILE)) {
+        char *path = object_property_get_str(obj, "mem-path", NULL);
+        pagesize = qemu_mempath_getpagesize(path);
+        g_free(path);
+    } else if (object_dynamic_cast(obj, TYPE_MEMORY_BACKEND_MEMFD) &&
+               object_property_get_bool(obj, "hugetlb", &error_abort)) {
+        pagesize = object_property_get_int(obj, "hugetlbsize", &error_abort);
+    }
+#endif

Why can't we simply rely on

Quoted 1 line

qemu_ram_pagesize(memdev->mr.ram_block);

Good idea! That way, we could even get rid of the "#ifdef __linux__" macros here, I guess ... I'll give it a try and send a v2 if it works.

Thomas

#3 lore raw
Quoted 83 lines · Thomas Huth
Quoted 82 lines · David Hildenbrand
Quoted 68 lines · Thomas Huth

It is currently not possible yet to use "memory-backend-memfd" on s390x with hugepages enabled. This problem is caused by qemu_maxrampagesize() not taking memory-backend-memfd objects into account yet, so the code in s390_memory_init() fails to enable the huge page support there via s390_set_max_pagesize(). Fix it by looking at the memory-backend-memfd in the host_memory_backend_pagesize() function, too.

---
  include/sysemu/hostmem.h |  8 +++++++-
  backends/hostmem-memfd.c |  2 --
  backends/hostmem.c       | 27 +++++++++++++++++----------
  3 files changed, 24 insertions(+), 13 deletions(-)
include/sysemu/hostmem.h +7 -1
index 9ff5c16963..d983ae6c01 100644
@@ -34,10 +34,16 @@ OBJECT_DECLARE_TYPE(HostMemoryBackend, HostMemoryBackendClass,
  /* hostmem-file.c */
  /**
   * @TYPE_MEMORY_BACKEND_FILE:
- * name of backend that uses mmap on a file descriptor
+ * name of backend that uses mmap on a file
   */
  #define TYPE_MEMORY_BACKEND_FILE "memory-backend-file"
 
+/* hostmem-memfd.c */
+/**
+ * @TYPE_MEMORY_BACKEND_MEMFD:
+ * name of backend that uses mmap on a memfd file descriptor
+ */
+#define TYPE_MEMORY_BACKEND_MEMFD "memory-backend-memfd"
 
  /**
   * HostMemoryBackendClass:
backends/hostmem-memfd.c +0 -2
index 3fc85c3db8..1ab2085e49 100644
@@ -18,8 +18,6 @@
  #include "qapi/error.h"
  #include "qom/object.h"
 
-#define TYPE_MEMORY_BACKEND_MEMFD "memory-backend-memfd"
-
  OBJECT_DECLARE_SIMPLE_TYPE(HostMemoryBackendMemfd, MEMORY_BACKEND_MEMFD)
 
 
backends/hostmem.c +3 -3
index 624bb7ecd3..ebce887105 100644
@@ -306,22 +306,29 @@ bool host_memory_backend_is_mapped(HostMemoryBackend *backend)
      return backend->is_mapped;
  }
 
-#ifdef __linux__
  size_t host_memory_backend_pagesize(HostMemoryBackend *memdev)
  {
+    size_t pagesize = 0;
+
+#ifdef __linux__
      Object *obj = OBJECT(memdev);
-    char *path = object_property_get_str(obj, "mem-path", NULL);
-    size_t pagesize = qemu_mempath_getpagesize(path);
 

backends/hostmem.c bool host_memory_backend_is_mapped(HostMemoryBackend *backend) · line 324

Quoted 10 lines
backends/hostmem.c +9 -1
-    g_free(path);
+    if (object_dynamic_cast(obj, TYPE_MEMORY_BACKEND_FILE)) {
+        char *path = object_property_get_str(obj, "mem-path", NULL);
+        pagesize = qemu_mempath_getpagesize(path);
+        g_free(path);
+    } else if (object_dynamic_cast(obj, TYPE_MEMORY_BACKEND_MEMFD) &&
+               object_property_get_bool(obj, "hugetlb", &error_abort)) {
+        pagesize = object_property_get_int(obj, "hugetlbsize", &error_abort);
+    }
+#endif

Why can't we simply rely on

Quoted 4 lines
Quoted 1 line

qemu_ram_pagesize(memdev->mr.ram_block);

Good idea! That way, we could even get rid of the "#ifdef __linux__" macros here, I guess ... I'll give it a try and send a v2 if it works.

At first I wondered if we could have to deal with semi-iniutialized backendds here, but I think we should simply always already have the MR/RamBlock here.

Signature · 3 lines
Thanks,

David / dhildenb
#4 lore raw
Quoted 84 lines · David Hildenbrand
Quoted 83 lines · Thomas Huth
Quoted 82 lines · David Hildenbrand
Quoted 68 lines · Thomas Huth

It is currently not possible yet to use "memory-backend-memfd" on s390x with hugepages enabled. This problem is caused by qemu_maxrampagesize() not taking memory-backend-memfd objects into account yet, so the code in s390_memory_init() fails to enable the huge page support there via s390_set_max_pagesize(). Fix it by looking at the memory-backend-memfd in the host_memory_backend_pagesize() function, too.

---
   include/sysemu/hostmem.h |  8 +++++++-
   backends/hostmem-memfd.c |  2 --
   backends/hostmem.c       | 27 +++++++++++++++++----------
   3 files changed, 24 insertions(+), 13 deletions(-)
include/sysemu/hostmem.h +7 -1
index 9ff5c16963..d983ae6c01 100644
@@ -34,10 +34,16 @@ OBJECT_DECLARE_TYPE(HostMemoryBackend, HostMemoryBackendClass,
   /* hostmem-file.c */
   /**
    * @TYPE_MEMORY_BACKEND_FILE:
- * name of backend that uses mmap on a file descriptor
+ * name of backend that uses mmap on a file
    */
   #define TYPE_MEMORY_BACKEND_FILE "memory-backend-file"
 
+/* hostmem-memfd.c */
+/**
+ * @TYPE_MEMORY_BACKEND_MEMFD:
+ * name of backend that uses mmap on a memfd file descriptor
+ */
+#define TYPE_MEMORY_BACKEND_MEMFD "memory-backend-memfd"
 
   /**
    * HostMemoryBackendClass:
backends/hostmem-memfd.c +0 -2
index 3fc85c3db8..1ab2085e49 100644
@@ -18,8 +18,6 @@
   #include "qapi/error.h"
   #include "qom/object.h"
 
-#define TYPE_MEMORY_BACKEND_MEMFD "memory-backend-memfd"
-
   OBJECT_DECLARE_SIMPLE_TYPE(HostMemoryBackendMemfd, MEMORY_BACKEND_MEMFD)
 
 
backends/hostmem.c +3 -3
index 624bb7ecd3..ebce887105 100644
@@ -306,22 +306,29 @@ bool host_memory_backend_is_mapped(HostMemoryBackend *backend)
       return backend->is_mapped;
   }
 
-#ifdef __linux__
   size_t host_memory_backend_pagesize(HostMemoryBackend *memdev)
   {
+    size_t pagesize = 0;
+
+#ifdef __linux__
       Object *obj = OBJECT(memdev);
-    char *path = object_property_get_str(obj, "mem-path", NULL);
-    size_t pagesize = qemu_mempath_getpagesize(path);
 

backends/hostmem.c bool host_memory_backend_is_mapped(HostMemoryBackend *backend) · line 324

Quoted 10 lines
backends/hostmem.c +9 -1
-    g_free(path);
+    if (object_dynamic_cast(obj, TYPE_MEMORY_BACKEND_FILE)) {
+        char *path = object_property_get_str(obj, "mem-path", NULL);
+        pagesize = qemu_mempath_getpagesize(path);
+        g_free(path);
+    } else if (object_dynamic_cast(obj, TYPE_MEMORY_BACKEND_MEMFD) &&
+               object_property_get_bool(obj, "hugetlb", &error_abort)) {
+        pagesize = object_property_get_int(obj, "hugetlbsize", &error_abort);
+    }
+#endif

Why can't we simply rely on

Quoted 8 lines
Quoted 4 lines
Quoted 1 line

qemu_ram_pagesize(memdev->mr.ram_block);

Good idea! That way, we could even get rid of the "#ifdef __linux__" macros here, I guess ... I'll give it a try and send a v2 if it works.

At first I wondered if we could have to deal with semi-iniutialized backendds here, but I think we should simply always already have the MR/RamBlock here.

I'll add an assert(pagesize >= getpagesize()) there, just to be sure.

Thomas