Expand Cgroup lib and modify controller tests
v5 cover Expand Cgroup lib and modify controller tests
This patchset aims to expand the cgroup_lib shell library to simplify and centralize the whole mounting and cleanup process that can get rather confusing and redundant when writing cgroup controller tests from a shell environment. This is done by having the shell library make calls to the C cgroup API from a binary utility.
In this patch set there are a few tests that have been extensively rewritten to work with the new test API and to use the new functionality from the cgroup lib. Because the test Cgroup lib handles mounting for v1 and v2 controllers, some tests were modified to also work under cgroup v2. Some tests that were written for v1 controller also effictively test v2 controllers, while others were written to test v2 controllers in the spirit of the test or skipped outright.
Luke Nowakowski-Krijger (18):
API/cgroup: Modify tst_cg_print_config for parsing and consumption API/cgroup: Add option for specific pid to tst_cg_opts API/cgroup: Add cgroup_find_root helper function API/cgroup: Add CTRL_NAME_MAX define
tst_test_macros: Add TST_TO_STR and TST_STR macro API/cgroup: Implement tst_cg_load_config
API/cgroup: Add more controllers to tst_cgroup
API/cgroup: refuse to mount blkio when io controller is mounted testcases/lib: Implement tst_cgctl binary
controllers: Expand cgroup_lib shell library
controllers: Update cgroup_fj_* to use newer cgroup lib and test lib
controllers: Update memcg_control_test to newer test lib and cgroup
lib
controllers: Update memcg/regression/* to new test and cgroup lib
controllers: Update memcg_stress_test to use newer cgroup lib
controllers: update memcg/functional to use newer cgroup lib
controllers: Update pids.sh to use newer cgroup lib
controllers: update cpuset_regression_test.sh to use newer cgroup lib
controllers: update cgroup_regression_test to use newer cgroup lib
include/tst_cgroup.h | 17 +- include/tst_test_macros.h | 3 + lib/tst_cgroup.c | 216 +++++++++++++++++- .../cgroup/cgroup_regression_test.sh | 31 +-- .../controllers/cgroup_fj/cgroup_fj_common.sh | 115 +++------- .../cgroup_fj/cgroup_fj_function.sh | 172 ++++++++------ .../controllers/cgroup_fj/cgroup_fj_proc.c | 24 +- .../controllers/cgroup_fj/cgroup_fj_stress.sh | 171 +++++++------- testcases/kernel/controllers/cgroup_lib.sh | 133 +++++++++-- .../cpuset/cpuset_regression_test.sh | 26 +-- .../controllers/memcg/control/mem_process.c | 28 +-- .../memcg/control/memcg_control_test.sh | 149 +++--------- .../memcg/functional/memcg_force_empty.sh | 2 +- .../controllers/memcg/functional/memcg_lib.sh | 54 +++-- .../memcg/regression/memcg_regression_test.sh | 203 ++++++++-------- .../memcg/regression/memcg_test_1.c | 40 ++-- .../memcg/regression/memcg_test_2.c | 24 +- .../memcg/regression/memcg_test_3.c | 38 ++- .../memcg/regression/memcg_test_4.c | 24 +- .../memcg/regression/memcg_test_4.sh | 50 ++-- .../memcg/stress/memcg_stress_test.sh | 32 +-- testcases/kernel/controllers/pids/pids.sh | 67 +----- testcases/lib/Makefile | 2 +- testcases/lib/tst_cgctl.c | 87 +++++++ 24 files changed, 909 insertions(+), 799 deletions(-) create mode 100644 testcases/lib/tst_cgctl.c
Signature · 5 lines
2.34.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v3 1/18 API/cgroup: Modify tst_cg_print_config for parsing and consumption
Modify tst_cg_print_config to be easily parsed by sscanf so that it can later be consumed by tst_cg_load_config.
Prints out root info of each controller found as well as the minimal associated state needed to cleanup mounts and dirs made my tst_cg_require.
---
v2: Remove "mounted_drain_dir" as mounting ltp dir and drain dir happen at the same time
v3: Print config to be scanf friendly to be much easier to consume. Rename variables to reflect the variables used in the library for simplicity.
include/tst_cgroup.h | 6 +++++- lib/tst_cgroup.c | 25 ++++++++++++++++++------- 2 files changed, 23 insertions(+), 8 deletions(-)
include/tst_cgroup.h +5 -1
@@ -110,7 +110,11 @@ extern const struct tst_cg_group *const tst_cg_drain;* controllers. Called automatically by tst_cg_require. */ void tst_cg_scan (void ); -/* Print the config detected by tst_cg_scan */ +/* Print the config detected by tst_cg_scan and print the internal +* state associated with each controller. Output can be passed to +* tst_cg_load_config to configure the internal state to that of the +* config between program invocations. +*/ void tst_cg_print_config (void );/* Ensure the specified controller is available in the test's default
lib/tst_cgroup.c +18 -7
@@ -317,24 +317,35 @@ opendir: O_PATH | O_DIRECTORY); } +#define CONFIG_HEADER "ctrl_name ver we_require_it mnt_path we_mounted_it ltp_dir.we_created_it test_dir.dir_name" +#define CONFIG_FORMAT "%s\t%d\t%d\t%s\t%d\t%d\t%s" +/* Prints out the state associated with each controller to be consumed by +* tst_cg_load_config. +* +* The config keeps track of the minimal state needed for tst_cg_cleanup +* to cleanup mounts and directories made by tst_cg_require. +*/ void tst_cg_print_config (void ) { -struct cgroup_root *root;const struct cgroup_ctrl *ctrl; -tst_res (TINFO ,"Detected Controllers:" ); +printf ("%s\n" ,CONFIG_HEADER );for_each_ctrl (ctrl) { - root = ctrl->ctrl_root; +struct cgroup_root *root = ctrl->ctrl_root;if (!root)continue ; -tst_res (TINFO ,"\t%.10s %s @ %s:%s" , +printf (CONFIG_FORMAT , ctrl->ctrl_name, - root->no_cpuset_prefix ?"[noprefix]" :"" , - root->ver ==TST_CG_V1 ?"V1" :"V2" , - root->mnt_path); + root->ver, + ctrl->we_require_it, + root->mnt_path, + root->we_mounted_it, + root->ltp_dir.we_created_it, + root->test_dir.dir_name ? root->test_dir.dir_name :"NULL" ); +printf ("\n" ); } }
Signature · 5 lines
2.34.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v5 2/18 API/cgroup: Add option for specific pid to tst_cg_opts
In reply to Luke Nowakowski-KrijgerAdd an option that would allow to create a test directory with a specified pid, as opposed to the calling processes pid.
--- include/tst_cgroup.h | 4 ++++ lib/tst_cgroup.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-)
include/tst_cgroup.h +4 -0
@@ -97,6 +97,10 @@ struct tst_cg_opts {* version. Defautls to zero to accept any version. */ enum tst_cg_ver needs_ver; +/* Pass in a specific pid to create and identify the test +* directory as opposed to the default pid of the calling process. +*/ +int test_pid; };/* A Control Group in LTP's aggregated hierarchy */
lib/tst_cgroup.c +5 -1
@@ -713,7 +713,11 @@ mkdirs:cgroup_dir_mk (&root->ltp_dir, cgroup_ltp_drain_dir, &root->drain_dir); -sprintf (cgroup_test_dir,"test-%d" ,getpid ()); +if (options->test_pid) +sprintf (cgroup_test_dir,"test-%d" , options->test_pid); +else +sprintf (cgroup_test_dir,"test-%d" ,getpid ()); +cgroup_dir_mk (&root->ltp_dir, cgroup_test_dir, &root->test_dir); }
Signature · 5 lines
2.34.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v2 3/18 API/cgroup: Add cgroup_find_root helper function
In reply to Luke Nowakowski-KrijgerAdd a helper function similar to cgroup_find_ctrl to make matching paths to roots more convenient.
---
v2: Use the for_each_root() macro to properly loop over v1 roots
lib/tst_cgroup.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
lib/tst_cgroup.c +13 -0
@@ -362,6 +362,19 @@ static struct cgroup_ctrl *cgroup_find_ctrl(const char *const ctrl_name)return NULL ; } +static struct cgroup_root *cgroup_find_root (const char *const mnt_path) +{ +struct cgroup_root *root; + +for_each_root (root) { +if (!strcmp (root->mnt_path, mnt_path)) +return root; + } + +return NULL ; +} + +/* Determine if a mounted cgroup hierarchy is unique and record it if so. * * For CGroups V2 this is very simple as there is only one
Signature · 5 lines
2.34.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v5 4/18 API/cgroup: Add CTRL_NAME_MAX define
In reply to Luke Nowakowski-KrijgerAdd a define for max controller name that will be useful for parsing controller names from strings and helps avoid having unexplained numbers in the codebase.
--- lib/tst_cgroup.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
lib/tst_cgroup.c +2 -1
@@ -196,6 +196,7 @@ static const struct cgroup_file io_ctrl_files[] = { { } }; +#define CTRL_NAME_MAX 31/* Lookup tree for item names. */ static struct cgroup_ctrl controllers[] = { [0 ] = {"cgroup" , cgroup_ctrl_files,0 ,NULL ,0 },
@@ -966,7 +967,7 @@ static const struct cgroup_file *cgroup_file_find(const char *const file, {const struct cgroup_file *cfile;const struct cgroup_ctrl *ctrl; -char ctrl_name[32 ]; +char ctrl_name[CTRL_NAME_MAX +1 ];const char *const sep =strchr (file_name,'.' );size_t len;
Signature · 5 lines
2.34.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v2 5/18 tst_test_macros: Add TST_TO_STR and TST_STR macro
In reply to Luke Nowakowski-KrijgerAdd the TST_TO_STR macro which uses a preprocessor trick to concetenate variables into strings.
Useful when needing to create strings from other #define variables.
Also define TST_STR as an intermediate macro that could be used when defining string literals.
---
v2: Change names to TST_STR and TST_TO_STR
Treat TST_STR as its own macro because it could be useful.
include/tst_test_macros.h | 3 +++ 1 file changed, 3 insertions(+)
include/tst_test_macros.h +3 -0
@@ -36,6 +36,9 @@ extern void *TST_RET_PTR;#define TST_2_ (_1, _2, ...) _2 +#define TST_STR (s) #s +#define TST_TO_STR (s) TST_STR(s) +#define TST_FMT_ (FMT , _1, ...) FMT, ##__VA_ARGS__#define TST_MSG_ (RES ,FMT ,SCALL , ...) \
Signature · 5 lines
2.34.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [PATCH v2 05/18] tst_test_macros: Add TST_TO_STR and TST_STR macro
Hi all,
Quoted 1 line
include/tst_test_macros.h | 3 +++
...
include/tst_test_macros.h extern void *TST_RET_PTR; · line 40
Quoted 2 lines
include/tst_test_macros.h +2
-0+#define TST_STR (s) #s +#define TST_TO_STR (s) TST_STR(s)
NOTE: I changed before merging TST_STR to TST_TO_STR_ as Cyril requested [1]. I'm sorry I forget to update git commit message.
Kind regards,
Petr
[1] https://lore.kernel.org/ltp/YnPSgLxK2jUGndIv@yuki/
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v5 6/18 API/cgroup: Implement tst_cg_load_config
In reply to Luke Nowakowski-KrijgerImplement tst_cg_load_config which consumes the state given by tst_cg_print_config to update the internal test state to reflect the given config.
This allows for programs using the cgroup C API to load and reload state, allowing functionality such as calling tst_cg_require and tst_cg_cleanup to function properly between programs or between invocations of a binary using the C API.
---
v2: Add root null check in parse_root_config.
Remove checking for ltp_drain_dir key from config as it was redundant.
Remove unsued variable in parse_ctrl_config.
Cleanup some compiler warnings.
v3: Rewrite to consume each line of the config with a scanf to make
the parsing much simpler while using new config variables.
v4: Modify CONFIG_FORMAT to have variable delimits for sscanf to make it
more safe. Add extra checks for sscanf reading.
v5: Change to use TST_TO_STR macro
include/tst_cgroup.h | 7 ++++ lib/tst_cgroup.c | 77 ++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 81 insertions(+), 3 deletions(-)
include/tst_cgroup.h +7 -0
@@ -121,6 +121,13 @@ void tst_cg_scan(void);*/ void tst_cg_print_config (void ); +/* Load the config printed out by tst_cg_print_config and configure the internal +* libary state to match the config. Used to allow tst_cg_cleanup to properly +* cleanup mounts and directories created by tst_cg_require between program +* invocations. +*/ +void tst_cg_load_config (const char *const config); +/* Ensure the specified controller is available in the test's default * CGroup, mounting/enabling it if necessary. Usually this is not * necessary use tst_test.needs_cgroup_ctrls instead.
lib/tst_cgroup.c +74 -3
102 lines not on this page · raw message
Signature · 5 lines
2.34.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v2 8/18 API/cgroup: refuse to mount blkio when io controller is mounted
In reply to Luke Nowakowski-KrijgerMounting the v1 blkio controller while v2 io controller is mounted unmounts the io controller, triggering a tst_brk that the number of controller has gone down.
Because these controllers don't seem to be compatible, tst_res with TCONF and report that we refused to mount the blkio controller while the io controller is mounted.
---
v2: Change from tst_brk to tst_res TCONF and return
lib/tst_cgroup.c | 6 ++++++ 1 file changed, 6 insertions(+)
lib/tst_cgroup.c +6 -0
@@ -716,6 +716,12 @@ static void cgroup_mount_v1(struct cgroup_ctrl *const ctrl)char mnt_path[PATH_MAX ];int made_dir =0 ; +if (ctrl->ctrl_indx ==CTRL_BLKIO && controllers[CTRL_IO ].ctrl_root) { +tst_res (TCONF , +"IO controller found on V2 root, skipping blkio mount that would unmount IO controller" ); +return ; + } +sprintf (mnt_path,"%s%s" , cgroup_mount_ltp_prefix, ctrl->ctrl_name);if (!mkdir (mnt_path,0777 )) {
Signature · 5 lines
2.34.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Petr Vorel
AppliedRe: [LTP] [PATCH v2 08/18] API/cgroup: refuse to mount blkio when io controller is mounted
Hi all,
I've merged C changes, i.e. patches up to this one.
Luke, could you please send rebased new version of the rest? Or, if you're too busy let us know and we'll do the fixes before merge.
Kind regards,
Petr
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v3 7/18 API/cgroup: Add more controllers to tst_cgroup
In reply to Luke Nowakowski-KrijgerAdd the rest of the controllers that are tested in LTP controller tests so that they can be mounted using the cgroup api.
Control files should be added on an as needed basis.
---
v2: remove rdma controller as that is not used in any LTP tests. Remove control files that should be added on an as needed basis.
v3: Add debug controllers
lib/tst_cgroup.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 91 insertions(+), 1 deletion(-)
lib/tst_cgroup.c +91 -1
@@ -83,8 +83,19 @@ enum cgroup_ctrl_indx {CTRL_CPU ,CTRL_CPUSET ,CTRL_IO , +CTRL_PIDS , +CTRL_HUGETLB , +CTRL_CPUACCT , +CTRL_DEVICES , +CTRL_FREEZER , +CTRL_NETCLS , +CTRL_NETPRIO , +CTRL_BLKIO , +CTRL_MISC , +CTRL_PERFEVENT , +CTRL_DEBUG }; -#define CTRLS_MAX CTRL_CPUSET +#define CTRLS_MAX CTRL_DEBUG/* At most we can have one cgroup V1 tree for each controller and one * (empty) v2 tree.
@@ -196,6 +207,52 @@ static const struct cgroup_file io_ctrl_files[] = { { } }; +static const struct cgroup_file pids_ctrl_files[] = { + {"pids.max" ,"pids.max" ,CTRL_PIDS }, + {"pids.current" ,"pids.current" ,CTRL_PIDS }, + { } +}; + +static const struct cgroup_file hugetlb_ctrl_files[] = { + { } +}; + +static const struct cgroup_file cpuacct_ctrl_files[] = { + { } +}; + +static const struct cgroup_file devices_ctrl_files[] = { + { } +}; + +static const struct cgroup_file freezer_ctrl_files[] = { + { } +}; + +static const struct cgroup_file netcls_ctrl_files[] = { + { } +}; + +static const struct cgroup_file netprio_ctrl_files[] = { + { } +}; + +static const struct cgroup_file blkio_ctrl_files[] = { + { } +}; + +static const struct cgroup_file misc_ctrl_files[] = { + { } +}; + +static const struct cgroup_file perf_event_ctrl_files[] = { + { } +}; + +static const struct cgroup_file debug_ctrl_files[] = { + { } +}; +#define CTRL_NAME_MAX 31/* Lookup tree for item names. */ static struct cgroup_ctrl controllers[] = {
@@ -212,6 +269,39 @@ static struct cgroup_ctrl controllers[] = { [CTRL_IO ] = {"io" , io_ctrl_files,CTRL_IO ,NULL ,0 }, + [CTRL_PIDS ] = { +"pids" , pids_ctrl_files,CTRL_PIDS ,NULL ,0 + }, + [CTRL_HUGETLB ] = { +"hugetlb" , hugetlb_ctrl_files,CTRL_HUGETLB ,NULL ,0 + }, + [CTRL_CPUACCT ] = { +"cpuacct" , cpuacct_ctrl_files,CTRL_CPUACCT ,NULL ,0 + }, + [CTRL_DEVICES ] = { +"devices" , devices_ctrl_files,CTRL_DEVICES ,NULL ,0 + }, + [CTRL_FREEZER ] = { +"freezer" , freezer_ctrl_files,CTRL_FREEZER ,NULL ,0 + }, + [CTRL_NETCLS ] = { +"net_cls" , netcls_ctrl_files,CTRL_NETCLS ,NULL ,0 + }, + [CTRL_NETPRIO ] = { +"net_prio" , netprio_ctrl_files,CTRL_NETPRIO ,NULL ,0 + }, + [CTRL_BLKIO ] = { +"blkio" , blkio_ctrl_files,CTRL_BLKIO ,NULL ,0 + }, + [CTRL_MISC ] = { +"misc" , misc_ctrl_files,CTRL_MISC ,NULL ,0 + }, + [CTRL_PERFEVENT ] = { +"perf_event" , perf_event_ctrl_files,CTRL_PERFEVENT ,NULL ,0 + }, + [CTRL_DEBUG ] = { +"debug" , debug_ctrl_files,CTRL_DEBUG ,NULL ,0 + }, { } };
Signature · 5 lines
2.34.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v2 9/18 testcases/lib: Implement tst_cgctl binary
In reply to Luke Nowakowski-KrijgerImplement a binary utility that creates an interface to make calls to the cgroup C API.
This will effectively allow shell scripts to make calls to the cgroup C api.
---
v2: Add license identifier and copyright.
Reformat with tabs instead of spaces.
Add help format message and help function.
Add error gotos to streamline error messaging.
testcases/lib/Makefile | 2 +- testcases/lib/tst_cgctl.c | 87 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+), 1 deletion(-) create mode 100644 testcases/lib/tst_cgctl.c
testcases/lib/Makefile +1 -1
@@ -12,6 +12,6 @@ MAKE_TARGETS := tst_sleep tst_random tst_checkpoint tst_rod tst_kvcmp\ tst_device tst_net_iface_prefix tst_net_ip_prefix tst_net_vars\ tst_getconf tst_supported_fs tst_check_drivers tst_get_unused_port\ tst_get_median tst_hexdump tst_get_free_pids tst_timeout_kill\ - tst_check_kconfigs + tst_check_kconfigs tst_cgctl include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/lib/tst_cgctl.c new file +87 -0
87 lines not on this page · raw message
Signature · 5 lines
2.34.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [PATCH v2 09/18] testcases/lib: Implement tst_cgctl binary
Quoted 42 lines
Implement a binary utility that creates an interface to make calls to the cgroup C API.
This will effectively allow shell scripts to make calls to the cgroup C api.
Signed-off-by Luke Nowakowski-Krijger <[email protected]>---
v2: Add license identifier and copyright.
Reformat with tabs instead of spaces.
Add help format message and help function.
Add error gotos to streamline error messaging.testcases/lib/Makefile | 2 +- testcases/lib/tst_cgctl.c | 87 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+), 1 deletion(-) create mode 100644 testcases/lib/tst_cgctl.ctestcases/lib/Makefile +1
-1@@ -12,6 +12,6 @@ MAKE_TARGETS := tst_sleep tst_random tst_checkpoint tst_rod tst_kvcmp\ tst_device tst_net_iface_prefix tst_net_ip_prefix tst_net_vars\ tst_getconf tst_supported_fs tst_check_drivers tst_get_unused_port\ tst_get_median tst_hexdump tst_get_free_pids tst_timeout_kill\ - tst_check_kconfigs + tst_check_kconfigs tst_cgctl include $(top_srcdir)/include/mk/generic_leaf_target.mktestcases/lib/tst_cgctl.c new file +6
-0@@ -0,0 +1,87 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2022 Canonical Ltd. +*/ + +#include <stdio.h>
testcases/lib/tst_cgctl.c line 16
Quoted 10 lines
testcases/lib/tst_cgctl.c new file +10
-0+#include <string.h> +#include <stdlib.h> +#include <stdint.h> +#include <unistd.h> +#include "tst_cgroup.h" + +#define USAGE "Usage: tst_cgctl require [controller] [test_pid]\n\ + \t cleanup [config (output of tst_cg_print_config)]\n\ + \t print\n\ + \t help\n"
nit: instead of define I'd create function usage().
I'd print always to stderr, just exit code would be different. (we print tst_res/tst_brk output to stderr, thus it's better to use it).
Also checkpatch does not like it:
$ cd testcases/lib/ && make check-tst_cgctl CHECK testcases/lib/tst_cgctl.c tst_cgctl.c:13: WARNING: Avoid line continuations in quoted strings
The rest LGTM.
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v5 10/18 controllers: Expand cgroup_lib shell library
In reply to Luke Nowakowski-KrijgerExpand the cgroup_lib library by using the tst_cgctl binary utility to make calls to the Cgroup C API to simplify and centralize the mounting and cleanup process of Cgroups
---
v2: Add "^" to propery grep the correct mountpoint.
Removed is_cgroup_enabled_and_available function and put the check in cgroup_require().
Check if /proc/cgroups exists in cgroup_require(). Change to TCONF if controllers not available.
v3: Add copyright.
Change awks to grab new config variables.
Change version from v2 to just 2 to match config variables.
v4: add _cgroup_check_return to repeat return value of tst_cgctl
v5: Instead of _cgroup_check_return, use ROD in cgroup_cleanup
Also manually parse return value in cgroup_require Change some minor nits and quote a variable
testcases/kernel/controllers/cgroup_lib.sh | 133 +++++++++++++++++---- 1 file changed, 113 insertions(+), 20 deletions(-)
testcases/kernel/controllers/cgroup_lib.sh +113 -20
@@ -2,38 +2,131 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (c) 2019-2022 Petr Vorel <[email protected]> # Copyright (c) 2018-2019 ARM Ltd. All Rights Reserved. +# Copyright (c) 2022 Canonical Ltd. -# Find mountpoint to given subsystem -# get_cgroup_mountpoint SUBSYSTEM -# RETURN: 0 if mountpoint found, otherwise 1 -get_cgroup_mountpoint() +_cgroup_state= + +# Find mountpoint of the given controller +# USAGE: cgroup_get_mountpoint CONTROLLER +# RETURNS: Prints the mountpoint of the given controller +# Must call cgroup_require before calling +cgroup_get_mountpoint() +{ + local ctrl="$1" + local mountpoint + + [ $# -eq 0 ] && tst_brk TBROK "cgroup_get_mountpoint: controller not defined" + [ "$_cgroup_state" = "" ] && tst_brk TBROK "cgroup_get_mountpoint: No previous state found. Forgot to call cgroup_require?" + + mountpoint=$(echo "$_cgroup_state" | grep -w "^$ctrl" | awk '{ print $4 }') + echo "$mountpoint" + + return 0 +} + +# Get the test path of a given controller that has been created by the cgroup C API +# USAGE: cgroup_get_test_path CONTROLLER +# RETURNS: Prints the path to the test direcory +# Must call cgroup_require before calling +cgroup_get_test_path() +{ + local ctrl="$1" + local mountpoint + local test_path + + [ $# -eq 0 ] && tst_brk TBROK "cgroup_get_test_path: controller not defined" + [ "$_cgroup_state" = "" ] && tst_brk TBROK "cgroup_get_test_path: No previous state found. Forgot to call cgroup_require?" + + mountpoint=$(cgroup_get_mountpoint "$ctrl") + + test_path="$mountpoint/ltp/test-$$" + + [ ! -e "$test_path" ] && tst_brk TBROK "cgroup_get_test_path: No test path found. Forgot to call cgroup_require?" + + echo "$test_path" + + return 0 +} + +# Gets the cgroup version of the given controller +# USAGE: cgroup_get_version CONTROLLER +# RETURNS: "1" if version 1 and "2" if version 2 +# Must call cgroup_require before calling +cgroup_get_version() { - local subsystem=$1 - local mntpoint + local ctrl="$1" + local version - [ $# -eq 0 ] && tst_brk TBROK "get_cgroup_mountpoint: subsystem not defined" + [ $# -eq 0 ] && tst_brk TBROK "cgroup_get_version: controller not defined" + [ "$_cgroup_state" = "" ] && tst_brk TBROK "cgroup_get_version: No previous state found. Forgot to call cgroup_require?" - mntpoint=$(grep cgroup /proc/mounts | grep -w $subsystem | awk '{ print $2 }') - [ -z "$mntpoint" ] && return 1 + version=$(echo "$_cgroup_state" | grep -w "^$ctrl" | awk '{ print $2 }') + [ "$version" = "" ] && tst_brk TBROK "cgroup_get_version: Could not find controller $ctrl" + + echo "$version" - echo $mntpoint return 0 } -# Check if given subsystem is supported and enabled -# is_cgroup_subsystem_available_and_enabled SUBSYSTEM -# RETURN: 0 if subsystem supported and enabled, otherwise 1 -is_cgroup_subsystem_available_and_enabled() +# Cleans up any setup done by calling cgroup_require. +# USAGE: cgroup_cleanup +# Can be safely called even when no setup has been done +cgroup_cleanup() { - local val - local subsystem=$1 + [ "$_cgroup_state" = "" ] && return 0 - [ $# -eq 0 ] && tst_brk TBROK "is_cgroup_subsystem_available_and_enabled: subsystem not defined" + ROD tst_cgctl cleanup "$_cgroup_state" - val=$(grep -w $subsystem /proc/cgroups | awk '{ print $4 }') - [ "$val" = "1" ] && return 0 + _cgroup_state= - return 1 + return 0 +} + +# Get the task list of the given controller +# USAGE: cgroup_get_task_list CONTROLLER +# RETURNS: prints out "cgroup.procs" if version 2 otherwise "tasks" +# Must call cgroup_require before calling +cgroup_get_task_list() +{ + local ctrl="$1" + local version + + [ $# -eq 0 ] && tst_brk TBROK "cgroup_get_task_list: controller not defined" + + version=$(cgroup_get_version "$ctrl") + + if [ "$version" = "2" ]; then + echo "cgroup.procs" + else + echo "tasks" + fi + + return 0 +} + +# Mounts and configures the given controller +# USAGE: cgroup_require CONTROLLER +cgroup_require() +{ + local ctrl="$1" + + [ $# -eq 0 ] && tst_brk TBROK "cgroup_require: controller not defined" + + [ ! -f /proc/cgroups ] && tst_brk TCONF "Kernel does not support control groups" + + _cgroup_state=$(tst_cgctl require "$ctrl" $$) + + if [ $? -eq 32 ]; then + tst_brk TCONF "'tst_cgctl require' exited. Controller is probably not available?" + fi + + if [ $? -ne 0 ]; then + tst_brk TBROK "'tst_cgctl require' exited." + fi + + [ "$_cgroup_state" = "" ] && tst_brk TBROK "cgroup_require: No state was set after call to tst_cgctl require?" + + return 0 } . tst_test.sh
Signature · 5 lines
2.34.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [PATCH v5 10/18] controllers: Expand cgroup_lib shell library
Hi Luke,
...
testcases/kernel/controllers/cgroup_lib.sh line 60
Quoted 13 lines
testcases/kernel/controllers/cgroup_lib.sh +8
-3+# Gets the cgroup version of the given controller +# USAGE: cgroup_get_version CONTROLLER +# RETURNS: "1" if version 1 and "2" if version 2 +# Must call cgroup_require before calling +cgroup_get_version() { - local subsystem=$1 - local mntpoint + local ctrl="$1" + local version - [ $# -eq 0 ] && tst_brk TBROK "get_cgroup_mountpoint: subsystem not defined" + [ $# -eq 0 ] && tst_brk TBROK "cgroup_get_version: controller not defined"
NOTE: this will always pass, because you pass variable in "" (thus $1 = "" and $# = 1):cgroup_get_task_list()
{
local ctrl="$1"
version=$(cgroup_get_version "$ctrl")Quoted 12 lines
testcases/kernel/controllers/cgroup_lib.sh +5
-3+ [ "$_cgroup_state" = "" ] && tst_brk TBROK "cgroup_get_version: No previous state found. Forgot to call cgroup_require?" - mntpoint=$(grep cgroup /proc/mounts | grep -w $subsystem | awk '{ print $2 }') - [ -z "$mntpoint" ] && return 1 + version=$(echo "$_cgroup_state" | grep -w "^$ctrl" | awk '{ print $2 }') + [ "$version" = "" ] && tst_brk TBROK "cgroup_get_version: Could not find controller $ctrl" + + echo "$version" - echo $mntpoint return 0 }
...
Quoted 9 lines
testcases/kernel/controllers/cgroup_lib.sh +9
-0+# Mounts and configures the given controller +# USAGE: cgroup_require CONTROLLER +cgroup_require() +{ + local ctrl="$1" + + [ $# -eq 0 ] && tst_brk TBROK "cgroup_require: controller not defined" + + [ ! -f /proc/cgroups ] && tst_brk TCONF "Kernel does not support control groups"
testcases/kernel/controllers/cgroup_lib.sh line 125
Quoted 10 lines
testcases/kernel/controllers/cgroup_lib.sh +10
-0+ + _cgroup_state=$(tst_cgctl require "$ctrl" $$) + + if [ $? -eq 32 ]; then + tst_brk TCONF "'tst_cgctl require' exited. Controller is probably not available?" + fi + + if [ $? -ne 0 ]; then + tst_brk TBROK "'tst_cgctl require' exited." + fi
FYI if cgroup_require is called from cleanup function tst_brk does not exit the code:
tst_brk()
{
local res=$1
shift
if [ "$TST_DO_EXIT" = 1 ]; then
tst_res TWARN "$@"
return
fi
tst_res "$res" "$@"
_tst_do_exit
}IMHO that means that $? became 0 even it was previously 32.
It's always safer to save $? into local variable if needed to store exit code (otherwise using if, e.g. "if ! foo; then" is preferred).
NOTE: Maybe at this point it might be safer if you post next version where you do fixes yourself. I'll try to review the rest of the shell scripts today (C code looks correct to me).
Kind regards,
Petr
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [PATCH v5 10/18] controllers: Expand cgroup_lib shell library
Hi Petr,
Quoted 16 lines · Petr Vorel
Hi Luke,
...
testcases/kernel/controllers/cgroup_lib.sh
Quoted 12 lines
testcases/kernel/controllers/cgroup_lib.sh +7
-3+# Gets the cgroup version of the given controller +# USAGE: cgroup_get_version CONTROLLER +# RETURNS: "1" if version 1 and "2" if version 2 +# Must call cgroup_require before calling +cgroup_get_version() { - local subsystem=$1 - local mntpoint + local ctrl="$1" + local version - [ $# -eq 0 ] && tst_brk TBROK "get_cgroup_mountpoint: subsystemnot defined"
Quoted 10 lines
Quoted 1 line
+ [ $# -eq 0 ] &&
tst_brkTBROK "cgroup_get_version: controller notdefined"
NOTE: this will always pass, because you pass variable in "" (thus $1 = "" and $# = 1):cgroup_get_task_list(){ local ctrl="$1" version=$(cgroup_get_version "$ctrl")
Yes this is true when using this function by other functions in the library. The use case where this would fail is when someone calls it from a test and forgets to pass a controller to it or something like that.
Quoted 58 lines
Quoted 1 line
+ [ "$_cgroup_state" = "" ] &&
tst_brkTBROK "cgroup_get_version: Noprevious state found. Forgot to call
cgroup_require?"Quoted 1 line
- mntpoint=$(grep cgroup
/proc/mounts| grep -w $subsystem | awk '{print $2 }')
Review
Quoted 2 lines
(quoted diff) +1
-1- [ -z "$mntpoint" ] && return 1 + version=$(echo "$_cgroup_state" | grep -w "^$ctrl" | awk '{ print$2 }')
Quoted 1 line
+ [ "$version" = "" ] &&
tst_brkTBROK "cgroup_get_version: Couldnot find controller $ctrl"
Quoted 6 lines
testcases/kernel/controllers/cgroup_lib.sh +2
-1+ + echo "$version" - echo $mntpoint return 0 }...
testcases/kernel/controllers/cgroup_lib.sh
Quoted 7 lines
testcases/kernel/controllers/cgroup_lib.sh +7
-0+# Mounts and configures the given controller +# USAGE: cgroup_require CONTROLLER +cgroup_require() +{ + local ctrl="$1" + + [ $# -eq 0 ] && tst_brk TBROK "cgroup_require: controller notdefined"
Review
Quoted 2 lines
(quoted diff) +2
-0+ + [ ! -f /proc/cgroups ] && tst_brk TCONF "Kernel does not supportcontrol groups"
testcases/kernel/controllers/cgroup_lib.sh
Quoted 5 lines
testcases/kernel/controllers/cgroup_lib.sh +5
-0+ + _cgroup_state=$(tst_cgctl require "$ctrl" $$) + + if [ $? -eq 32 ]; then + tst_brk TCONF "'tst_cgctl require' exited. Controller isprobably not available?"
testcases/kernel/controllers/cgroup_lib.sh line 125
Quoted 5 lines
testcases/kernel/controllers/cgroup_lib.sh +5
-0+ fi + + if [ $? -ne 0 ]; then + tst_brk TBROK "'tst_cgctl require' exited." + fiFYI if
cgroup_requireis called from cleanup functiontst_brkdoes not exit the
code:
tst_brk(){ local res=$1 shift if [ "$TST_DO_EXIT" = 1 ]; then tst_res TWARN "$@" return fi tst_res "$res" "$@" _tst_do_exit }
Quoted 6 lines
IMHO that means that $? became 0 even it was previously 32. It's always safer to save $? into local variable if needed to store exit code
(otherwise using if, e.g. "if ! foo; then" is preferred).
That's a good point. I'll just save the return and propagate the return code.
Quoted 6 lines
NOTE: Maybe at this point it might be safer if you post next version where you do fixes yourself. I'll try to review the rest of the shell scripts
today (C code looks correct to me).
Yeah, I will rebase and resubmit with the fixes people have mentioned.
Quoted 3 lines
Kind regards,
Petr
Signature · 2 lines
-- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v3 11/18 controllers: Update cgroup_fj_* to use newer cgroup lib and test lib
In reply to Luke Nowakowski-KrijgerUpdate the cgroup_fj_* tests to use the newer test lib and to use the updated version of the cgroup lib which handles mounting and unmounting for both v1 and v2 controllers.
The tests were modified to accommodate testing the v2 controller interfaces where it still made sense, and in other places tests were skipped as they were testing using specific parts of the v1 interface that doesn't exist on v2 controllers.
Also updated the licensing info at the beginning of the file with SPDX license identifier.
---
v2: Remove exist_subsystem() function.
Correct spelling mistakes in commit message.
Change version numbers to "2" instead of "v2"
v3: put cgroup_lib.sh include in bottom of file
.../controllers/cgroup_fj/cgroup_fj_common.sh | 115 ++++-------- .../cgroup_fj/cgroup_fj_function.sh | 172 ++++++++++-------- .../controllers/cgroup_fj/cgroup_fj_proc.c | 24 +-- .../controllers/cgroup_fj/cgroup_fj_stress.sh | 171 +++++++++-------- 4 files changed, 217 insertions(+), 265 deletions(-)
testcases/kernel/controllers/cgroup_fj/cgroup_fj_common.sh +32 -83
@@ -1,43 +1,17 @@ #!/bin/sh - -################################################################################ -## ## -## Copyright (c) 2009 FUJITSU LIMITED ## -## Author: Shi Weihua <[email protected]> ## -## Copyright (c) 2015 Cedric Hnyda <[email protected]> ## -## Copyright (c) 2015-2016 Cyril Hrubis <[email protected]> ## -## ## -## This program is free software; you can redistribute it and#or modify ## -## it under the terms of the GNU General Public License as published by ## -## the Free Software Foundation; either version 2 of the License, or ## -## (at your option) any later version. ## -## ## -## This program is distributed in the hope that it will be useful, but ## -## WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY ## -## or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ## -## for more details. ## -## ## -## You should have received a copy of the GNU General Public License ## -## along with this program; if not, write to the Free Software Foundation, ## -## Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ## -## ## -################################################################################ +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (c) 2009 FUJITSU LIMITED +# Copyright (c) 2015 Cedric Hnyda <[email protected]> +# Copyright (c) 2015-2016 Cyril Hrubis <[email protected]> +# Author: Shi Weihua <[email protected]> for arg; do TCID="${TCID}_$arg" done -. test.sh - -exist_subsystem() -{ - local subsystem="$1" - local exist=`grep -w $subsystem /proc/cgroups | cut -f1` - - if [ -z "$exist" ]; then - tst_brkm TCONF "Subsystem $subsystem not supported" - fi -} +TST_NEEDS_CMDS="rmdir killall" +TST_NEEDS_ROOT=1 +TST_NEEDS_TMPDIR=1 attach_and_check() {
@@ -46,13 +20,13 @@ attach_and_check() local task shift - tst_resm TINFO "Attaching task $pid to $path" + tst_res TINFO "Attaching task $pid to $path" - ROD echo "$pid" \> "$path/tasks" + ROD echo "$pid" \> "$path/$task_list" - for task in $(cat "$path/tasks"); do + for task in $(cat "$path/$task_list"); do if [ "$task" -ne "$pid" ]; then - tst_resm TINFO "Unexpected pid $task in $path/tasks, expected $pid" + tst_res TINFO "Unexpected pid $task in $path/$task_list, expected $pid" return 1 fi done
@@ -64,11 +38,13 @@ create_subgroup() { path="$1" - ROD mkdir "$path" + [ ! -d "$path" ] && ROD mkdir "$path" # cpuset.cpus and cpuset.mems must be initialized with suitable value - # before any pids are attached - if [ "$subsystem" = "cpuset" ]; then + # before any pids are attached. + # Only needs to be done for cgroup v1 as sets are inherited from parents + # by default in cgroup v2. + if [ "$cgroup_version" = "1" ] && [ "$subsystem" = "cpuset" ]; then if [ -e "$mount_point/cpus" ]; then ROD cat "$mount_point/cpus" \> "$path/cpus" ROD cat "$mount_point/mems" \> "$path/mems"
@@ -79,54 +55,27 @@ create_subgroup() fi } - -setup() +common_setup() { - tst_require_root - tst_require_cmds killall - - if [ ! -f /proc/cgroups ]; then - tst_brkm TCONF "Kernel does not support for control groups" - fi - - exist_subsystem "$subsystem" - - tst_tmpdir - TST_CLEANUP=cleanup - - mount_point=`grep -w $subsystem /proc/mounts | grep -w "cgroup" | \ - cut -f 2 | cut -d " " -f2` - - if [ -z "$mount_point" ]; then - try_umount=1 - mount_point="/dev/cgroup" - tst_resm TINFO "Subsystem $subsystem is not mounted, mounting it at $mount_point" - ROD mkdir $mount_point - ROD mount -t cgroup -o "$subsystem" "ltp_cgroup" "$mount_point" - else - tst_resm TINFO "Subsystem $subsystem is mounted at $mount_point" - fi + cgroup_require "$subsystem" + mount_point=$(cgroup_get_mountpoint "$subsystem") + start_path=$(cgroup_get_test_path "$subsystem") + cgroup_version=$(cgroup_get_version "$subsystem") + task_list=$(cgroup_get_task_list "$subsystem") + + [ "$cgroup_version" = "2" ] && ROD echo "+$subsystem" \> "$start_path/cgroup.subtree_control" + tst_res TINFO "test starts with cgroup version $cgroup_version" } -cleanup() +common_cleanup() { - tst_rmdir - killall -9 cgroup_fj_proc >/dev/null 2>&1 - tst_resm TINFO "Removing all ltp subgroups..." - - find "$mount_point/ltp/" -depth -type d -exec rmdir '{}' \; + tst_res TINFO "Removing all ltp subgroups..." - if [ -z "$try_umount" ]; then - return - fi - - if grep -q "$mount_point" /proc/mounts; then - EXPECT_PASS umount "$mount_point" - fi + [ -d "$start_path" ] && find "$start_path" -depth -type d -exec rmdir '{}' \; - if [ -e "$mount_point" ]; then - EXPECT_PASS rmdir "$mount_point" - fi + cgroup_cleanup } + +. cgroup_lib.sh
testcases/kernel/controllers/cgroup_fj/cgroup_fj_function.sh +97 -75
299 lines not on this page · raw message
testcases/kernel/controllers/cgroup_fj/cgroup_fj_proc.c +3 -21
@@ -1,24 +1,6 @@ -/******************************************************************************/ -/* */ -/* Copyright (c) 2009 FUJITSU LIMITED */ -/* */ -/* This program is free software; you can redistribute it and/or modify */ -/* it under the terms of the GNU General Public License as published by */ -/* the Free Software Foundation; either version 2 of the License, or */ -/* (at your option) any later version. */ -/* */ -/* This program is distributed in the hope that it will be useful, */ -/* but WITHOUT ANY WARRANTY; without even the implied warranty of */ -/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See */ -/* the GNU General Public License for more details. */ -/* */ -/* You should have received a copy of the GNU General Public License */ -/* along with this program; if not, write to the Free Software */ -/* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -/* */ -/* Author: Shi Weihua <[email protected]> */ -/* */ -/******************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later +// Copyright (c) 2009 FUJITSU LIMITED +// Author: Shi Weihua <[email protected]> #include <sys/types.h> #include <sys/wait.h>
testcases/kernel/controllers/cgroup_fj/cgroup_fj_stress.sh +85 -86
212 lines not on this page · raw message
Signature · 5 lines
2.34.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [PATCH v3 11/18] controllers: Update cgroup_fj_* to use newer cgroup lib and test lib
testcases/kernel/controllers/cgroup_fj/cgroup_fj_function.sh test9() · line 221
Quoted 3 lines · Luke Nowakowski-Krijger
testcases/kernel/controllers/cgroup_fj/cgroup_fj_function.sh +3
-0+setup() +{ + common_setup
This can fail and we have not set pid yet.
testcases/kernel/controllers/cgroup_fj/cgroup_fj_function.sh test9() · line 230
Quoted 12 lines
testcases/kernel/controllers/cgroup_fj/cgroup_fj_function.sh +8
-3+ cgroup_fj_proc& + pid=$! + create_subgroup "$start_path/ltp_1" +} -ROD kill -9 $pid -wait $pid -ROD rmdir "$start_path/ltp_1" +cleanup() +{ + kill -9 $pid >/dev/null 2>&1 + wait $pid >/dev/null 2>&1
$pid is unset so this just waits forever. We need something like the following:
if [ -n "$pid" ]; then
kill -9 $pid >/dev/null 2>&1
wait $pid >/dev/null 2>&1
fiQuoted 4 lines
testcases/kernel/controllers/cgroup_fj/cgroup_fj_function.sh +3
-0+ rmdir "$start_path/ltp_1" >/dev/null 2>&1 + common_cleanup +}
Signature · 5 lines
Thank you, Richard. -- Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [PATCH v3 11/18] controllers: Update cgroup_fj_* to use newer cgroup lib and test lib
Quoted 25 lines · Richard Palethorpe
testcases/kernel/controllers/cgroup_fj/cgroup_fj_function.sh test9() · line 221
Quoted 3 lines · Luke Nowakowski-Krijger
testcases/kernel/controllers/cgroup_fj/cgroup_fj_function.sh +3
-0+setup() +{ + common_setupThis can fail and we have not set pid yet.
testcases/kernel/controllers/cgroup_fj/cgroup_fj_function.sh test9() · line 230
Quoted 12 lines
testcases/kernel/controllers/cgroup_fj/cgroup_fj_function.sh +8
-3+ cgroup_fj_proc& + pid=$! + create_subgroup "$start_path/ltp_1" +} -ROD kill -9 $pid -wait $pid -ROD rmdir "$start_path/ltp_1" +cleanup() +{ + kill -9 $pid >/dev/null 2>&1 + wait $pid >/dev/null 2>&1$pid is unset so this just waits forever. We need something like the following:
Quoted 6 lines
if [ -n "$pid" ]; then
kill -9 $pid >/dev/null 2>&1
wait $pid >/dev/null 2>&1
fi+1 Someone who merges patch can help fix this.
Signature · 2 lines
Regards, Li Wang
Signature · 2 lines
-- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v2 14/18 controllers: Update memcg_stress_test to use newer cgroup lib
In reply to Luke Nowakowski-KrijgerUpdate the test to use the newer cgroup lib which enables the testing of both v1 and v2 memory controllers and makes the setup and cleanup much simpler.
---
v2: Use version number 2 instead of v2
.../memcg/stress/memcg_stress_test.sh | 32 +++++++------------ 1 file changed, 12 insertions(+), 20 deletions(-)
testcases/kernel/controllers/memcg/stress/memcg_stress_test.sh +12 -20
@@ -21,10 +21,16 @@ TST_TIMEOUT=2100 setup() { - if ! is_cgroup_subsystem_available_and_enabled "memory"; then - tst_brk TCONF "Either kernel does not support Memory Resource Controller or feature not enabled" + cgroup_require "memory" + cgroup_version=$(cgroup_get_version "memory") + test_path=$(cgroup_get_test_path "memory") + task_list=$(cgroup_get_task_list "memory") + if [ "$cgroup_version" = "2" ]; then + ROD echo "+memory" > "$test_path/cgroup.subtree_control" fi + tst_res TINFO "test starts with cgroup version $cgroup_version" + echo 3 > /proc/sys/vm/drop_caches sleep 2 local mem_free=`cat /proc/meminfo | grep MemFree | awk '{ print $2 }'`
@@ -41,18 +47,7 @@ setup() cleanup() { - if [ -e /dev/memcg ]; then - EXPECT_PASS umount /dev/memcg - EXPECT_PASS rmdir /dev/memcg - fi -} - -do_mount() -{ - cleanup - - EXPECT_PASS mkdir /dev/memcg - EXPECT_PASS mount -t cgroup -omemory memcg /dev/memcg + cgroup_cleanup } # $1 Number of cgroups
@@ -69,13 +64,11 @@ run_stress() tst_res TINFO "Testing $cgroups cgroups, using $mem_size MB, interval $interval" - do_mount - tst_res TINFO "Starting cgroups" for i in $(seq 0 $(($cgroups-1))); do - mkdir /dev/memcg/$i 2> /dev/null + ROD mkdir "$test_path/$i" memcg_process_stress $mem_size $interval & - echo $! > /dev/memcg/$i/tasks + ROD echo $! > "$test_path/$i/$task_list" pids="$pids $!" done
@@ -91,12 +84,11 @@ run_stress() for pid in $pids; do kill -KILL $pid 2> /dev/null wait $pid 2> /dev/null - rmdir /dev/memcg/$i 2> /dev/null + ROD rmdir "$test_path/$i" i=$((i+1)) done tst_res TPASS "Test passed" - cleanup } test1()
Signature · 5 lines
2.34.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v3 12/18 controllers: Update memcg_control_test to newer test lib and cgroup lib
In reply to Luke Nowakowski-KrijgerUpdate memcg_control_test to use the newer test lib and to use the newer cgroup lib which enables the memory v1 and v2 controller to be tested.
Also updated to newer SPDX license identifier.
---
v2: Change version numbers to 2 instead of v2
v3: put cgroup_lib.sh include in bottom of file
.../controllers/memcg/control/mem_process.c | 28 +--- .../memcg/control/memcg_control_test.sh | 149 +++++------------- 2 files changed, 39 insertions(+), 138 deletions(-)
testcases/kernel/controllers/memcg/control/mem_process.c +3 -25
@@ -1,28 +1,6 @@ -/*****************************************************************************/ -/* */ -/* Copyright (c) 2010 Mohamed Naufal Basheer */ -/* */ -/* This program is free software; you can redistribute it and/or modify */ -/* it under the terms of the GNU General Public License as published by */ -/* the Free Software Foundation; either version 2 of the License, or */ -/* (at your option) any later version. */ -/* */ -/* This program is distributed in the hope that it will be useful, */ -/* but WITHOUT ANY WARRANTY; without even the implied warranty of */ -/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See */ -/* the GNU General Public License for more details. */ -/* */ -/* You should have received a copy of the GNU General Public License */ -/* along with this program; if not, write to the Free Software */ -/* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -/* */ -/* File: mem_process.c */ -/* */ -/* Purpose: act as a memory hog for the memcg_control tests */ -/* */ -/* Author: Mohamed Naufal Basheer <[email protected] > */ -/* */ -/*****************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later +// Copyright (c) 2010 Mohamed Naufal Basheer +// Author: Mohamed Naufal Basheer #include <sys/types.h> #include <sys/mman.h>
testcases/kernel/controllers/memcg/control/memcg_control_test.sh +36 -113
188 lines not on this page · raw message
Signature · 5 lines
2.34.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v3 13/18 controllers: Update memcg/regression/* to new test and cgroup lib
In reply to Luke Nowakowski-KrijgerUpdate the tests in memcg/regression/* to use the new test lib and the newer cgroup lib to enable testing when either v1 or v2 memory controller is mounted. Only some tests still made sense to be testing with the v2 memory controller, otherwise they were skipped.
Also updated to the newer SPDX license identifier.
---
v2: change version numbers to 2 instead of v2.
Update to use new cg_init() and test_cg variable in memcg_test_3.c
v3: put cgroup_lib.sh include at bottom of file
.../memcg/regression/memcg_regression_test.sh | 203 +++++++++--------- .../memcg/regression/memcg_test_1.c | 40 ++-- .../memcg/regression/memcg_test_2.c | 24 +-- .../memcg/regression/memcg_test_3.c | 38 ++-- .../memcg/regression/memcg_test_4.c | 24 +-- .../memcg/regression/memcg_test_4.sh | 50 ++--- 6 files changed, 160 insertions(+), 219 deletions(-)
testcases/kernel/controllers/memcg/regression/memcg_regression_test.sh +104 -99
@@ -1,50 +1,16 @@ #! /bin/sh - -################################################################################ -## ## -## Copyright (c) 2009 FUJITSU LIMITED ## -## ## -## This program is free software; you can redistribute it and#or modify ## -## it under the terms of the GNU General Public License as published by ## -## the Free Software Foundation; either version 2 of the License, or ## -## (at your option) any later version. ## -## ## -## This program is distributed in the hope that it will be useful, but ## -## WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY ## -## or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ## -## for more details. ## -## ## -## You should have received a copy of the GNU General Public License ## -## along with this program; if not, write to the Free Software ## -## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ## -## ## -## Author: Li Zefan <[email protected]> ## -## Added memcg enable/disable functinality: Rishikesh K Rajak ## -## <[email protected] ## -## ## -################################################################################ - -cd $LTPROOT/testcases/bin - -export TCID="memcg_regression_test" -export TST_TOTAL=4 -export TST_COUNT=1 - -if [ "$(id -ru)" != 0 ]; then - tst_brkm TBROK ignored "Test must be run as root" - exit 0 -fi - -if [ "x$(grep -w memory /proc/cgroups | cut -f4)" != "x1" ]; then - tst_resm TCONF "Either memory resource controller kernel support absent" - tst_resm TCONF "or feature is not enabled; skipping all memcgroup testcases." - exit 0 -fi - -if tst_kvcmp -lt "2.6.30"; then - tst_brkm TBROK ignored "Test should be run with kernel 2.6.30 or newer" - exit 0 -fi +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (c) 2009 FUJITSU LIMITED +# Author: Li Zefan <[email protected]> +# Added memcg enable/disable functionality: Rishikesh K Rajak <[email protected]> + +TST_ID="memcg_regression_test" +TST_CLEANUP=cleanup +TST_SETUP=setup +TST_TESTFUNC=test_ +TST_NEEDS_ROOT=1 +TST_NEEDS_CMDS="killall kill" +TST_CNT=4 #buffer can rotate and number of found bugs can actually go down #so clear the buffer to avoid this
@@ -70,16 +36,16 @@ check_kernel_bug() # some kernel bug is detected if [ $new_bug -gt $nr_bug ]; then - tst_resm TFAIL "kernel BUG was detected!" + tst_res TFAIL "kernel BUG was detected!" fi if [ $new_warning -gt $nr_warning ]; then - tst_resm TFAIL "kernel WARNING was detected!" + tst_res TFAIL "kernel WARNING was detected!" fi if [ $new_null -gt $nr_null ]; then - tst_resm "kernel NULL pointer dereference!" + tst_res TWARN "kernel NULL pointer dereference!" fi if [ $new_lockdep -gt $nr_lockdep ]; then - tst_resm "kernel lockdep warning was detected!" + tst_res TWARN "kernel lockdep warning was detected!" fi nr_bug=$new_bug
@@ -89,10 +55,49 @@ check_kernel_bug() echo "check_kernel_bug found something!" dmesg - failed=1 return 0 } +setup() +{ + if tst_kvcmp -lt "2.6.30"; then + tst_brk TBROK "Test should be run with kernel 2.6.30 or newer" + fi + + cgroup_require "memory" + cgroup_version=$(cgroup_get_version "memory") + mount_point=$(cgroup_get_mountpoint "memory") + test_dir=$(cgroup_get_test_path "memory") + task_list=$(cgroup_get_task_list "memory") + if [ "$cgroup_version" = "2" ]; then + memory_limit="memory.max" + else + memory_limit="memory.limit_in_bytes" + fi + + [ "$cgroup_version" = "2" ] && ROD echo "+memory" \> "$test_dir/cgroup.subtree_control" + + tst_res TINFO "test starts with cgroup version $cgroup_version" +} + +cleanup() +{ + cleanup_testpath "$test_dir/0" + cgroup_cleanup +} + +create_testpath() +{ + local path="$1" + [ ! -e "$path" ] && ROD mkdir "$path" +} + +cleanup_testpath() +{ + local path="$1" + [ -e "$path" ] && ROD rmdir "$path" +} + #--------------------------------------------------------------------------- # Bug: The bug was, while forking mass processes, trigger memcgroup OOM, # then NULL pointer dereference may be hit.
@@ -102,16 +107,19 @@ check_kernel_bug() #--------------------------------------------------------------------------- test_1() { - mkdir memcg/0/ - echo 0 > memcg/0/memory.limit_in_bytes + local test_path + test_path="$test_dir/0" - ./memcg_test_1 + create_testpath "$test_path" + ROD echo 0 > "$test_path/$memory_limit" - rmdir memcg/0/ + ./memcg_test_1 "$test_path/$task_list" + + cleanup_testpath "$test_path" check_kernel_bug if [ $? -eq 1 ]; then - tst_resm TPASS "no kernel bug was found" + tst_res TPASS "no kernel bug was found" fi }
@@ -124,19 +132,31 @@ test_1() #--------------------------------------------------------------------------- test_2() { + local test_path + + # for cgroup2 writing to memory.max first checks the new limit against the + # current usage and will start killing processes if oom, therefore we do not + # expect EBUSY to be returned by the shrink operation. + if [ "$cgroup_version" = "2" ]; then + tst_res TCONF "Cgroup v2 found, skipping test" + return + fi + + test_path="$test_dir/0" + ./memcg_test_2 & pid1=$! sleep 1 - mkdir memcg/0 - echo $pid1 > memcg/0/tasks + create_testpath "$test_path" + ROD echo $pid1 > "$test_path"/tasks # let pid1 'test_2' allocate memory /bin/kill -SIGUSR1 $pid1 sleep 1 # shrink memory - echo 1 > memcg/0/memory.limit_in_bytes 2>&1 & + echo 1 > "$test_path"/memory.limit_in_bytes 2>&1 & pid2=$! # check if 'echo' will exit and exit with failure
@@ -146,26 +166,25 @@ test_2() if [ $? -ne 0 ]; then wait $pid2 if [ $? -eq 0 ]; then - tst_resm TFAIL "echo should return failure" - failed=1 + tst_res TFAIL "echo should return failure" kill -9 $pid1 $pid2 > /dev/null 2>&1 wait $pid1 $pid2 - rmdir memcg/0 + cleanup_testpath "$test_path" + return fi break fi done if [ $tmp -eq 5 ]; then - tst_resm TFAIL "'echo' doesn't exit!" - failed=1 + tst_res TFAIL "'echo' doesn't exit!" else - tst_resm TPASS "EBUSY was returned as expected" + tst_res TPASS "EBUSY was returned as expected" fi kill -9 $pid1 $pid2 > /dev/null 2>&1 wait $pid1 $pid2 > /dev/null 2>&1 - rmdir memcg/0 + cleanup_testpath "$test_path" } #---------------------------------------------------------------------------
@@ -176,19 +195,22 @@ test_2() #--------------------------------------------------------------------------- test_3() { - mkdir memcg/0 - for pid in `cat memcg/tasks`; do - echo $pid > memcg/0/tasks 2> /dev/null + local test_path + test_path="$test_dir/0" + create_testpath "$test_path" + + for pid in $(cat "$mount_point/$task_list"); do + echo $pid > "$test_path/$task_list" 2> /dev/null done - for pid in `cat memcg/0/tasks`; do - echo $pid > memcg/tasks 2> /dev/null + for pid in $(cat "$test_path/$task_list"); do + echo $pid > "$mount_point/$task_list" 2> /dev/null done - rmdir memcg/0 + cleanup_testpath "$test_path" check_kernel_bug if [ $? -eq 1 ]; then - tst_resm TPASS "no kernel bug was found" + tst_res TPASS "no kernel bug was found" fi }
@@ -200,11 +222,15 @@ test_3() #--------------------------------------------------------------------------- test_4() { - ./memcg_test_4.sh + local test_path + test_path="$test_dir/0" + create_testpath "$test_path" + + ./memcg_test_4.sh "$cgroup_version" "$mount_point" "$test_path" check_kernel_bug if [ $? -eq 1 ]; then - tst_resm TPASS "no kernel bug was found" + tst_res TPASS "no kernel bug was found" fi # test_4.sh might be killed by oom, so do clean up here
@@ -212,31 +238,10 @@ test_4() killall -9 memcg_test_4.sh 2> /dev/null # if test_4.sh gets killed, it won't clean cgroup it created - rmdir memcg/0 2> /dev/null + cleanup_testpath "$test_path" swapon -a } -# main -failed=0 -mkdir memcg/ - -for cur in $(seq 1 $TST_TOTAL); do - export TST_COUNT=$cur - - mount -t cgroup -o memory xxx memcg/ - if [ $? -ne 0 ]; then - tst_resm TFAIL "failed to mount memory subsystem" - failed=1 - continue - fi - - test_$cur - - umount memcg/ -done - -rmdir memcg/ - -exit $failed - +. cgroup_lib.sh +tst_run
testcases/kernel/controllers/memcg/regression/memcg_test_1.c +15 -25
@@ -1,24 +1,6 @@ -/******************************************************************************/ -/* */ -/* Copyright (c) 2009 FUJITSU LIMITED */ -/* */ -/* This program is free software; you can redistribute it and/or modify */ -/* it under the terms of the GNU General Public License as published by */ -/* the Free Software Foundation; either version 2 of the License, or */ -/* (at your option) any later version. */ -/* */ -/* This program is distributed in the hope that it will be useful, */ -/* but WITHOUT ANY WARRANTY; without even the implied warranty of */ -/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See */ -/* the GNU General Public License for more details. */ -/* */ -/* You should have received a copy of the GNU General Public License */ -/* along with this program; if not, write to the Free Software */ -/* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -/* */ -/* Author: Li Zefan <[email protected]> */ -/* */ -/******************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later +// Copyright (c) 2009 FUJITSU LIMITED +// Author: Li Zefan <[email protected]> #include <stdio.h> #include <stdlib.h>
@@ -33,17 +15,25 @@#define FORKED_PROC_COUNT 10 -int main (void ) +int main (int argc,char *argv[]) {char buf[10 ];int i;int loop;int pid; +int fd;int size =getpagesize (); -int fd =open ("memcg/0/tasks" ,O_WRONLY ); -if (fd <0 ) -return 1 ; +if (argc !=2 ) { +perror ("Invalid num of args" ); +exit (1 ); + } + + fd =open (argv[1 ],O_WRONLY ); +if (fd <0 ) { +perror ("Could not open tasklist" ); +exit (1 ); + }for (loop =0 ; loop <LOOP ; loop++) {for (i =0 ; i <FORKED_PROC_COUNT ; i++) {
testcases/kernel/controllers/memcg/regression/memcg_test_2.c +3 -21
@@ -1,24 +1,6 @@ -/******************************************************************************/ -/* */ -/* Copyright (c) 2009 FUJITSU LIMITED */ -/* */ -/* This program is free software; you can redistribute it and/or modify */ -/* it under the terms of the GNU General Public License as published by */ -/* the Free Software Foundation; either version 2 of the License, or */ -/* (at your option) any later version. */ -/* */ -/* This program is distributed in the hope that it will be useful, */ -/* but WITHOUT ANY WARRANTY; without even the implied warranty of */ -/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See */ -/* the GNU General Public License for more details. */ -/* */ -/* You should have received a copy of the GNU General Public License */ -/* along with this program; if not, write to the Free Software */ -/* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -/* */ -/* Author: Li Zefan <[email protected]> */ -/* */ -/******************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later +// Copyright (c) 2009 FUJITSU LIMITED +// Author: Li Zefan <[email protected]> #include <sys/mman.h> #include <signal.h>
testcases/kernel/controllers/memcg/regression/memcg_test_3.c +15 -23
@@ -17,12 +17,10 @@#include <sys/types.h> #include <sys/mount.h> #include "tst_test.h" +#include "tst_cgroup.h" -#define MNTPOINT "memcg" -#define SUBDIR "memcg/testdir" - -static int mount_flag;static volatile int sigcounter; +static struct tst_cg_group *test_cg; static void sighandler(int sig LTP_ATTRIBUTE_UNUSED) {
@@ -48,9 +46,10 @@ static void do_test(void)do_child ();while (sigcounter <50000 ) { -if (access (SUBDIR ,F_OK )) -SAFE_MKDIR (SUBDIR ,0644 ); -rmdir (SUBDIR ); + test_cg =tst_cg_group_mk (tst_cg,"test" ); + +if (test_cg) + test_cg =tst_cg_group_rm (test_cg); }SAFE_KILL (cpid,SIGKILL );
@@ -61,32 +60,25 @@ static void do_test(void)static void setup (void ) { -int ret; - -SAFE_MKDIR (MNTPOINT ,0644 ); +struct tst_cg_opts opts; +memset (&opts,0 ,sizeof (opts)); - ret =mount ("memcg" ,MNTPOINT ,"cgroup" ,0 ,"memory" ); -if (ret) { -if (errno ==ENOENT ) -tst_brk (TCONF |TERRNO ,"memcg not supported" ); - -tst_brk (TCONF |TERRNO ,"mounting memcg failed" ); - } - mount_flag =1 ; +tst_cg_require ("memory" , &opts); +tst_cg_init (); +if (TST_CG_VER (tst_cg,"memory" ) !=TST_CG_V1 ) +SAFE_CG_PRINT (tst_cg,"cgroup.subtree_control" ,"+memory" ); }static void cleanup (void ) { -if (!access (SUBDIR ,F_OK )) -SAFE_RMDIR (SUBDIR ); +if (test_cg) + test_cg =tst_cg_group_rm (test_cg); -if (mount_flag) -tst_umount (MNTPOINT ); +tst_cg_cleanup (); }static struct tst_test test = { .needs_root =1 , - .needs_tmpdir =1 , .forks_child =1 , .min_kver ="2.6.24" , .setup = setup,
testcases/kernel/controllers/memcg/regression/memcg_test_4.c +3 -21
@@ -1,24 +1,6 @@ -/******************************************************************************/ -/* */ -/* Copyright (c) 2009 FUJITSU LIMITED */ -/* */ -/* This program is free software; you can redistribute it and/or modify */ -/* it under the terms of the GNU General Public License as published by */ -/* the Free Software Foundation; either version 2 of the License, or */ -/* (at your option) any later version. */ -/* */ -/* This program is distributed in the hope that it will be useful, */ -/* but WITHOUT ANY WARRANTY; without even the implied warranty of */ -/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See */ -/* the GNU General Public License for more details. */ -/* */ -/* You should have received a copy of the GNU General Public License */ -/* along with this program; if not, write to the Free Software */ -/* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -/* */ -/* Author: Li Zefan <[email protected]> */ -/* */ -/******************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later +// Copyright (c) 2009 FUJITSU LIMITED +// Author: Li Zefan <[email protected]> #include <sys/mman.h> #include <err.h>
testcases/kernel/controllers/memcg/regression/memcg_test_4.sh +20 -30
64 lines not on this page · raw message
Signature · 5 lines
2.34.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v2 15/18 controllers: update memcg/functional to use newer cgroup lib
In reply to Luke Nowakowski-KrijgerUpdate memcg_lib.sh to uses the newer cgroup lib to cleanup the mounting and checking of the memory controller.
There are still some tests that make sense for v2 and should be modified in a future patch, but since most of the tests are testing specific v1 memory controller features lets just skip it for now if v2 is mounted.
---
v2: Use version number 2 instead of v2
.../memcg/functional/memcg_force_empty.sh | 2 +- .../controllers/memcg/functional/memcg_lib.sh | 54 ++++++++++--------- 2 files changed, 30 insertions(+), 26 deletions(-)
testcases/kernel/controllers/memcg/functional/memcg_force_empty.sh +1 -1
@@ -50,7 +50,7 @@ test6() { # writing to non-empty top mem cgroup's force_empty # should return failure - EXPECT_FAIL echo 1 \> /dev/memcg/memory.force_empty + EXPECT_FAIL echo 1 \> "$mount_point/memory.force_empty" } . memcg_lib.sh
testcases/kernel/controllers/memcg/functional/memcg_lib.sh +29 -25
113 lines not on this page · raw message
Signature · 5 lines
2.34.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v3 16/18 controllers: Update pids.sh to use newer cgroup lib
In reply to Luke Nowakowski-KrijgerUpdated to use the newer cgroup_lib to make mounting and cleanup nicer.
---
v2: Use version number 2 instead of v2
v3: put cgroup_lib.sh include in bottom of file
testcases/kernel/controllers/pids/pids.sh | 67 +++-------------------- 1 file changed, 9 insertions(+), 58 deletions(-)
testcases/kernel/controllers/pids/pids.sh +9 -58
@@ -36,66 +36,17 @@ cleanup() { killall -9 pids_task2 >/dev/null 2>&1 - tst_res TINFO "removing created directories" - rmdir $testpath - if [ "$mounted" -ne "1" ]; then - tst_res TINFO "Umounting pids" - umount $mount_point - rmdir $mount_point - fi -} - -setup_cgroupv2() -{ - mount_point=$(grep -w cgroup2 /proc/mounts | cut -f 2 | cut -d " " -f2) - if ! grep -q pids "$mount_point"/cgroup.controllers; then - tst_res TINFO "pids not supported on cgroup v2." - return - fi - - testpath="$mount_point/ltp_pids_$caseno" - ROD mkdir -p "$testpath" - task_list="cgroup.procs" - cgroup_v="v2" -} - -setup_cgroupv1() -{ - exist=`grep -w pids /proc/cgroups | cut -f1`; - if [ "$exist" = "" ]; then - tst_brk TCONF NULL "pids not supported" - fi - - mount_point=`grep -w pids /proc/mounts | cut -f 2 | cut -d " " -f2` - - if [ "$mount_point" = "" ]; then - mounted=0 - mount_point=/dev/cgroup - fi - - testpath=$mount_point/ltp_pids_$caseno - - if [ "$mounted" -eq "0" ]; then - ROD mkdir -p $mount_point - ROD mount -t cgroup -o pids none $mount_point - fi - ROD mkdir -p $testpath - task_list="tasks" - cgroup_v="v1" + cgroup_cleanup } setup() { - # If cgroup2 is mounted already, then let's - # try to start with cgroup v2. - if grep -q cgroup2 /proc/mounts; then - setup_cgroupv2 - fi - if [ -z "$cgroup_v" ]; then - setup_cgroupv1 - fi + cgroup_require "pids" + cgroup_version=$(cgroup_get_version "pids") + testpath=$(cgroup_get_test_path "pids") + task_list=$(cgroup_get_task_list "pids") - tst_res TINFO "test starts with cgroup $cgroup_v" + tst_res TINFO "test starts with cgroup version $cgroup_version" } start_pids_tasks2()
@@ -296,7 +247,7 @@ case8() { tst_res TINFO "set child cgroup limit smaller than its parent limit" ROD echo $max \> $testpath/pids.max - if [ "$cgroup_v" = "v2" ]; then + if [ "$cgroup_version" = "2" ]; then ROD echo +pids \> "$testpath"/cgroup.subtree_control fi mkdir $testpath/child
@@ -326,7 +277,7 @@ case9() tst_res TINFO "migrate cgroup" lim=$((max - 1)) - if [ "$cgroup_v" = "v2" ]; then + if [ "$cgroup_version" = "2" ]; then ROD echo +pids \> "$testpath"/cgroup.subtree_control fi for i in 1 2; do
@@ -391,5 +342,5 @@ do_test() case$caseno } -. tst_test.sh +. cgroup_lib.sh tst_run
Signature · 5 lines
2.34.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v2 17/18 controllers: update cpuset_regression_test.sh to use newer cgroup lib
In reply to Luke Nowakowski-KrijgerUpdate the test to use the newer cgroup lib which handles mounting for v1 and v2 controllers enabling them both to be tested and cleaning up the mounting and cleanup process.
---
v2: Change variable cgroup_v to cgroup_version
.../cpuset/cpuset_regression_test.sh | 26 +++++-------------- 1 file changed, 7 insertions(+), 19 deletions(-)
testcases/kernel/controllers/cpuset/cpuset_regression_test.sh +7 -19
@@ -122,18 +122,13 @@ cpuset_restore() setup() { - if ! is_cgroup_subsystem_available_and_enabled "cpuset"; then - tst_brk TCONF "Either kernel does not support cpuset controller or feature not enabled" - fi - - # We need to mount cpuset if it is not found. - root_cpuset_dir=$(get_cgroup_mountpoint cpuset) - if [ -z "$root_cpuset_dir" ]; then - root_cpuset_dir="$LOCAL_MOUNTPOINT" + cgroup_require "cpuset" + cgroup_version=$(cgroup_get_version "cpuset") + root_cpuset_dir=$(cgroup_get_mountpoint "cpuset") + testpath=$(cgroup_get_test_path "cpuset") + task_list=$(cgroup_get_task_list "cpuset") - ROD_SILENT mkdir -p ${root_cpuset_dir} - ROD_SILENT mount -t cpuset cpuset ${root_cpuset_dir} - fi + tst_res TINFO "test starts with cgroup version $cgroup_version" if ! [ -f ${root_cpuset_dir}/${cpu_exclusive} ]; then cpu_exclusive=cpu_exclusive
@@ -180,14 +175,7 @@ cleanup() echo ${old_cpu_exclusive_value} > ${root_cpuset_dir}/${cpu_exclusive} fi - if [ -d "$LOCAL_MOUNTPOINT" ]; then - umount ${LOCAL_MOUNTPOINT} - if [ $? -ne 0 ]; then - tst_res TWARN "'umount ${LOCAL_MOUNTPOINT}' failed" - fi - - rmdir ${LOCAL_MOUNTPOINT} - fi + cgroup_cleanup } test()
Signature · 5 lines
2.34.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v3 18/18 controllers: update cgroup_regression_test to use newer cgroup lib
In reply to Luke Nowakowski-KrijgerThe older function in the cgroup lib 'get_cgroup_mountpoint' has been removed, so instead replace it with its old functionaility to get mountpoint.
Also use the newer cgroup lib require operation to mount and cleanup a cpu controller.
---
v2: Use cgroup_require "$subsys" instead of manual greping the path
v3: fixed bug where the ouput of cgroup_get_mountpoint wasnt being captured
.../cgroup/cgroup_regression_test.sh | 31 ++++++------------- 1 file changed, 9 insertions(+), 22 deletions(-)
testcases/kernel/controllers/cgroup/cgroup_regression_test.sh +9 -22
@@ -168,17 +168,8 @@ test3() return fi - cpu_subsys_path=$(get_cgroup_mountpoint "cpu") - - # Run the test for 30 secs - if [ -z "$cpu_subsys_path" ]; then - mount -t cgroup -o cpu xxx cgroup/ - if [ $? -ne 0 ]; then - tst_res TFAIL "Failed to mount cpu subsys" - return - fi - cpu_subsys_path=cgroup - fi + cgroup_require "cpu" + cpu_subsys_path=$(cgroup_get_mountpoint "cpu") cgroup_regression_3_1.sh $cpu_subsys_path & pid1=$!
@@ -191,7 +182,7 @@ test3() wait $pid2 2>/dev/null rmdir $cpu_subsys_path/0 2> /dev/null - tst_umount $PWD/cgroup + cgroup_cleanup check_kernel_bug }
@@ -303,21 +294,15 @@ test6() test_7_1() { local subsys=$1 + local subsys_path # we should be careful to select a $subsys_path which is related to # cgroup only: if cgroup debugging is enabled a 'debug' $subsys # could be passed here as params and this will lead to ambiguity and # errors when grepping simply for 'debug' in /proc/mounts since we'll # find also /sys/kernel/debug. Helper takes care of this. - local subsys_path=$(get_cgroup_mountpoint $subsys) - - if [ -z "$subsys_path" ]; then - mount -t cgroup -o $subsys xxx cgroup/ - if [ $? -ne 0 ]; then - tst_res TFAIL "failed to mount $subsys" - return - fi - subsys_path=cgroup - fi + + cgroup_require "$subsys" + subsys_path=$(cgroup_get_mountpoint "$subsys") mkdir $subsys_path/0 sleep 100 < $subsys_path/0 & # add refcnt to this dir
@@ -332,6 +317,8 @@ test_7_1() wait $! 2>/dev/null umount cgroup/ fi + + cgroup_cleanup } test_7_2()
Signature · 5 lines
2.34.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [PATCH v3 18/18] controllers: update cgroup_regression_test to use newer cgroup lib
testcases/kernel/controllers/cgroup/cgroup_regression_test.sh
Quoted 23 lines · Luke Nowakowski-Krijger
The older function in the cgroup lib '
get_cgroup_mountpoint' has been removed, so instead replace it with its old functionaility to get mountpoint.Also use the newer cgroup lib require operation to mount and cleanup a cpu controller.
Signed-off-by: Luke Nowakowski-Krijger < [email protected]>
---
v2: Usecgroup_require"$subsys" instead of manual greping the path
v3: fixed bug where the ouput ofcgroup_get_mountpointwasnt being captured.../cgroup/cgroup_regression_test.sh | 31 ++++++------------- 1 file changed, 9 insertions(+), 22 deletions(-)testcases/kernel/controllers/cgroup/cgroup_regression_test.sh +0
-0
This patch itself looks good.
Note:
But I got one failure from test7 that was caused by randomly picking up 'rdma' ctrl to test.
tst_cgroup.c:820: TBROK: 'rdma' controller is unknown to LTP cgroup_regression_test 7 TBROK: cgroup_require: No state was set after call to tst_cgctl require?
# cat -n cgroup_regression_test.sh
359 test7()
360 {
...
371 subsys=`tail -n 1 /proc/cgroups | awk '{ print $1 }'`379 }
Because on my aarch64 (Cgroup V2) test box, the last one in /proc/cgroups:
# cat /proc/cgroups #subsys_name hierarchy num_cgroups enabled cpuset 3 3 1 cpu 2 82 1 cpuacct 2 82 1 blkio 9 82 1 memory 12 288 1 devices 4 82 1 freezer 11 3 1 net_cls 6 3 1 perf_event 8 3 1 net_prio 6 3 1 hugetlb 10 3 1 pids 5 110 1 rdma 7 1 1
Anyway, we can fix this by picking a supported cgroup ctrl in a separate patch.
Signature · 2 lines
Regards, Li Wang
Signature · 2 lines
-- Mailing list info: https://lists.linux.it/listinfo/ltp
Hi Luke,
could you please next time use the same version number for all patches? Having different versions (patches have v2, v3, v5) is quite confusing.
Kind regards,
Petr
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Hi Petr,
Quoted 8 lines · Petr Vorel
Hi Luke,
could you please next time use the same version number for all patches? Having different versions (patches have v2, v3, v5) is quite confusing.
Kind regards,
Petr
Yeah I agree..
It was supposed to make it easier to not have to re review stuff when the version hasn't changed, but it gets quite confusing.
I'll use the same version number next time.
- Luke
Signature · 2 lines
-- Mailing list info: https://lists.linux.it/listinfo/ltp
Quoted 13 lines
Hi Petr,
Quoted 7 lines · Petr Vorel
Hi Luke,
could you please next time use the same version number for all patches? Having different versions (patches have v2, v3, v5) is quite confusing.
Kind regards,
Petr
Quoted 5 lines
Yeah I agree..
It was supposed to make it easier to not have to re review stuff when the version hasn't changed, but it gets quite confusing.
I'll use the same version number next time.
Thanks!
NOTE: If you want to increase readability, just add "Changes vN+1->vN:" into cover letter (or to patches themselves).
Kind regards,
Petr
Quoted 1 line
- Luke
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Hi All,
I have completed my review (and test) on this patch set, generally looks good!
With regard to the tiny issues, I think Luke you can just against the concrete
problem to follow up and fix it. No need to resend all patches with a new version.
I would suggest merging this patchset at present (in case of blocking other's (or duplicate) work).
CI builds pass: https://github.com/wangli5665/ltp/runs/7460955660
Signature · 2 lines
Regards, Li Wang
Signature · 2 lines
-- Mailing list info: https://lists.linux.it/listinfo/ltp
Richard Palethorpe
Reviewed-byHello,
Quoted 4 lines · Li Wang
Hi All,
I have completed my review (and test) on this patch set, generally looks good!
Quoted 8 lines
With regard to the tiny issues, I think Luke you can just against the concrete problem to follow up and fix it. No need to resend all patches with a new version.
I would suggest merging this patchset at present (in case of blocking other's (or duplicate) work).
CI builds pass: https://github.com/wangli5665/ltp/runs/7460955660
Reviewed-by Li Wang <[email protected]>
I'm also very keen to get this merged and can make the necessary fixups. However I will give Petr Vorel chance to look at the shell tests.
Signature · 5 lines
Thank you, Richard. -- Mailing list info: https://lists.linux.it/listinfo/ltp
Hi all,
Quoted 13 lines
Hello,
Quoted 8 lines · Li Wang
Hi All,
I have completed my review (and test) on this patch set, generally looks good!
With regard to the tiny issues, I think Luke you can just against the concrete problem to follow up and fix it. No need to resend all patches with a new version.
I would suggest merging this patchset at present (in case of blocking other's (or duplicate) work).
Quoted 7 lines
Quoted 3 lines
CI builds pass: https://github.com/wangli5665/ltp/runs/7460955660
Reviewed-by Li Wang <[email protected]>I'm also very keen to get this merged and can make the necessary fixups. However I will give Petr Vorel chance to look at the shell tests.
I can send tomorrow proposed fixes (diff or a patchset) so that we get the rest merged this week.
Kind regards,
Petr
Quoted 1 line
Reviewed-by Richard Palethorpe <[email protected]>
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp