From 5e1c2c5ee2d8e311d8cfe5b544b3e9fb074581b2 Mon Sep 17 00:00:00 2001 From: mcasquer Date: Wed, 18 Dec 2024 10:56:01 +0100 Subject: [PATCH] hugepage_reset: removes hugepages setup As the test will set 8 hugepages, this works fine for systems with 2 NUMA nodes, having e.g. 8 nodes is going to lead the on_numa_node variant to fail since the binded node doesn't have enough hugepages. As the cfg already suggests to allocate 1G hugepages on boot time, let's make user decision how many hugepages allocate, adding an informative comment in the cfg as well. Signed-off-by: mcasquer --- qemu/tests/cfg/hugepage_reset.cfg | 6 ++++-- qemu/tests/hugepage_reset.py | 2 -- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qemu/tests/cfg/hugepage_reset.cfg b/qemu/tests/cfg/hugepage_reset.cfg index a2c80c9ed6..db6da8c47a 100644 --- a/qemu/tests/cfg/hugepage_reset.cfg +++ b/qemu/tests/cfg/hugepage_reset.cfg @@ -4,8 +4,10 @@ pre_command = 'echo 3 > /proc/sys/vm/drop_caches && echo 1 > /proc/sys/vm/compact_memory' mem = 4096 origin_nr = 8 - # Please set hugepage in kernel command line before this test: - # default_hugepagesz=1G hugepagesz=1G hugepages=8 + # Please allocate enough hugepages at boot time for this test. + # IMPORTANT! Keep in mind the system memory and the number of NUMA nodes + # to decide how many hugepages are needed to be allocated. + # Example: default_hugepagesz=1G hugepagesz=1G hugepages=24 expected_hugepage_size = 1048576 Windows: x86_64: diff --git a/qemu/tests/hugepage_reset.py b/qemu/tests/hugepage_reset.py index 16ba88cf15..19ed8678fd 100644 --- a/qemu/tests/hugepage_reset.py +++ b/qemu/tests/hugepage_reset.py @@ -108,8 +108,6 @@ def heavyload_install(): ) hp_config = test_setup.HugePageConfig(params) hp_config.target_hugepages = origin_nr - test.log.info("Setup hugepage number to %s", origin_nr) - hp_config.setup() hugepage_size = utils_memory.get_huge_page_size() params["hugepage_path"] = hp_config.hugepage_path params["start_vm"] = "yes"