lib: add new cgroup test API
PATCH v3 1/4 lib: add new cgroup test API
Many of our LTP tests need Control Group in the configuration, this patch makes cgroup unified mounting at setup phase to be possible. The method?is extracted from mem.h with the purpose of?extendible for further developing, and trying?to compatible the current two versions of cgroup,
It's hard to make all APIs be strictly consistent because there are many differences between v1 and v2. But it?capsulate the detail of cgroup mounting in high-level functions, which will be easier to use cgroup without considering too much technical thing.? ?
Btw, test get passed on RHEL7(x86_64), RHEL8(ppc64le), Fedora32(x86_64).
---
Notes:
v2 --> v3
* fix mount path macros definition
* use private memory for paths list
* set tst_cgroup_ctl_knob as local variable
doc/test-writing-guidelines.txt | 44 +++++ include/tst_cgroup.h | 36 ++++ include/tst_test.h | 1 + lib/newlib_tests/test21.c | 76 +++++++ lib/tst_cgroup.c | 339 ++++++++++++++++++++++++++++++++ 5 files changed, 496 insertions(+) create mode 100644 include/tst_cgroup.h create mode 100644 lib/newlib_tests/test21.c create mode 100644 lib/tst_cgroup.c
doc/test-writing-guidelines.txt +44 -0
@@ -2053,6 +2053,50 @@ the prefix field of file pointed by path equals to the value passed to this func Also having a similar api pair TST_ASSERT_FILE_INT/STR(path, prefix, val) to assert the field value of file. +2.2.36 Using Control Group +^^^^^^^^^^^^^^^^^^^^^^^^^^ +Some of LTP tests need Control Group in their configuration, tst_cgroup.h provides +APIs to make cgroup unified mounting at setup phase to be possible. The method?is +extracted from mem.h with the purpose of?extendible for further developing, and +trying to compatible the current two versions of cgroup. + +Considering there are many differences between cgroup v1 and v2, here we capsulate +the detail of cgroup mounting in high-level functions, which will be easier to use +cgroup without caring about too much technical thing.? ? + +Also, we do cgroup mount/umount work for the different hierarchy automatically. + +[source,c] +------------------------------------------------------------------------------- +#include "tst_test.h" + +static void run(void) +{ + ... + + tst_cgroup_move_current(PATH_TMP_CG_MEM); + tst_cgroup_mem_set_maxbytes(PATH_TMP_CG_MEM, MEMSIZE); + + // do test under cgroup + ... +} + +static void setup(void) +{ + tst_cgroup_mount(TST_CGROUP_MEMCG, PATH_TMP_CG_MEM); +} + +static void cleanup(void) +{ + tst_cgroup_umount(PATH_TMP_CG_MEM); +} + +struct tst_test test = { + .test_all = run, + ... +}; + +------------------------------------------------------------------------------- 2.3 Writing a testcase in shell ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/tst_cgroup.h new file +36 -0
@@ -0,0 +1,36 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2020 Red Hat, Inc. +* Copyright (c) 2020 Li Wang <[email protected]> +*/ + +#ifndef TST_CGROUP_H +#define TST_CGROUP_H + +#define PATH_TMP_CG_MEM "/tmp/cgroup_mem" +#define PATH_TMP_CG_CST "/tmp/cgroup_cst" + +enum tst_cgroup_ver { +TST_CGROUP_V1 =1 , +TST_CGROUP_V2 =2 , +}; + +enum tst_cgroup_ctrl { +TST_CGROUP_MEMCG =1 , +TST_CGROUP_CPUSET =2 , +/* add cgroup controller */ +}; + +extern char tst_cgroup_mnt_path[PATH_MAX ]; +extern char tst_cgroup_new_path[PATH_MAX ]; + +enum tst_cgroup_ver tst_cgroup_version (void ); +void tst_cgroup_mount (enum tst_cgroup_ctrl ctrl,const char *cgroup_dir); +void tst_cgroup_umount (const char *cgroup_dir); +void tst_cgroup_set_knob (const char *cgroup_dir,const char *knob,long value); +void tst_cgroup_move_current (const char *cgroup_dir); +void tst_cgroup_mem_set_maxbytes (const char *cgroup_dir,long memsz); +int tst_cgroup_mem_swapacct_enabled (const char *cgroup_dir); +void tst_cgroup_mem_set_maxswap (const char *cgroup_dir,long memsz); + +#endif /* TST_CGROUP_H */
include/tst_test.h +1 -0
@@ -39,6 +39,7 @@#include "tst_capability.h" #include "tst_hugepage.h" #include "tst_assert.h" +#include "tst_cgroup.h" /* * Reports testcase result.
lib/newlib_tests/test21.c new file +76 -0
76 lines not on this page · raw message
lib/tst_cgroup.c new file +339 -0
339 lines not on this page · raw message
Signature · 1 line
2.21.1
PATCH v3 2/4 mem: take use of new cgroup API
For issue #611:
https://github.com/linux-test-project/ltp/issues/611
--- testcases/kernel/mem/cpuset/cpuset01.c | 19 +++++++------ testcases/kernel/mem/include/mem.h | 1 + testcases/kernel/mem/ksm/ksm02.c | 10 +++---- testcases/kernel/mem/ksm/ksm03.c | 12 +++----- testcases/kernel/mem/ksm/ksm04.c | 19 +++++-------- testcases/kernel/mem/lib/mem.c | 8 ++---- testcases/kernel/mem/oom/oom03.c | 22 ++++----------- testcases/kernel/mem/oom/oom04.c | 12 ++++---- testcases/kernel/mem/oom/oom05.c | 38 ++++++++------------------ 9 files changed, 52 insertions(+), 89 deletions(-)
testcases/kernel/mem/cpuset/cpuset01.c +10 -9
@@ -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 ()); +tst_cgroup_move_current (PATH_TMP_CG_CST ); +read_cpuset_files (tst_cgroup_mnt_path,"cpus" , buf); +write_cpuset_files (tst_cgroup_new_path,"cpus" , buf); +read_cpuset_files (tst_cgroup_mnt_path,"mems" , mems); +write_cpuset_files (tst_cgroup_new_path,"mems" , mems); 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 (tst_cgroup_new_path,"mems" , buf);snprintf (buf,BUFSIZ ,"%d" , nodes[1 ]); -write_cpuset_files (CPATH_NEW ,"mems" , buf); +write_cpuset_files (tst_cgroup_new_path,"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 ,PATH_TMP_CG_CST ); 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 (PATH_TMP_CG_CST ); } 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,
testcases/kernel/mem/include/mem.h +1 -0
@@ -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__)
testcases/kernel/mem/ksm/ksm02.c +4 -6
@@ -59,13 +59,13 @@#ifdef HAVE_NUMA_V2 #include <numaif.h> -static int cpuset_mounted; -static void verify_ksm (void ) {unsigned long nmask[MAXNODES /BITS_PER_LONG ] = {0 };unsigned int node; +tst_cgroup_move_current (PATH_TMP_CG_CST ); + node =get_a_numa_node ();set_node (nmask, node);
@@ -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 (PATH_TMP_CG_CST ); }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 ,PATH_TMP_CG_CST ); }static struct tst_test test = {
testcases/kernel/mem/ksm/ksm03.c +4 -8
@@ -59,11 +59,10 @@#include "mem.h" #include "ksm_common.h" -static int memcg_mounted; -static void verify_ksm (void ) { -write_memcg (); +tst_cgroup_move_current (PATH_TMP_CG_MEM ); +tst_cgroup_mem_set_maxbytes (PATH_TMP_CG_MEM ,TESTMEM );create_same_memory (size, num, unit); }
@@ -79,8 +78,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 ,PATH_TMP_CG_MEM ); }static void cleanup (void )
@@ -88,9 +86,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 (PATH_TMP_CG_MEM ); }static struct tst_test test = {
testcases/kernel/mem/ksm/ksm04.c +7 -12
@@ -59,9 +59,6 @@#ifdef HAVE_NUMA_V2 #include <numaif.h> -static int cpuset_mounted; -static int memcg_mounted; -static void verify_ksm (void ) {unsigned long nmask[MAXNODES /BITS_PER_LONG ] = {0 };
@@ -70,7 +67,8 @@ static void verify_ksm(void) node =get_a_numa_node ();set_node (nmask, node); -write_memcg (); +tst_cgroup_move_current (PATH_TMP_CG_MEM ); +tst_cgroup_mem_set_maxbytes (PATH_TMP_CG_MEM ,TESTMEM );if (set_mempolicy (MPOL_BIND , nmask,MAXNODES ) ==-1 ) {if (errno !=ENOSYS )
@@ -81,6 +79,7 @@ static void verify_ksm(void) }create_same_memory (size, num, unit); +tst_cgroup_move_current (PATH_TMP_CG_CST );write_cpusets (node);create_same_memory (size, num, unit); }
@@ -91,10 +90,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 (PATH_TMP_CG_MEM ); +tst_cgroup_umount (PATH_TMP_CG_CST ); }static void setup (void )
@@ -110,10 +107,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 ,PATH_TMP_CG_MEM ); +tst_cgroup_mount (TST_CGROUP_CPUSET ,PATH_TMP_CG_CST ); }static struct tst_test test = {
testcases/kernel/mem/lib/mem.c +3 -5
@@ -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 (tst_cgroup_new_path,"mems" , buf);gather_node_cpus (cpus, nd);/*
@@ -701,14 +701,12 @@ void write_cpusets(long nd)* the value of cpuset.cpus. */ if (strlen (cpus) !=0 ) { -write_cpuset_files (CPATH_NEW ,"cpus" , cpus); +write_cpuset_files (tst_cgroup_new_path,"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 (tst_cgroup_new_path,"cpus" ,"0" ); } - -SAFE_FILE_PRINTF (CPATH_NEW "/tasks" ,"%d" ,getpid ()); }void umount_mem (char *path,char *path_new)
testcases/kernel/mem/oom/oom03.c +6 -16
@@ -36,27 +36,19 @@#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_move_current (PATH_TMP_CG_MEM ); +tst_cgroup_mem_set_maxbytes (PATH_TMP_CG_MEM ,TESTMEM );testoom (0 ,0 ,ENOMEM ,1 ); -if (access (MEMCG_SW_LIMIT ,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 ); +if (tst_cgroup_mem_swapacct_enabled (PATH_TMP_CG_MEM )) { +tst_cgroup_mem_set_maxswap (PATH_TMP_CG_MEM ,TESTMEM );testoom (0 ,1 ,ENOMEM ,1 ); }
@@ -73,16 +65,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 ,PATH_TMP_CG_MEM ); }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 (PATH_TMP_CG_MEM ); }static struct tst_test test = {
testcases/kernel/mem/oom/oom04.c +5 -7
@@ -36,14 +36,14 @@#ifdef HAVE_NUMA_V2 -static int cpuset_mounted; -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 );
@@ -53,7 +53,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 (tst_cgroup_new_path,"memory_migrate" ,"1" );tst_res (TINFO ,"OOM on CPUSET with mem migrate:" );testoom (0 ,0 ,ENOMEM ,1 ); }
@@ -69,8 +69,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 ,PATH_TMP_CG_CST );/* * Some nodes do not contain memory, so use
@@ -89,8 +88,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 (PATH_TMP_CG_CST ); }static struct tst_test test = {
testcases/kernel/mem/oom/oom05.c +12 -26
@@ -36,18 +36,16 @@#ifdef HAVE_NUMA_V2 -static int memcg_mounted; -static int cpuset_mounted; -static void verify_oom (void ) { -int swap_acc_on =1 ; -#ifdef TST_ABI32 tst_brk (TCONF ,"test is not designed for 32-bit system." );#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 );/*
@@ -56,29 +54,22 @@ 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" ); +tst_cgroup_move_current (PATH_TMP_CG_CST ); +write_cpuset_files (tst_cgroup_new_path,"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 (errno ==ENOENT ) { -tst_res (TCONF ,"memcg swap accounting is disabled" ); - swap_acc_on =0 ; - }else -tst_brk (TBROK |TERRNO ,"access" ); - } - -if (swap_acc_on) { +if (tst_cgroup_mem_swapacct_enabled (PATH_TMP_CG_MEM )) {tst_res (TINFO ,"OOM on CPUSET & MEMCG with " "special memswap limitation:" ); -SAFE_FILE_PRINTF (MEMCG_SW_LIMIT ,"%ld" ,TESTMEM ); +tst_cgroup_mem_set_maxswap (PATH_TMP_CG_MEM ,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 (PATH_TMP_CG_MEM ,-1 );testoom (0 ,0 ,ENOMEM ,1 ); } }
@@ -93,11 +84,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 ,PATH_TMP_CG_MEM ); +tst_cgroup_mount (TST_CGROUP_CPUSET ,PATH_TMP_CG_CST );/* * Some nodes do not contain memory, so use
@@ -116,10 +104,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 (PATH_TMP_CG_MEM ); +tst_cgroup_umount (PATH_TMP_CG_CST ); }static struct tst_test test = {
Signature · 1 line
2.21.1
PATCH v3 3/4 mem: remove the old cgroup API
In reply to Li Wang--- testcases/kernel/mem/include/mem.h | 16 +-------- testcases/kernel/mem/lib/mem.c | 58 ------------------------------ 2 files changed, 1 insertion(+), 73 deletions(-)
testcases/kernel/mem/include/mem.h +1 -15
@@ -60,24 +60,10 @@ void test_ksm_merge_across_nodes(unsigned long nr_pages);void check_hugepage (void );void write_memcg (void ); -/* cpuset/memcg */ - -#define CPATH "/dev/cpuset" -#define CPATH_NEW CPATH "/1" -#define MEMCG_PATH "/dev/cgroup" -#define MEMCG_PATH_NEW MEMCG_PATH "/1" -#define MEMCG_LIMIT MEMCG_PATH_NEW "/memory.limit_in_bytes" -#define MEMCG_SW_LIMIT MEMCG_PATH_NEW "/memory.memsw.limit_in_bytes" -#if HAVE_SYS_EVENTFD_H -#define PATH_OOMCTRL MEMCG_PATH_NEW "/memory.oom_control" -#define PATH_EVTCTRL MEMCG_PATH_NEW "/cgroup.event_control" -#endif - +/* cpuset/memcg - include/tst_cgroup.h */ void read_cpuset_files (char *prefix,char *filename,char *retbuf);void write_cpuset_files (char *prefix,char *filename,char *buf);void write_cpusets (long nd); -void mount_mem (char *name,char *fs,char *options,char *path,char *path_new); -void umount_mem (char *path,char *path_new);/* shared */ unsigned int get_a_numa_node (void );
testcases/kernel/mem/lib/mem.c +0 -58
70 lines not on this page · raw message
Signature · 1 line
2.21.1
PATCH v3 4/4 mm: add cpuset01 to runtest file
In reply to Li WangThis test was moved to stress test since commit ae8fa55a8, but stress runtest has been removed from commit e752f7c19674 :).
Here adding back it as a general memory test without '-I 3600'.
--- runtest/mm | 2 ++ 1 file changed, 2 insertions(+)
runtest/mm +2 -0
@@ -73,6 +73,8 @@ ksm06 ksm06 ksm06_1 ksm06 -n 10 ksm06_2 ksm06 -n 10000 +cpuset01 cpuset01 + oom01 oom01 oom02 oom02 oom03 oom03
Signature · 1 line
2.21.1