Merge pull request #5915 from liang-cong-red-hat/memory_backing_chang…

…e_memory_size Change memory size according to case update
autotest · Sep 27, 2024 · bc88c45 · bc88c45
2 parents 2c75700 + 8c7383b
commit bc88c45
Showing 1 changed file with 15 additions and 11 deletions.
diff --git a/libvirt/tests/cfg/memory/memory_backing/lifecycle_for_hugepage.cfg b/libvirt/tests/cfg/memory/memory_backing/lifecycle_for_hugepage.cfg
@@ -1,17 +1,20 @@
 - memory.backing.lifecycle:
     type = lifecycle_for_hugepage
     start_vm = no
-    total_hugepage_mem = 2097152
-    vm_nr_hugepages = 1024
+    total_hugepage_mem = 8388608
+    vm_nr_hugepages = 4096
     mount_size = "1048576"
-    current_mem = 2097152
-    mem_value = 2097152
+    current_mem = 8388608
+    mem_value = 8388608
     mem_unit = "KiB"
     current_mem_unit = "KiB"
-    target_hugepages = 2
+    target_hugepages = 8
     set_pagesize ="1048576"
-    set_pagenum = "2"
+    set_pagenum = "8"
     s390-virtio:
+        total_hugepage_mem = 2097152
+        current_mem = 2097152
+        mem_value = 2097152
         set_pagesize = "1024"
         mount_size = "1024"
         set_pagenum = "2048"
@@ -53,7 +56,7 @@
                     page_size = "2"
                     page_unit = "M"
                     set_pagesize ="2048"
-                    set_pagenum = "1024"
+                    set_pagenum = "4096"
                     mount_size = ${set_pagesize}
                     memory_backing_dict = "'mb': {'hugepages': {'pages': [{'unit': '${page_unit}', 'size': '${page_size}'}]}}"
                     vm_attrs = {${memory_backing_dict}, 'memory_unit':'${mem_unit}','memory':${mem_value},'current_mem':${current_mem},'current_mem_unit':'${current_mem_unit}'}
@@ -77,7 +80,7 @@
                     page_size = "64"
                     page_unit = "KiB"
                     set_pagesize ="64"
-                    set_pagenum = "32768"
+                    set_pagenum = "131072"
                     mount_size = ${set_pagesize}
                     memory_backing_dict = "'mb': {'hugepages': {'pages': [{'unit': '${page_unit}', 'size': '${page_size}'}]}}"
                     vm_attrs = {${memory_backing_dict}, 'memory_unit':'${mem_unit}','memory':${mem_value},'current_mem':${current_mem},'current_mem_unit':'${current_mem_unit}'}
@@ -88,7 +91,7 @@
                     page_size = "32"
                     page_unit = "M"
                     set_pagesize ="32768"
-                    set_pagenum = "64"
+                    set_pagenum = "256"
                     mount_size = ${set_pagesize}
                     memory_backing_dict = "'mb': {'hugepages': {'pages': [{'unit': '${page_unit}', 'size': '${page_size}'}]}}"
                     vm_attrs = {${memory_backing_dict}, 'memory_unit':'${mem_unit}','memory':${mem_value},'current_mem':${current_mem},'current_mem_unit':'${current_mem_unit}'}
@@ -101,8 +104,9 @@
                     vm_attrs = {${memory_backing_dict}, 'memory_unit':'${mem_unit}','memory':${mem_value},'current_mem':${current_mem},'current_mem_unit':'${current_mem_unit}'}
                     define_error = "hugepage size can't be zero"
                 - scarce_mem:
-                    current_mem = 3145728
-                    mem_value = 3145728
+                    current_mem = 9437184
+                    mem_value = 9437184
                     memory_backing_dict = "'mb': {'hugepages': {}}"
                     vm_attrs = {${memory_backing_dict}, 'memory_unit':'${mem_unit}','memory':${mem_value},'current_mem':${current_mem},'current_mem_unit':'${current_mem_unit}'}
                     start_error = "unable to map backing store for guest RAM: Cannot allocate memory"
+