From: Li Wang <liwang@redhat.com>
To: ltp@lists.linux.it
Subject: [LTP] [PATCH v1 2/4] mem: take use of new cgroup API
Date: Wed, 27 May 2020 11:14:28 +0800 [thread overview]
Message-ID: <20200527031430.22144-2-liwang@redhat.com> (raw)
In-Reply-To: <20200527031430.22144-1-liwang@redhat.com>
For issue #611:
https://github.com/linux-test-project/ltp/issues/611
Signed-off-by: Li Wang <liwang@redhat.com>
---
testcases/kernel/mem/cpuset/cpuset01.c | 19 ++++++++++---------
testcases/kernel/mem/include/mem.h | 1 +
testcases/kernel/mem/ksm/ksm02.c | 6 ++----
testcases/kernel/mem/ksm/ksm03.c | 11 +++--------
testcases/kernel/mem/ksm/ksm04.c | 14 +++++---------
testcases/kernel/mem/lib/mem.c | 8 ++++----
testcases/kernel/mem/oom/oom03.c | 17 +++++++----------
testcases/kernel/mem/oom/oom04.c | 10 +++-------
testcases/kernel/mem/oom/oom05.c | 26 ++++++++++----------------
9 files changed, 45 insertions(+), 67 deletions(-)
diff --git a/testcases/kernel/mem/cpuset/cpuset01.c b/testcases/kernel/mem/cpuset/cpuset01.c
index 853f7fe55..cecc4ba86 100644
--- a/testcases/kernel/mem/cpuset/cpuset01.c
+++ b/testcases/kernel/mem/cpuset/cpuset01.c
@@ -51,11 +51,11 @@ static void test_cpuset(void)
unsigned long nmask[MAXNODES / BITS_PER_LONG] = { 0 };
char mems[BUFSIZ], buf[BUFSIZ];
- read_cpuset_files(CPATH, "cpus", buf);
- write_cpuset_files(CPATH_NEW, "cpus", buf);
- read_cpuset_files(CPATH, "mems", mems);
- write_cpuset_files(CPATH_NEW, "mems", mems);
- SAFE_FILE_PRINTF(CPATH_NEW "/tasks", "%d", getpid());
+ read_cpuset_files(PATH_TMP_CG1_CST, "cpus", buf);
+ write_cpuset_files(PATH_CG1_CST_LTP, "cpus", buf);
+ read_cpuset_files(PATH_TMP_CG1_CST, "mems", mems);
+ write_cpuset_files(PATH_CG1_CST_LTP, "mems", mems);
+ tst_cgroup_move_current(TST_CGROUP_CPUSET);
child = SAFE_FORK();
if (child == 0) {
@@ -70,9 +70,9 @@ static void test_cpuset(void)
}
snprintf(buf, BUFSIZ, "%d", nodes[0]);
- write_cpuset_files(CPATH_NEW, "mems", buf);
+ write_cpuset_files(PATH_CG1_CST_LTP, "mems", buf);
snprintf(buf, BUFSIZ, "%d", nodes[1]);
- write_cpuset_files(CPATH_NEW, "mems", buf);
+ write_cpuset_files(PATH_CG1_CST_LTP, "mems", buf);
SAFE_WAITPID(child, &status, WUNTRACED | WCONTINUED);
if (WEXITSTATUS(status) != 0) {
@@ -85,7 +85,7 @@ static void test_cpuset(void)
static void setup(void)
{
- mount_mem("cpuset", "cpuset", NULL, CPATH, CPATH_NEW);
+ tst_cgroup_mount(TST_CGROUP_CPUSET);
ncpus = count_cpu();
if (get_allowed_nodes_arr(NH_MEMS | NH_CPUS, &nnodes, &nodes) < 0)
tst_brk(TBROK | TERRNO, "get_allowed_nodes_arr");
@@ -95,7 +95,7 @@ static void setup(void)
static void cleanup(void)
{
- umount_mem(CPATH, CPATH_NEW);
+ tst_cgroup_umount(TST_CGROUP_CPUSET);
}
static void sighandler(int signo LTP_ATTRIBUTE_UNUSED)
@@ -183,6 +183,7 @@ static long count_cpu(void)
static struct tst_test test = {
.needs_root = 1,
+ .forks_child = 1,
.setup = setup,
.cleanup = cleanup,
.test_all = test_cpuset,
diff --git a/testcases/kernel/mem/include/mem.h b/testcases/kernel/mem/include/mem.h
index cce9c0497..f553651c2 100644
--- a/testcases/kernel/mem/include/mem.h
+++ b/testcases/kernel/mem/include/mem.h
@@ -2,6 +2,7 @@
#define _MEM_H
#include "config.h"
#include "tst_test.h"
+#include "tst_cgroup.h"
#include "ksm_helper.h"
#if defined(__powerpc__) || defined(__powerpc64__)
diff --git a/testcases/kernel/mem/ksm/ksm02.c b/testcases/kernel/mem/ksm/ksm02.c
index 3d4c19deb..9f8b782cf 100644
--- a/testcases/kernel/mem/ksm/ksm02.c
+++ b/testcases/kernel/mem/ksm/ksm02.c
@@ -88,8 +88,7 @@ static void cleanup(void)
FILE_PRINTF(PATH_KSM "merge_across_nodes",
"%d", merge_across_nodes);
- if (cpuset_mounted)
- umount_mem(CPATH, CPATH_NEW);
+ tst_cgroup_umount(TST_CGROUP_CPUSET);
}
static void setup(void)
@@ -105,8 +104,7 @@ static void setup(void)
SAFE_FILE_PRINTF(PATH_KSM "merge_across_nodes", "1");
}
- mount_mem("cpuset", "cpuset", NULL, CPATH, CPATH_NEW);
- cpuset_mounted = 1;
+ tst_cgroup_mount(TST_CGROUP_CPUSET);
}
static struct tst_test test = {
diff --git a/testcases/kernel/mem/ksm/ksm03.c b/testcases/kernel/mem/ksm/ksm03.c
index 0e5131654..c2c8ab529 100644
--- a/testcases/kernel/mem/ksm/ksm03.c
+++ b/testcases/kernel/mem/ksm/ksm03.c
@@ -59,11 +59,9 @@
#include "mem.h"
#include "ksm_common.h"
-static int memcg_mounted;
-
static void verify_ksm(void)
{
- write_memcg();
+ tst_cgroup_mem_set_maxbytes(TESTMEM);
create_same_memory(size, num, unit);
}
@@ -79,8 +77,7 @@ static void setup(void)
}
parse_ksm_options(opt_sizestr, &size, opt_numstr, &num, opt_unitstr, &unit);
- mount_mem("memcg", "cgroup", "memory", MEMCG_PATH, MEMCG_PATH_NEW);
- memcg_mounted = 1;
+ tst_cgroup_mount(TST_CGROUP_MEMCG);
}
static void cleanup(void)
@@ -88,9 +85,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);
-
- if (memcg_mounted)
- umount_mem(MEMCG_PATH, MEMCG_PATH_NEW);
+ tst_cgroup_umount(TST_CGROUP_MEMCG);
}
static struct tst_test test = {
diff --git a/testcases/kernel/mem/ksm/ksm04.c b/testcases/kernel/mem/ksm/ksm04.c
index e393dbd40..6dc36b35a 100644
--- a/testcases/kernel/mem/ksm/ksm04.c
+++ b/testcases/kernel/mem/ksm/ksm04.c
@@ -70,7 +70,7 @@ static void verify_ksm(void)
node = get_a_numa_node();
set_node(nmask, node);
- write_memcg();
+ tst_cgroup_mem_set_maxbytes(TESTMEM);
if (set_mempolicy(MPOL_BIND, nmask, MAXNODES) == -1) {
if (errno != ENOSYS)
@@ -91,10 +91,8 @@ static void cleanup(void)
FILE_PRINTF(PATH_KSM "merge_across_nodes",
"%d", merge_across_nodes);
- if (cpuset_mounted)
- umount_mem(CPATH, CPATH_NEW);
- if (memcg_mounted)
- umount_mem(MEMCG_PATH, MEMCG_PATH_NEW);
+ tst_cgroup_umount(TST_CGROUP_CPUSET);
+ tst_cgroup_umount(TST_CGROUP_MEMCG);
}
static void setup(void)
@@ -110,10 +108,8 @@ static void setup(void)
parse_ksm_options(opt_sizestr, &size, opt_numstr, &num, opt_unitstr, &unit);
- mount_mem("cpuset", "cpuset", NULL, CPATH, CPATH_NEW);
- cpuset_mounted = 1;
- mount_mem("memcg", "cgroup", "memory", MEMCG_PATH, MEMCG_PATH_NEW);
- memcg_mounted = 1;
+ tst_cgroup_mount(TST_CGROUP_MEMCG);
+ tst_cgroup_mount(TST_CGROUP_CPUSET);
}
static struct tst_test test = {
diff --git a/testcases/kernel/mem/lib/mem.c b/testcases/kernel/mem/lib/mem.c
index eca4c61c8..df1baa42a 100644
--- a/testcases/kernel/mem/lib/mem.c
+++ b/testcases/kernel/mem/lib/mem.c
@@ -692,7 +692,7 @@ void write_cpusets(long nd)
char cpus[BUFSIZ] = "";
snprintf(buf, BUFSIZ, "%ld", nd);
- write_cpuset_files(CPATH_NEW, "mems", buf);
+ write_cpuset_files(PATH_CG1_CST_LTP, "mems", buf);
gather_node_cpus(cpus, nd);
/*
@@ -701,14 +701,14 @@ void write_cpusets(long nd)
* the value of cpuset.cpus.
*/
if (strlen(cpus) != 0) {
- write_cpuset_files(CPATH_NEW, "cpus", cpus);
+ write_cpuset_files(PATH_CG1_CST_LTP, "cpus", cpus);
} else {
tst_res(TINFO, "No CPUs in the node%ld; "
"using only CPU0", nd);
- write_cpuset_files(CPATH_NEW, "cpus", "0");
+ write_cpuset_files(PATH_CG1_CST_LTP, "cpus", "0");
}
- SAFE_FILE_PRINTF(CPATH_NEW "/tasks", "%d", getpid());
+ SAFE_FILE_PRINTF(PATH_CG1_CST_LTP "/tasks", "%d", getpid());
}
void umount_mem(char *path, char *path_new)
diff --git a/testcases/kernel/mem/oom/oom03.c b/testcases/kernel/mem/oom/oom03.c
index ce0b34c31..af3a565ce 100644
--- a/testcases/kernel/mem/oom/oom03.c
+++ b/testcases/kernel/mem/oom/oom03.c
@@ -36,27 +36,26 @@
#ifdef HAVE_NUMA_V2
-static int memcg_mounted;
-
static void verify_oom(void)
{
#ifdef TST_ABI32
tst_brk(TCONF, "test is not designed for 32-bit system.");
#endif
- SAFE_FILE_PRINTF(MEMCG_PATH_NEW "/tasks", "%d", getpid());
- SAFE_FILE_PRINTF(MEMCG_LIMIT, "%ld", TESTMEM);
+ tst_cgroup_mem_set_maxbytes(TESTMEM);
testoom(0, 0, ENOMEM, 1);
- if (access(MEMCG_SW_LIMIT, F_OK) == -1) {
+ if ((access(PATH_MEMORY_SW_LIMIT, F_OK) == -1) ||
+ (access(PATH_MEMORY_SW_MAX, F_OK) == -1)) {
if (errno == ENOENT)
tst_res(TCONF,
"memcg swap accounting is disabled");
else
tst_brk(TBROK | TERRNO, "access");
} else {
- SAFE_FILE_PRINTF(MEMCG_SW_LIMIT, "%ld", TESTMEM);
+ tst_cgroup_mem_set_maxswap(TESTMEM);
+
testoom(0, 1, ENOMEM, 1);
}
@@ -73,16 +72,14 @@ static void setup(void)
{
overcommit = get_sys_tune("overcommit_memory");
set_sys_tune("overcommit_memory", 1, 1);
- mount_mem("memcg", "cgroup", "memory", MEMCG_PATH, MEMCG_PATH_NEW);
- memcg_mounted = 1;
+ tst_cgroup_mount(TST_CGROUP_MEMCG);
}
static void cleanup(void)
{
if (overcommit != -1)
set_sys_tune("overcommit_memory", overcommit, 0);
- if (memcg_mounted)
- umount_mem(MEMCG_PATH, MEMCG_PATH_NEW);
+ tst_cgroup_umount(TST_CGROUP_MEMCG);
}
static struct tst_test test = {
diff --git a/testcases/kernel/mem/oom/oom04.c b/testcases/kernel/mem/oom/oom04.c
index 7185ef973..553e6fc0a 100644
--- a/testcases/kernel/mem/oom/oom04.c
+++ b/testcases/kernel/mem/oom/oom04.c
@@ -36,8 +36,6 @@
#ifdef HAVE_NUMA_V2
-static int cpuset_mounted;
-
static void verify_oom(void)
{
#ifdef TST_ABI32
@@ -53,7 +51,7 @@ static void verify_oom(void)
* is in charge of cpuset.memory_migrate, we can write
* 1 to cpuset.memory_migrate to enable the migration.
*/
- write_cpuset_files(CPATH_NEW, "memory_migrate", "1");
+ write_cpuset_files(PATH_CG1_CST_LTP, "memory_migrate", "1");
tst_res(TINFO, "OOM on CPUSET with mem migrate:");
testoom(0, 0, ENOMEM, 1);
}
@@ -69,8 +67,7 @@ static void setup(void)
overcommit = get_sys_tune("overcommit_memory");
set_sys_tune("overcommit_memory", 1, 1);
- mount_mem("cpuset", "cpuset", NULL, CPATH, CPATH_NEW);
- cpuset_mounted = 1;
+ tst_cgroup_mount(TST_CGROUP_CPUSET);
/*
* Some nodes do not contain memory, so use
@@ -89,8 +86,7 @@ static void cleanup(void)
{
if (overcommit != -1)
set_sys_tune("overcommit_memory", overcommit, 0);
- if (cpuset_mounted)
- umount_mem(CPATH, CPATH_NEW);
+ tst_cgroup_umount(TST_CGROUP_CPUSET);
}
static struct tst_test test = {
diff --git a/testcases/kernel/mem/oom/oom05.c b/testcases/kernel/mem/oom/oom05.c
index db24df6de..7a33edef2 100644
--- a/testcases/kernel/mem/oom/oom05.c
+++ b/testcases/kernel/mem/oom/oom05.c
@@ -36,9 +36,6 @@
#ifdef HAVE_NUMA_V2
-static int memcg_mounted;
-static int cpuset_mounted;
-
static void verify_oom(void)
{
int swap_acc_on = 1;
@@ -48,6 +45,7 @@ static void verify_oom(void)
#endif
tst_res(TINFO, "OOM on CPUSET & MEMCG...");
+ tst_cgroup_mem_set_maxbytes(TESTMEM);
testoom(0, 0, ENOMEM, 1);
/*
@@ -56,13 +54,14 @@ static void verify_oom(void)
* 1 to cpuset.memory_migrate to enable the migration.
*/
if (is_numa(NULL, NH_MEMS, 2)) {
- write_cpuset_files(CPATH_NEW, "memory_migrate", "1");
+ write_cpuset_files(PATH_CG1_CST_LTP, "memory_migrate", "1");
tst_res(TINFO, "OOM on CPUSET & MEMCG with "
"cpuset.memory_migrate=1");
testoom(0, 0, ENOMEM, 1);
}
- if (access(MEMCG_SW_LIMIT, F_OK) == -1) {
+ if ((access(PATH_MEMORY_SW_LIMIT, F_OK) == -1) ||
+ (access(PATH_MEMORY_SW_MAX, F_OK) == -1)) {
if (errno == ENOENT) {
tst_res(TCONF, "memcg swap accounting is disabled");
swap_acc_on = 0;
@@ -73,12 +72,12 @@ static void verify_oom(void)
if (swap_acc_on) {
tst_res(TINFO, "OOM on CPUSET & MEMCG with "
"special memswap limitation:");
- SAFE_FILE_PRINTF(MEMCG_SW_LIMIT, "%ld", TESTMEM);
+ tst_cgroup_mem_set_maxswap(TESTMEM);
testoom(0, 0, ENOMEM, 1);
tst_res(TINFO, "OOM on CPUSET & MEMCG with "
"disabled memswap limitation:");
- SAFE_FILE_PRINTF(MEMCG_SW_LIMIT, "-1");
+ tst_cgroup_mem_set_maxswap(-1);
testoom(0, 0, ENOMEM, 1);
}
}
@@ -93,11 +92,8 @@ void setup(void)
overcommit = get_sys_tune("overcommit_memory");
set_sys_tune("overcommit_memory", 1, 1);
- mount_mem("memcg", "cgroup", "memory", MEMCG_PATH, MEMCG_PATH_NEW);
- memcg_mounted = 1;
- mount_mem("cpuset", "cpuset", NULL, CPATH, CPATH_NEW);
- cpuset_mounted = 1;
- write_memcg();
+ tst_cgroup_mount(TST_CGROUP_MEMCG);
+ tst_cgroup_mount(TST_CGROUP_CPUSET);
/*
* Some nodes do not contain memory, so use
@@ -116,10 +112,8 @@ void cleanup(void)
{
if (overcommit != -1)
set_sys_tune("overcommit_memory", overcommit, 0);
- if (cpuset_mounted)
- umount_mem(CPATH, CPATH_NEW);
- if (memcg_mounted)
- umount_mem(MEMCG_PATH, MEMCG_PATH_NEW);
+ tst_cgroup_umount(TST_CGROUP_CPUSET);
+ tst_cgroup_umount(TST_CGROUP_MEMCG);
}
static struct tst_test test = {
--
2.21.1
next prev parent reply other threads:[~2020-05-27 3:14 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-27 3:14 [LTP] [PATCH v1 1/4] lib: add new cgroup test API Li Wang
2020-05-27 3:14 ` Li Wang [this message]
2020-05-27 7:45 ` [LTP] [PATCH v1 2/4] mem: take use of new cgroup API Jan Stancek
2020-05-27 10:10 ` Li Wang
2020-05-27 3:14 ` [LTP] [PATCH v1 3/4] mem: remove the old " Li Wang
2020-05-27 3:14 ` [LTP] [PATCH v1 4/4] mm: add cpuset01 to runtest file Li Wang
2020-05-27 7:40 ` [LTP] [PATCH v1 1/4] lib: add new cgroup test API Jan Stancek
2020-05-27 8:00 ` Li Wang
2020-05-27 9:15 ` Jan Stancek
2020-05-27 7:47 ` Jan Stancek
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=20200527031430.22144-2-liwang@redhat.com \
--to=liwang@redhat.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.