[LTP] [PATCH v4] cpuset02: Reimplementing the test6 of cpuset_memory_testset.sh as a separate C testcase
Wei Gao
wegao@suse.com
Mon Sep 30 15:58:09 CEST 2024
Signed-off-by: Wei Gao <wegao@suse.com>
---
lib/tst_cgroup.c | 1 +
runtest/mm | 1 +
testcases/kernel/mem/.gitignore | 1 +
testcases/kernel/mem/cpuset/Makefile | 7 ++
testcases/kernel/mem/cpuset/cpuset02.c | 140 +++++++++++++++++++++++++
5 files changed, 150 insertions(+)
create mode 100644 testcases/kernel/mem/cpuset/cpuset02.c
diff --git a/lib/tst_cgroup.c b/lib/tst_cgroup.c
index 6055015eb..1404116a5 100644
--- a/lib/tst_cgroup.c
+++ b/lib/tst_cgroup.c
@@ -203,6 +203,7 @@ static const struct cgroup_file cpuset_ctrl_files[] = {
{ "cpuset.cpus", "cpuset.cpus", CTRL_CPUSET },
{ "cpuset.mems", "cpuset.mems", CTRL_CPUSET },
{ "cpuset.memory_migrate", "cpuset.memory_migrate", CTRL_CPUSET },
+ { "cpuset.sched_load_balance", "cpuset.sched_load_balance", CTRL_CPUSET },
{ }
};
diff --git a/runtest/mm b/runtest/mm
index 6a8cd0b9d..845874c41 100644
--- a/runtest/mm
+++ b/runtest/mm
@@ -75,6 +75,7 @@ ksm06_2 ksm06 -n 8000
ksm07 ksm07
cpuset01 cpuset01
+cpuset02 cpuset02
oom01 oom01
oom02 oom02
diff --git a/testcases/kernel/mem/.gitignore b/testcases/kernel/mem/.gitignore
index d88484fa1..0845297cb 100644
--- a/testcases/kernel/mem/.gitignore
+++ b/testcases/kernel/mem/.gitignore
@@ -1,4 +1,5 @@
/cpuset/cpuset01
+/cpuset/cpuset02
/hugetlb/hugefallocate/hugefallocate01
/hugetlb/hugefallocate/hugefallocate02
/hugetlb/hugefork/hugefork01
diff --git a/testcases/kernel/mem/cpuset/Makefile b/testcases/kernel/mem/cpuset/Makefile
index 8e41c0223..366d67ce9 100644
--- a/testcases/kernel/mem/cpuset/Makefile
+++ b/testcases/kernel/mem/cpuset/Makefile
@@ -19,6 +19,13 @@
top_srcdir ?= ../../../..
+LTPLIBS = numa
+
include $(top_srcdir)/include/mk/testcases.mk
include $(top_srcdir)/testcases/kernel/mem/include/libmem.mk
+
+LDLIBS += $(NUMA_LIBS)
+LDLIBS += $(top_srcdir)/testcases/kernel/controllers/cpuset/cpuset_lib/libcpu_set.a
+LTPLDLIBS = -lltpnuma
+
include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/kernel/mem/cpuset/cpuset02.c b/testcases/kernel/mem/cpuset/cpuset02.c
new file mode 100644
index 000000000..a62c98b3f
--- /dev/null
+++ b/testcases/kernel/mem/cpuset/cpuset02.c
@@ -0,0 +1,140 @@
+// SPDX-License-Identifier: LGPL-2.1-or-later
+/*
+ * Copyright (c) 2009 FUJITSU LIMITED Miao Xie <miaox@cn.fujitsu.com>
+ * Copyright (c) 2023 SUSE LLC <wegao@suse.com>
+ */
+
+/*\
+ * [Description]
+ *
+ * This test check cpuset's mems work with hugepage file.
+ *
+ */
+
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <sys/mount.h>
+#include <limits.h>
+#include <sys/param.h>
+#include <sys/types.h>
+#include "tst_test.h"
+#include "../../controllers/cpuset/cpuset_lib/cpuset.h"
+
+#ifdef HAVE_NUMA_V2
+#include <numa.h>
+#include <numaif.h>
+#include <errno.h>
+#include "tst_numa.h"
+#include "tst_safe_stdio.h"
+#include "mem.h"
+#include "numa_helper.h"
+
+#define MNTPOINT "hugetlbfs/"
+#define HUGE_PAGE_FILE MNTPOINT "hugepagefile"
+#define PAGES_ALLOCATED 16u
+
+static long hpage_size;
+static struct tst_nodemap *node;
+static struct tst_cg_group *cg_cpuset_0;
+
+static void count_cpus_mems(void)
+{
+ node = tst_get_nodemap(TST_NUMA_MEM, PAGES_ALLOCATED * getpagesize() / 1024);
+ if (node->cnt <= 1)
+ tst_brk(TCONF, "test requires NUMA system");
+}
+
+static void touch_memory_and_check_node(char *p, int size)
+{
+ int i;
+ int pagesize = sysconf(_SC_PAGESIZE);
+
+ for (i = 0; i < size; i += pagesize)
+ p[i] = 0xef;
+
+ if (cpuset_addr2node(p) == 0)
+ tst_res(TPASS, "check node pass");
+ else
+ tst_res(TFAIL, "check node failed");
+}
+
+static void child(void)
+{
+ char *p;
+ int fd_hugepage;
+
+ TST_CHECKPOINT_WAIT(0);
+
+ fd_hugepage = SAFE_OPEN(HUGE_PAGE_FILE, O_CREAT | O_RDWR, 0755);
+ p = SAFE_MMAP(NULL, hpage_size, PROT_WRITE | PROT_READ,
+ MAP_SHARED, fd_hugepage, 0);
+
+ touch_memory_and_check_node(p, hpage_size);
+
+ SAFE_MUNMAP(p, hpage_size);
+ SAFE_CLOSE(fd_hugepage);
+
+ TST_CHECKPOINT_WAKE(1);
+}
+
+static void run_test(void)
+{
+ int pid;
+
+ cg_cpuset_0 = tst_cg_group_mk(tst_cg, "0");
+
+ SAFE_CG_PRINT(cg_cpuset_0, "cpuset.cpus", "0");
+ SAFE_CG_PRINT(cg_cpuset_0, "cpuset.mems", "0");
+ SAFE_CG_PRINT(cg_cpuset_0, "cpuset.sched_load_balance", "0");
+
+ SAFE_FILE_PRINTF("/proc/sys/vm/nr_hugepages", "%d", 2 * node->cnt);
+
+ pid = SAFE_FORK();
+ if (!pid) {
+ child();
+ } else {
+ SAFE_CG_PRINTF(cg_cpuset_0, "cgroup.procs", "%d", pid);
+
+ TST_CHECKPOINT_WAKE(0);
+ TST_CHECKPOINT_WAIT(1);
+
+ SAFE_WAITPID(pid, NULL, 0);
+
+ cg_cpuset_0 = tst_cg_group_rm(cg_cpuset_0);
+ }
+}
+
+static void setup(void)
+{
+ count_cpus_mems();
+
+ hpage_size = SAFE_READ_MEMINFO(MEMINFO_HPAGE_SIZE)*1024;
+}
+
+static void cleanup(void)
+{
+ if (cg_cpuset_0)
+ cg_cpuset_0 = tst_cg_group_rm(cg_cpuset_0);
+}
+
+static struct tst_test test = {
+ .needs_root = 1,
+ .runs_script = 1,
+ .mntpoint = MNTPOINT,
+ .needs_hugetlbfs = 1,
+ .setup = setup,
+ .forks_child = 1,
+ .cleanup = cleanup,
+ .test_all = run_test,
+ .hugepages = {3, TST_NEEDS},
+ .needs_checkpoints = 1,
+ .needs_cgroup_ctrls = (const char *const []){ "cpuset", NULL },
+ .save_restore = (const struct tst_path_val[]) {
+ {"/proc/sys/vm/nr_hugepages", NULL, TST_SR_TBROK},
+ {}
+ },
+};
+
+#else
+TST_TEST_TCONF(NUMA_ERROR_MSG);
+#endif
--
2.35.3
More information about the ltp
mailing list