Merge pull request autotest#5600 from dzhengfy/enable_4k_numa_info_arm

host_numa_info: enable 4k test
dzhengfy · Jun 20, 2024 · 509ff38 · 509ff38
2 parents c311aa4 + 00960a5
commit 509ff38
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 9 deletions.
diff --git a/libvirt/tests/cfg/numa/host_numa/host_numa_info.cfg b/libvirt/tests/cfg/numa/host_numa/host_numa_info.cfg
@@ -3,13 +3,21 @@
     take_regular_screendumps = no
     start_vm = "no"
     no s390-virtio
-    variants:
-        - default:
-            allocate_dict = {2048: 200, 1048576: 2}
-            aarch64:
-                allocate_dict = {2048: 200, 524288: 4}
-        - 16G:
+    variants kernel_size:
+        - 4k:
+            default_pagesize = 4
+            variants:
+                - all_hugepages:
+                    allocate_dict = {2048: 200, 1048576: 2}
+                    aarch64:
+                        allocate_dict = {64: 100, 2048: 100, 32768: 4, 1048576: 1}
+        - 64k:
             only aarch64
-            required_kernel = [5.14.0,)
-            expect_nodes_num = 1
-            allocate_dict = {16777216: 1}
+            default_pagesize = 64
+            variants:
+                - all_hugepages:
+                    required_kernel = [5.14.0,)
+                    expect_nodes_num = 1
+                    allocate_dict = {2048: 200, 524288: 4, 16777216: 1}
+                - 512M_2M:
+                    allocate_dict = {2048: 200, 524288: 4}
diff --git a/libvirt/tests/src/numa/host_numa/host_numa_info.py b/libvirt/tests/src/numa/host_numa/host_numa_info.py
@@ -382,6 +382,12 @@ def run(test, params, env):
     """
     Test numa topology together with cpu topology
     """
+    default_pagesize = int(params.get("default_pagesize")) * 1024
+    default_kernel_pagesize = mem_utils.get_page_size()
+    if default_pagesize != default_kernel_pagesize:
+        test.cancel("The case does not support on "
+                    "current host kernel "
+                    "size %d" % default_kernel_pagesize)
     vm_name = params.get("main_vm")
     vm = env.get_vm(vm_name)
     numatest_obj = numa_base.NumaTest(vm, params, test)