[LTP] [PATCH v5 1/2] cpuset02: Convert the test6 from cpuset_memory_testset.sh to C code
Wei Gao
wegao@suse.com
Mon Dec 9 07:01:16 CET 2024
Base Cyril Hrubis's suggestion [1].
We should stop applying band aids over the mess called cpuset tests
and start actually rewriting them into something saner, and start by
reimplementing the test6 as a separate C testcase so that we can make
use of all the infrastructure for hugepages we have in the tst_test.
[1] https://patchwork.ozlabs.org/project/ltp/patch/20240801104004.15514-1-wegao@suse.com/
Suggested-by: Cyril Hrubis <chrubis@suse.cz>
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 | 6 +
testcases/kernel/mem/cpuset/cpuset02.c | 142 ++++++++++++++++++
.../mq_timedreceive/mq_timedreceive01.c | 80 +++++++---
6 files changed, 210 insertions(+), 21 deletions(-)
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 d8e62af81..5af29b0ea 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 699e022fb..e24e96001 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..9311985b1 100644
--- a/testcases/kernel/mem/cpuset/Makefile
+++ b/testcases/kernel/mem/cpuset/Makefile
@@ -19,6 +19,12 @@
top_srcdir ?= ../../../..
+LTPLIBS = numa
+
include $(top_srcdir)/include/mk/testcases.mk
include $(top_srcdir)/testcases/kernel/mem/include/libmem.mk
+
+LDLIBS += $(NUMA_LIBS)
+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..2bd226bab
--- /dev/null
+++ b/testcases/kernel/mem/cpuset/cpuset02.c
@@ -0,0 +1,142 @@
+// 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]
+ *
+ * Test checks cpuset.mems works 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"
+
+#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 touch_memory_and_check_node(char *p, int size)
+{
+ int i;
+ int node = -1;
+ long ret;
+ int pagesize = sysconf(_SC_PAGESIZE);
+
+ for (i = 0; i < size; i += pagesize)
+ p[i] = 0xef;
+
+ ret = get_mempolicy(&node, NULL, 0, p, MPOL_F_NODE | MPOL_F_ADDR);
+ if (ret < 0)
+ tst_brk(TBROK | TERRNO, "get_mempolicy() failed");
+
+ if (node == 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();
+ return;
+ }
+
+ 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)
+{
+ node = tst_get_nodemap(TST_NUMA_MEM, PAGES_ALLOCATED * getpagesize() / 1024);
+ if (node->cnt <= 1)
+ tst_brk(TCONF, "test requires NUMA system");
+
+ 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_ver = TST_CG_V1,
+ .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
diff --git a/testcases/kernel/syscalls/mq_timedreceive/mq_timedreceive01.c b/testcases/kernel/syscalls/mq_timedreceive/mq_timedreceive01.c
index be437e19a..6dadc3de6 100644
--- a/testcases/kernel/syscalls/mq_timedreceive/mq_timedreceive01.c
+++ b/testcases/kernel/syscalls/mq_timedreceive/mq_timedreceive01.c
@@ -145,32 +145,16 @@ static void setup(void)
setup_common();
}
-static void do_test(unsigned int i)
+
+static void verify_mqt_receive(unsigned int i, pid_t pid)
{
struct time64_variants *tv = &variants[tst_variant];
const struct test_case *tc = &tcase[i];
- unsigned int j;
- unsigned int prio;
size_t len = MAX_MSGSIZE;
char rmsg[len];
- pid_t pid = -1;
void *abs_timeout;
-
- tst_ts_set_sec(&ts, tc->tv_sec);
- tst_ts_set_nsec(&ts, tc->tv_nsec);
-
- if (tc->signal)
- pid = set_sig(tc->rq, tv->clock_gettime);
-
- if (tc->timeout)
- set_timeout(tc->rq, tv->clock_gettime);
-
- if (tc->send) {
- if (tv->mqt_send(*tc->fd, smsg, tc->len, tc->prio, NULL) < 0) {
- tst_res(TFAIL | TTERRNO, "mq_timedsend() failed");
- return;
- }
- }
+ unsigned int j;
+ unsigned int prio;
if (tc->invalid_msg)
len -= 1;
@@ -199,7 +183,7 @@ static void do_test(unsigned int i)
return;
}
- if (tc->len != TST_RET) {
+ if ((long)tc->len != TST_RET) {
tst_res(TFAIL, "mq_timedreceive() wrong length %ld, expected %u",
TST_RET, tc->len);
return;
@@ -224,6 +208,60 @@ static void do_test(unsigned int i)
TST_RET, prio, len);
}
+static void test_bad_addr(unsigned int i)
+{
+ struct time64_variants *tv = &variants[tst_variant];
+ pid_t pid;
+ int status;
+
+ pid = SAFE_FORK();
+ if (!pid) {
+ verify_mqt_receive(i, pid);
+ _exit(0);
+ }
+
+ SAFE_WAITPID(pid, &status, 0);
+
+ if (WIFEXITED(status) && !WEXITSTATUS(status))
+ return;
+
+ if (tv->ts_type == TST_LIBC_TIMESPEC &&
+ WIFSIGNALED(status) && WTERMSIG(status) == SIGSEGV) {
+ tst_res(TPASS, "Child killed by expected signal");
+ return;
+ }
+
+ tst_res(TFAIL, "Child %s", tst_strstatus(status));
+}
+
+static void do_test(unsigned int i)
+{
+ struct time64_variants *tv = &variants[tst_variant];
+ const struct test_case *tc = &tcase[i];
+ pid_t pid = -1;
+
+ tst_ts_set_sec(&ts, tc->tv_sec);
+ tst_ts_set_nsec(&ts, tc->tv_nsec);
+
+ if (tc->bad_ts_addr) {
+ test_bad_addr(i);
+ return;
+ }
+
+ if (tc->signal)
+ pid = set_sig(tc->rq, tv->clock_gettime);
+
+ if (tc->timeout)
+ set_timeout(tc->rq, tv->clock_gettime);
+
+ if (tc->send && tv->mqt_send(*tc->fd, smsg, tc->len, tc->prio, NULL) < 0) {
+ tst_res(TFAIL | TTERRNO, "mq_timedsend() failed");
+ return;
+ }
+
+ verify_mqt_receive(i, pid);
+}
+
static struct tst_test test = {
.tcnt = ARRAY_SIZE(tcase),
.test = do_test,
--
2.35.3
More information about the ltp
mailing list