From: Richard Palethorpe <rpalethorpe@suse.com>
To: ltp@lists.linux.it
Subject: [LTP] [PATCH v6 6/7] mem: Convert tests to new CGroups API
Date: Tue, 4 May 2021 14:40:59 +0100 [thread overview]
Message-ID: <20210504134100.20666-7-rpalethorpe@suse.com> (raw)
In-Reply-To: <20210504134100.20666-1-rpalethorpe@suse.com>
Signed-off-by: Richard Palethorpe <rpalethorpe@suse.com>
Reviewed-by: Cyril Hrubis <chrubis@suse.cz>
---
testcases/kernel/mem/cpuset/cpuset01.c | 34 ++++++++++++--------------
testcases/kernel/mem/include/mem.h | 2 +-
testcases/kernel/mem/ksm/ksm02.c | 14 ++++++++---
testcases/kernel/mem/ksm/ksm03.c | 12 ++++++---
testcases/kernel/mem/ksm/ksm04.c | 17 +++++++------
testcases/kernel/mem/lib/mem.c | 10 +++-----
testcases/kernel/mem/oom/oom03.c | 18 ++++++++------
testcases/kernel/mem/oom/oom04.c | 19 ++++++++------
testcases/kernel/mem/oom/oom05.c | 32 ++++++++++++++----------
9 files changed, 88 insertions(+), 70 deletions(-)
diff --git a/testcases/kernel/mem/cpuset/cpuset01.c b/testcases/kernel/mem/cpuset/cpuset01.c
index 528c3eddd..66c18f6ab 100644
--- a/testcases/kernel/mem/cpuset/cpuset01.c
+++ b/testcases/kernel/mem/cpuset/cpuset01.c
@@ -35,6 +35,8 @@
#ifdef HAVE_NUMA_V2
+static const struct tst_cgroup_group *cg;
+
volatile int end;
static int *nodes;
static int nnodes;
@@ -47,15 +49,14 @@ static long count_cpu(void);
static void test_cpuset(void)
{
- int child, i, status;
+ int child, i;
unsigned long nmask[MAXNODES / BITS_PER_LONG] = { 0 };
- char mems[BUFSIZ], buf[BUFSIZ];
+ char buf[BUFSIZ];
- tst_cgroup_cpuset_read_files(PATH_TMP_CG_CST, "cpus", buf, BUFSIZ);
- tst_cgroup_cpuset_write_files(PATH_TMP_CG_CST, "cpus", buf);
- tst_cgroup_cpuset_read_files(PATH_TMP_CG_CST, "mems", mems, BUFSIZ);
- tst_cgroup_cpuset_write_files(PATH_TMP_CG_CST, "mems", mems);
- tst_cgroup_move_current(PATH_TMP_CG_CST);
+ SAFE_CGROUP_READ(cg, "cpuset.cpus", buf, sizeof(buf));
+ SAFE_CGROUP_PRINT(cg, "cpuset.cpus", buf);
+ SAFE_CGROUP_READ(cg, "cpuset.mems", buf, sizeof(buf));
+ SAFE_CGROUP_PRINT(cg, "cpuset.mems", buf);
child = SAFE_FORK();
if (child == 0) {
@@ -69,33 +70,30 @@ static void test_cpuset(void)
exit(mem_hog_cpuset(ncpus > 1 ? ncpus : 1));
}
- snprintf(buf, BUFSIZ, "%d", nodes[0]);
- tst_cgroup_cpuset_write_files(PATH_TMP_CG_CST, "mems", buf);
- snprintf(buf, BUFSIZ, "%d", nodes[1]);
- tst_cgroup_cpuset_write_files(PATH_TMP_CG_CST, "mems", buf);
+ SAFE_CGROUP_PRINTF(cg, "cpuset.mems", "%d", nodes[0]);
+ SAFE_CGROUP_PRINTF(cg, "cpuset.mems", "%d", nodes[1]);
- SAFE_WAITPID(child, &status, WUNTRACED | WCONTINUED);
- if (WEXITSTATUS(status) != 0) {
- tst_res(TFAIL, "child exit status is %d", WEXITSTATUS(status));
- return;
- }
+ tst_reap_children();
tst_res(TPASS, "cpuset test pass");
}
static void setup(void)
{
- tst_cgroup_mount(TST_CGROUP_CPUSET, PATH_TMP_CG_CST);
+ tst_cgroup_require("cpuset", NULL);
ncpus = count_cpu();
if (get_allowed_nodes_arr(NH_MEMS | NH_CPUS, &nnodes, &nodes) < 0)
tst_brk(TBROK | TERRNO, "get_allowed_nodes_arr");
if (nnodes <= 1)
tst_brk(TCONF, "requires a NUMA system.");
+
+ cg = tst_cgroup_get_test_group();
+ SAFE_CGROUP_PRINTF(cg, "cgroup.procs", "%d", getpid());
}
static void cleanup(void)
{
- tst_cgroup_umount(PATH_TMP_CG_CST);
+ tst_cgroup_cleanup();
}
static void sighandler(int signo LTP_ATTRIBUTE_UNUSED)
diff --git a/testcases/kernel/mem/include/mem.h b/testcases/kernel/mem/include/mem.h
index 42b12a230..10712cf0c 100644
--- a/testcases/kernel/mem/include/mem.h
+++ b/testcases/kernel/mem/include/mem.h
@@ -61,7 +61,7 @@ void check_hugepage(void);
void write_memcg(void);
/* cpuset/memcg - include/tst_cgroup.h */
-void write_cpusets(const char *cgroup_dir, long nd);
+void write_cpusets(const struct tst_cgroup_group *cg, long nd);
/* shared */
unsigned int get_a_numa_node(void);
diff --git a/testcases/kernel/mem/ksm/ksm02.c b/testcases/kernel/mem/ksm/ksm02.c
index 51f5d4cca..80017df66 100644
--- a/testcases/kernel/mem/ksm/ksm02.c
+++ b/testcases/kernel/mem/ksm/ksm02.c
@@ -59,6 +59,9 @@
#ifdef HAVE_NUMA_V2
#include <numaif.h>
+static const struct tst_cgroup_group *cg;
+static const struct tst_cgroup_group *cg_drain;
+
static void verify_ksm(void)
{
unsigned long nmask[MAXNODES / BITS_PER_LONG] = { 0 };
@@ -76,9 +79,10 @@ static void verify_ksm(void)
}
create_same_memory(size, num, unit);
- write_cpusets(PATH_TMP_CG_CST, node);
- tst_cgroup_move_current(PATH_TMP_CG_CST);
+ write_cpusets(cg, node);
+ SAFE_CGROUP_PRINTF(cg, "cgroup.procs", "%d", getpid());
create_same_memory(size, num, unit);
+ SAFE_CGROUP_PRINTF(cg_drain, "cgroup.procs", "%d", getpid());
}
static void cleanup(void)
@@ -87,7 +91,7 @@ static void cleanup(void)
FILE_PRINTF(PATH_KSM "merge_across_nodes",
"%d", merge_across_nodes);
- tst_cgroup_umount(PATH_TMP_CG_CST);
+ tst_cgroup_cleanup();
}
static void setup(void)
@@ -103,7 +107,9 @@ static void setup(void)
SAFE_FILE_PRINTF(PATH_KSM "merge_across_nodes", "1");
}
- tst_cgroup_mount(TST_CGROUP_CPUSET, PATH_TMP_CG_CST);
+ tst_cgroup_require("cpuset", NULL);
+ cg = tst_cgroup_get_test_group();
+ cg_drain = tst_cgroup_get_drain_group();
}
static struct tst_test test = {
diff --git a/testcases/kernel/mem/ksm/ksm03.c b/testcases/kernel/mem/ksm/ksm03.c
index e9949280e..83b821c81 100644
--- a/testcases/kernel/mem/ksm/ksm03.c
+++ b/testcases/kernel/mem/ksm/ksm03.c
@@ -59,10 +59,10 @@
#include "mem.h"
#include "ksm_common.h"
+static const struct tst_cgroup_group *cg;
+
static void verify_ksm(void)
{
- tst_cgroup_move_current(PATH_TMP_CG_MEM);
- tst_cgroup_mem_set_maxbytes(PATH_TMP_CG_MEM, TESTMEM);
create_same_memory(size, num, unit);
}
@@ -78,7 +78,11 @@ static void setup(void)
}
parse_ksm_options(opt_sizestr, &size, opt_numstr, &num, opt_unitstr, &unit);
- tst_cgroup_mount(TST_CGROUP_MEMCG, PATH_TMP_CG_MEM);
+
+ tst_cgroup_require("memory", NULL);
+ cg = tst_cgroup_get_test_group();
+ SAFE_CGROUP_PRINTF(cg, "cgroup.procs", "%d", getpid());
+ SAFE_CGROUP_PRINTF(cg, "memory.max", "%lu", TESTMEM);
}
static void cleanup(void)
@@ -86,7 +90,7 @@ static void cleanup(void)
if (access(PATH_KSM "merge_across_nodes", F_OK) == 0)
FILE_PRINTF(PATH_KSM "merge_across_nodes",
"%d", merge_across_nodes);
- tst_cgroup_umount(PATH_TMP_CG_MEM);
+ tst_cgroup_cleanup();
}
static struct tst_test test = {
diff --git a/testcases/kernel/mem/ksm/ksm04.c b/testcases/kernel/mem/ksm/ksm04.c
index b4ad41831..65f7e6510 100644
--- a/testcases/kernel/mem/ksm/ksm04.c
+++ b/testcases/kernel/mem/ksm/ksm04.c
@@ -59,6 +59,8 @@
#ifdef HAVE_NUMA_V2
#include <numaif.h>
+static const struct tst_cgroup_group *cg;
+
static void verify_ksm(void)
{
unsigned long nmask[MAXNODES / BITS_PER_LONG] = { 0 };
@@ -67,8 +69,7 @@ static void verify_ksm(void)
node = get_a_numa_node();
set_node(nmask, node);
- tst_cgroup_move_current(PATH_TMP_CG_MEM);
- tst_cgroup_mem_set_maxbytes(PATH_TMP_CG_MEM, TESTMEM);
+ SAFE_CGROUP_PRINTF(cg, "memory.max", "%lu", TESTMEM);
if (set_mempolicy(MPOL_BIND, nmask, MAXNODES) == -1) {
if (errno != ENOSYS)
@@ -79,8 +80,7 @@ static void verify_ksm(void)
}
create_same_memory(size, num, unit);
- write_cpusets(PATH_TMP_CG_CST, node);
- tst_cgroup_move_current(PATH_TMP_CG_CST);
+ write_cpusets(cg, node);
create_same_memory(size, num, unit);
}
@@ -90,8 +90,7 @@ static void cleanup(void)
FILE_PRINTF(PATH_KSM "merge_across_nodes",
"%d", merge_across_nodes);
- tst_cgroup_umount(PATH_TMP_CG_MEM);
- tst_cgroup_umount(PATH_TMP_CG_CST);
+ tst_cgroup_cleanup();
}
static void setup(void)
@@ -107,8 +106,10 @@ static void setup(void)
parse_ksm_options(opt_sizestr, &size, opt_numstr, &num, opt_unitstr, &unit);
- tst_cgroup_mount(TST_CGROUP_MEMCG, PATH_TMP_CG_MEM);
- tst_cgroup_mount(TST_CGROUP_CPUSET, PATH_TMP_CG_CST);
+ tst_cgroup_require("memory", NULL);
+ tst_cgroup_require("cpuset", NULL);
+ cg = tst_cgroup_get_test_group();
+ SAFE_CGROUP_PRINTF(cg, "cgroup.procs", "%d", getpid());
}
static struct tst_test test = {
diff --git a/testcases/kernel/mem/lib/mem.c b/testcases/kernel/mem/lib/mem.c
index 2de3f83a6..9f946b5c9 100644
--- a/testcases/kernel/mem/lib/mem.c
+++ b/testcases/kernel/mem/lib/mem.c
@@ -629,13 +629,11 @@ static void gather_node_cpus(char *cpus, long nd)
cpus[strlen(cpus) - 1] = '\0';
}
-void write_cpusets(const char *cgroup_dir, long nd)
+void write_cpusets(const struct tst_cgroup_group *cg, long nd)
{
- char buf[BUFSIZ];
char cpus[BUFSIZ] = "";
- snprintf(buf, BUFSIZ, "%ld", nd);
- tst_cgroup_cpuset_write_files(cgroup_dir, "mems", buf);
+ SAFE_CGROUP_PRINTF(cg, "cpuset.mems", "%ld", nd);
gather_node_cpus(cpus, nd);
/*
@@ -644,11 +642,11 @@ void write_cpusets(const char *cgroup_dir, long nd)
* the value of cpuset.cpus.
*/
if (strlen(cpus) != 0) {
- tst_cgroup_cpuset_write_files(cgroup_dir, "cpus", cpus);
+ SAFE_CGROUP_PRINT(cg, "cpuset.cpus", cpus);
} else {
tst_res(TINFO, "No CPUs in the node%ld; "
"using only CPU0", nd);
- tst_cgroup_cpuset_write_files(cgroup_dir, "cpus", "0");
+ SAFE_CGROUP_PRINT(cg, "cpuset.cpus", "0");
}
}
diff --git a/testcases/kernel/mem/oom/oom03.c b/testcases/kernel/mem/oom/oom03.c
index fc860c660..939413744 100644
--- a/testcases/kernel/mem/oom/oom03.c
+++ b/testcases/kernel/mem/oom/oom03.c
@@ -36,19 +36,17 @@
#ifdef HAVE_NUMA_V2
+static const struct tst_cgroup_group *cg;
+
static void verify_oom(void)
{
#ifdef TST_ABI32
tst_brk(TCONF, "test is not designed for 32-bit system.");
#endif
-
- tst_cgroup_move_current(PATH_TMP_CG_MEM);
- tst_cgroup_mem_set_maxbytes(PATH_TMP_CG_MEM, TESTMEM);
-
testoom(0, 0, ENOMEM, 1);
- if (tst_cgroup_mem_swapacct_enabled(PATH_TMP_CG_MEM)) {
- tst_cgroup_mem_set_maxswap(PATH_TMP_CG_MEM, TESTMEM);
+ if (SAFE_CGROUP_HAS(cg, "memory.swap.max")) {
+ SAFE_CGROUP_PRINTF(cg, "memory.swap.max", "%lu", TESTMEM);
testoom(0, 1, ENOMEM, 1);
}
@@ -65,14 +63,18 @@ static void setup(void)
{
overcommit = get_sys_tune("overcommit_memory");
set_sys_tune("overcommit_memory", 1, 1);
- tst_cgroup_mount(TST_CGROUP_MEMCG, PATH_TMP_CG_MEM);
+
+ tst_cgroup_require("memory", NULL);
+ cg = tst_cgroup_get_test_group();
+ SAFE_CGROUP_PRINTF(cg, "cgroup.procs", "%d", getpid());
+ SAFE_CGROUP_PRINTF(cg, "memory.max", "%lu", TESTMEM);
}
static void cleanup(void)
{
if (overcommit != -1)
set_sys_tune("overcommit_memory", overcommit, 0);
- tst_cgroup_umount(PATH_TMP_CG_MEM);
+ tst_cgroup_cleanup();
}
static struct tst_test test = {
diff --git a/testcases/kernel/mem/oom/oom04.c b/testcases/kernel/mem/oom/oom04.c
index 582663275..f84328f5b 100644
--- a/testcases/kernel/mem/oom/oom04.c
+++ b/testcases/kernel/mem/oom/oom04.c
@@ -36,24 +36,25 @@
#ifdef HAVE_NUMA_V2
+static const struct tst_cgroup_group *cg;
+
static void verify_oom(void)
{
#ifdef TST_ABI32
tst_brk(TCONF, "test is not designed for 32-bit system.");
#endif
-
- tst_cgroup_move_current(PATH_TMP_CG_CST);
-
tst_res(TINFO, "OOM on CPUSET...");
testoom(0, 0, ENOMEM, 1);
- if (is_numa(NULL, NH_MEMS, 2)) {
+ if (is_numa(NULL, NH_MEMS, 2) &&
+ SAFE_CGROUP_HAS(cg, "cpuset.memory_migrate")) {
/*
* Under NUMA system, the migration of cpuset's memory
* is in charge of cpuset.memory_migrate, we can write
* 1 to cpuset.memory_migrate to enable the migration.
*/
- tst_cgroup_cpuset_write_files(PATH_TMP_CG_CST, "memory_migrate", "1");
+ SAFE_CGROUP_PRINT(cg, "cpuset.memory_migrate", "1");
+
tst_res(TINFO, "OOM on CPUSET with mem migrate:");
testoom(0, 0, ENOMEM, 1);
}
@@ -69,7 +70,8 @@ static void setup(void)
overcommit = get_sys_tune("overcommit_memory");
set_sys_tune("overcommit_memory", 1, 1);
- tst_cgroup_mount(TST_CGROUP_CPUSET, PATH_TMP_CG_CST);
+ tst_cgroup_require("cpuset", NULL);
+ cg = tst_cgroup_get_test_group();
/*
* Some nodes do not contain memory, so use
@@ -81,14 +83,15 @@ static void setup(void)
if (ret < 0)
tst_brk(TBROK, "Failed to get a memory node "
"using get_allowed_nodes()");
- write_cpusets(PATH_TMP_CG_CST, memnode);
+ write_cpusets(cg, memnode);
+ SAFE_CGROUP_PRINTF(cg, "cgroup.procs", "%d", getpid());
}
static void cleanup(void)
{
if (overcommit != -1)
set_sys_tune("overcommit_memory", overcommit, 0);
- tst_cgroup_umount(PATH_TMP_CG_CST);
+ tst_cgroup_cleanup();
}
static struct tst_test test = {
diff --git a/testcases/kernel/mem/oom/oom05.c b/testcases/kernel/mem/oom/oom05.c
index 871f302e3..9c9bba7f6 100644
--- a/testcases/kernel/mem/oom/oom05.c
+++ b/testcases/kernel/mem/oom/oom05.c
@@ -36,6 +36,8 @@
#ifdef HAVE_NUMA_V2
+static const struct tst_cgroup_group *cg;
+
static void verify_oom(void)
{
#ifdef TST_ABI32
@@ -43,9 +45,6 @@ static void verify_oom(void)
#endif
tst_res(TINFO, "OOM on CPUSET & MEMCG...");
- tst_cgroup_move_current(PATH_TMP_CG_MEM);
- tst_cgroup_move_current(PATH_TMP_CG_CST);
- tst_cgroup_mem_set_maxbytes(PATH_TMP_CG_MEM, TESTMEM);
testoom(0, 0, ENOMEM, 1);
/*
@@ -53,22 +52,26 @@ static void verify_oom(void)
* is in charge of cpuset.memory_migrate, we can write
* 1 to cpuset.memory_migrate to enable the migration.
*/
- if (is_numa(NULL, NH_MEMS, 2)) {
- tst_cgroup_cpuset_write_files(PATH_TMP_CG_CST, "memory_migrate", "1");
+ if (is_numa(NULL, NH_MEMS, 2) &&
+ SAFE_CGROUP_HAS(cg, "cpuset.memory_migrate")) {
+ SAFE_CGROUP_PRINT(cg, "cpuset.memory_migrate", "1");
tst_res(TINFO, "OOM on CPUSET & MEMCG with "
"cpuset.memory_migrate=1");
testoom(0, 0, ENOMEM, 1);
}
- if (tst_cgroup_mem_swapacct_enabled(PATH_TMP_CG_MEM)) {
+ if (SAFE_CGROUP_HAS(cg, "memory.swap.max")) {
tst_res(TINFO, "OOM on CPUSET & MEMCG with "
"special memswap limitation:");
- tst_cgroup_mem_set_maxswap(PATH_TMP_CG_MEM, TESTMEM);
+ SAFE_CGROUP_PRINTF(cg, "memory.swap.max", "%lu", TESTMEM);
testoom(0, 0, ENOMEM, 1);
tst_res(TINFO, "OOM on CPUSET & MEMCG with "
"disabled memswap limitation:");
- tst_cgroup_mem_set_maxswap(PATH_TMP_CG_MEM, -1);
+ if (TST_CGROUP_VER(cg, "memory") == TST_CGROUP_V1)
+ SAFE_CGROUP_PRINTF(cg, "memory.swap.max", "%lu", ~0UL);
+ else
+ SAFE_CGROUP_PRINT(cg, "memory.swap.max", "max");
testoom(0, 0, ENOMEM, 1);
}
}
@@ -83,8 +86,9 @@ void setup(void)
overcommit = get_sys_tune("overcommit_memory");
set_sys_tune("overcommit_memory", 1, 1);
- tst_cgroup_mount(TST_CGROUP_MEMCG, PATH_TMP_CG_MEM);
- tst_cgroup_mount(TST_CGROUP_CPUSET, PATH_TMP_CG_CST);
+ tst_cgroup_require("memory", NULL);
+ tst_cgroup_require("cpuset", NULL);
+ cg = tst_cgroup_get_test_group();
/*
* Some nodes do not contain memory, so use
@@ -96,15 +100,17 @@ void setup(void)
if (ret < 0)
tst_brk(TBROK, "Failed to get a memory node "
"using get_allowed_nodes()");
- write_cpusets(PATH_TMP_CG_CST, memnode);
+
+ write_cpusets(cg, memnode);
+ SAFE_CGROUP_PRINTF(cg, "cgroup.procs", "%d", getpid());
+ SAFE_CGROUP_PRINTF(cg, "memory.max", "%lu", TESTMEM);
}
void cleanup(void)
{
if (overcommit != -1)
set_sys_tune("overcommit_memory", overcommit, 0);
- tst_cgroup_umount(PATH_TMP_CG_MEM);
- tst_cgroup_umount(PATH_TMP_CG_CST);
+ tst_cgroup_cleanup();
}
static struct tst_test test = {
--
2.31.1
next prev parent reply other threads:[~2021-05-04 13:40 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-04 13:40 [LTP] [PATCH v6 0/7] CGroup API rewrite Richard Palethorpe
2021-05-04 13:40 ` [LTP] [PATCH v6 1/7] API: Add safe openat, printfat, readat and unlinkat Richard Palethorpe
2021-05-04 13:40 ` [LTP] [PATCH v6 2/7] API: Make tst_count_scanf_conversions public Richard Palethorpe
2021-05-04 13:40 ` [LTP] [PATCH v6 3/7] Add new CGroups APIs Richard Palethorpe
2021-05-06 7:56 ` Li Wang
2021-05-06 8:06 ` Richard Palethorpe
2021-05-06 8:44 ` Cyril Hrubis
2021-05-04 13:40 ` [LTP] [PATCH v6 4/7] Add new CGroups API library tests Richard Palethorpe
2021-05-04 13:40 ` [LTP] [PATCH v6 5/7] docs: Update CGroups API Richard Palethorpe
2021-05-04 13:40 ` Richard Palethorpe [this message]
2021-05-04 13:41 ` [LTP] [PATCH v6 7/7] madvise06: Convert to new " Richard Palethorpe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210504134100.20666-7-rpalethorpe@suse.com \
--to=rpalethorpe@suse.com \
--cc=ltp@lists.linux.it \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.