Add custom functions to map cpu.cfs_quota_us <-> cpu.max and
cpu.cfs_period_us <-> cpu.max. These mappings can be 1->N or
N->1 and utilize custom values for limits, "-1" in cgroup v1
and "max" in cgroup v2.
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com> Reviewed-by: Kamalesh Babulal <kamalesh.babulal@oracle.com>
Tom Hromatka [Wed, 15 Dec 2021 20:39:52 +0000 (20:39 +0000)]
wrapper: Add function to remove name/value pair from a controller
Add a function to remove a name/value settings pair from
a cgroup_controller instance. As part of this change, I did a small
refactor on cgroup_free_controllers() to make the code more reusable
throughout libcgroup.
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com> Reviewed-by: Kamalesh Babulal <kamalesh.babulal@oracle.com>
Tom Hromatka [Wed, 15 Dec 2021 20:39:22 +0000 (20:39 +0000)]
api.c: Add const qualifier to parameters in cgroup_read_value_begin()
Make two string parameters passed into cgroup_read_value_begin()
fully constant, i.e. const char * const. These parameters,
controller and name, are only used as read-only variables
within cgroup_read_value_begin() and are not intended to be
modified.
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com> Reviewed-by: Kamalesh Babulal <kamalesh.babulal@oracle.com>
Tom Hromatka [Wed, 15 Dec 2021 20:37:37 +0000 (20:37 +0000)]
api.c/wrapper/abstraction: Save previous setting name in control_value
When there's an N->1 mapping, the abstraction layer needs
to know which "1" setting to map back to. Add a field to
struct control_value that saves off the original setting,
so that the abstraction layer can know how to map back from
an N->1 setting.
A good example of this is cpu.max/cpu.cfs_quota_us. The
abstraction layer will map cpu.cfs_quota_us to cpu.max.
During the return conversion, the abstraction layer needs
to know whether to map cpu.max to cfs_quota_us or
cfs_period_us.
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com> Reviewed-by: Kamalesh Babulal <kamalesh.babulal@oracle.com>
Tom Hromatka [Wed, 15 Dec 2021 21:11:28 +0000 (21:11 +0000)]
abstraction: Add name conversion function
Add a function to the abstraction layer that can convert from
one cgroup setting name to another setting name. The values are
not adjusted by this function. For example, this can be used for
conversions like cpuset.effective_cpus to cpuset.cpus.effective.
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com> Reviewed-by: Kamalesh Babulal <kamalesh.babulal@oracle.com>
Tom Hromatka [Fri, 28 Jan 2022 17:22:49 +0000 (10:22 -0700)]
cgxset: Introduce cgxset
Add a new libcgroup tool - cgxset. cgxset is based upon cgset,
but it supports converting from cgroup version to another.
For example, a request like the following will work on a system
running the cgroup v1 cpu controller or the cgroup v2 cpu
controller.
$ cgxset -2 -r cpu.weight=42 MyCgroup
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com> Reviewed-by: Kamalesh Babulal <kamalesh.babulal@oracle.com>
Tom Hromatka [Fri, 28 Jan 2022 17:22:11 +0000 (10:22 -0700)]
cgxget: Introduce cgxget
Add a new libcgroup tool - cgxget. cgxget is based upon cgget,
but it supports converting from cgroup version to another.
For example, a request like the following will work on a system
running the cgroup v1 cpu controller or the cgroup v2 cpu controller.
$ cgxget -2 -r cpu.weight MyCgroup
The return value to the user will match the cgroup version requested.
If the user requests a v1 setting, the return value will be a cgroup
v1 setting. If the user requests a v2 setting, the return value will
be a cgroup v2 setting.
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com> Reviewed-by: Kamalesh Babulal <kamalesh.babulal@oracle.com>
Tom Hromatka [Wed, 15 Dec 2021 20:18:54 +0000 (20:18 +0000)]
abstraction: Add function to convert from one cgroup version to another
Add a function - cgroup_convert_cgroup() - that can convert from
one cgroup version to another. This function will be the building
block for the libcgroup abstraction layer.
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com> Reviewed-by: Kamalesh Babulal <kamalesh.babulal@oracle.com>
Tom Hromatka [Wed, 15 Dec 2021 20:14:11 +0000 (20:14 +0000)]
abstraction: Add integer conversion function
Add a function to the abstraction layer that can convert from
one integer setting to another. For example, this can be used
for simple conversions like cpu.shares to cpu.weight and vice
versa.
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com> Reviewed-by: Kamalesh Babulal <kamalesh.babulal@oracle.com>
Tom Hromatka [Wed, 15 Dec 2021 19:37:36 +0000 (19:37 +0000)]
api.c: Remove static from cgroup_copy_controller_values()
Remove static from cgroup_copy_controller_values() in api.c
so that other files within libcgroup can invoke it. It will
be used by the abstraction layer code in a subsequent commit.
Also, declare *dst as a const pointer and *src as a const *
const pointer. Subsequent abstraction layer checkins make
heavy use of const and without these changes, warnings (which
continuous integration converts to errors) are thrown.
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com> Reviewed-by: Kamalesh Babulal <kamalesh.babulal@oracle.com>
Tom Hromatka [Wed, 15 Dec 2021 19:30:30 +0000 (19:30 +0000)]
wrapper.c: Store the version in struct cgroup_controller
Store the cgroup version in struct cgroup_controller. Each
controller can be mounted separately, and thus the cgroup
version is applicable at the controller level.
Note that this commit requires cgroup_init() to be called by
cgconfigparser. Storing the version in the cgroup_controller
struct requires the cg_mount_table[] to be populated.
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com> Reviewed-by: Kamalesh Babulal <kamalesh.babulal@oracle.com>
Commit f852cad3fd64 ("ftests: Delete the cgclear functional test"),
removed the testcase 028-cgclear-basic_cgclear.py. Drop the skip
argument from the ftests-nocontainer.sh to skip the non-existing
testcase.
Suggested-by: Tom Hromatka <tom.hromatka@oracle.com> Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
Tom Hromatka [Wed, 2 Feb 2022 17:48:10 +0000 (17:48 +0000)]
ftests: Add a test for unmappable settings
-----------------------------------------------------------------
Test Results:
Run Date: Feb 02 17:47:50
Passed: 1 test(s)
Skipped: 0 test(s)
Failed: 0 test(s)
-----------------------------------------------------------------
Timing Results:
Test Time (sec)
---------------------------------------
setup 0.00
042-cgxget-unmappable.py 0.19
teardown 0.00
---------------------------------------
Total Run Time 0.19
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
Tom Hromatka [Thu, 16 Dec 2021 15:06:10 +0000 (08:06 -0700)]
ftests: Add a test for the python bindings to library_version()
Add a functional test that exercises the library_version() python
bindings.
-----------------------------------------------------------------
Test Results:
Run Date: Oct 27 15:53:49
Passed: 1 test(s)
Skipped: 0 test(s)
Failed: 0 test(s)
-----------------------------------------------------------------
Timing Results:
Test Time (sec)
---------------------------------------------------------
setup 0.00
040-pybindings-library_version.py 0.00
teardown 0.00
---------------------------------------------------------
Total Run Time 0.00
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
Tom Hromatka [Thu, 16 Dec 2021 15:05:42 +0000 (08:05 -0700)]
ftests: Add a test for the python bindings to cgroup_cgxset()
Add a test for the python bindings to cgroup_cgxset()
-----------------------------------------------------------------
Test Results:
Run Date: Oct 13 15:34:29
Passed: 1 test(s)
Skipped: 0 test(s)
Failed: 0 test(s)
-----------------------------------------------------------------
Timing Results:
Test Time (sec)
---------------------------------------------------------
setup 0.00
039-pybindings-cgxset.py 0.06
teardown 0.00
---------------------------------------------------------
Total Run Time 0.06
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
Tom Hromatka [Thu, 16 Dec 2021 15:04:35 +0000 (08:04 -0700)]
ftests: Add a test for the python bindings to cgroup_cgxget()
Add a functional test that exercises the cgroup_cgxget() python
bindings.
-----------------------------------------------------------------
Test Results:
Run Date: Oct 11 22:11:48
Passed: 1 test(s)
Skipped: 0 test(s)
Failed: 0 test(s)
-----------------------------------------------------------------
Timing Results:
Test Time (sec)
---------------------------------------------------------
setup 0.00
038-pybindings-cgxget.py 0.04
teardown 0.00
---------------------------------------------------------
Total Run Time 0.04
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
Tom Hromatka [Thu, 16 Dec 2021 15:04:17 +0000 (08:04 -0700)]
ftests: Add a cgxget/cgxset test for the cpuset controller
Add a functional test that exercises the cpuset v1/v2 mappings.
-----------------------------------------------------------------
Test Results:
Run Date: Sep 08 11:17:19
Passed: 1 test(s)
Skipped: 0 test(s)
Failed: 0 test(s)
-----------------------------------------------------------------
Timing Results:
Test Time (sec)
---------------------------------------------------------
setup 0.00
038-cgxget-cpuset_settings.py 1.34
teardown 0.00
---------------------------------------------------------
Total Run Time 1.34
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
Tom Hromatka [Thu, 16 Dec 2021 14:59:44 +0000 (07:59 -0700)]
ftests: Add a cgxget/cgxset test for the cpu controller
Add a functional test that exercises the cpu v1/v2 mappings.
-----------------------------------------------------------------
Test Results:
Run Date: Apr 19 18:39:16
Passed: 1 test(s)
Skipped: 0 test(s)
Failed: 0 test(s)
-----------------------------------------------------------------
Timing Results:
Test Time (sec)
---------------------------------------------------------
setup 0.00
037-cgxget-cpu_settings.py 0.50
teardown 0.00
---------------------------------------------------------
Total Run Time 0.50
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
Kamalesh Babulal [Thu, 27 Jan 2022 19:33:52 +0000 (12:33 -0700)]
api.c: add support for cgroup.threads
cgroup_build_tasks_procs_path(), that builds the proc path for moving
the tid, doesn't check for the cgroup type and appends cgroup.procs for
both cgroup v1/v2. With cgroup v2, this results in building a wrong
proc path if the cgroup type is threaded. This patch adds support to
check for the cgroup v2 type and build the proc path according to the
below table:
cgroup.type | proc file | Description |
----------------+----------------+------------------------------------+
domain | cgroup.procs | regular cgroup, all threads gets |
| | moved to the cgroup. |
domain threaded | cgroup.procs | root of threaded subtree, all |
| | threads gets moved to the cgroup. |
threaded | cgroup.threads | cgroup under threaded subtree, |
| | single threads with matching tid, |
| | gets moved to the cgroup. |
domain invalid | N/A | invalid state of a cgroup under the|
| | threaded subtree. |
Closes: https://github.com/libcgroup/libcgroup/issues/64 Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
Kamalesh Babulal [Tue, 25 Jan 2022 15:57:03 +0000 (15:57 +0000)]
ftests: add a test for cgroup v2 threaded support
Add a functional test to verify threaded cgroup support on a
cgroup v2 filesystem.
-----------------------------------------------------------------
Test Results:
Run Date: Jan 25 10:41:34
Passed: 1 test(s)
Skipped: 0 test(s)
Failed: 0 test(s)
-----------------------------------------------------------------
Timing Results:
Test Time (sec)
----------------------------------------
setup 0.00
036-cgset-multi_thread.py 0.10
teardown 0.00
----------------------------------------
Total Run Time 0.10
Suggested-by: Tom Hromatka <tom.hromatka@oracle.com> Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
TJH: Minor cleanups to utilize the new set_and_validate() method
Kamalesh Babulal [Tue, 25 Jan 2022 15:47:27 +0000 (15:47 +0000)]
process.py: add support to spawn a multithreaded process
Add support for creating a multithreaded process. The multithreaded
process gets created by spawning a new process, that in turn creates
N threads. The thread function is a while loop, that sleeps for N
seconds. Currently, there is no support for waiting for the threads
to join, and to stop the threads, the spawned process needs to be
terminated/killed.
Suggested-by: Tom Hromatka <tom.hromatka@oracle.com> Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
Tom Hromatka [Fri, 21 Jan 2022 22:19:30 +0000 (22:19 +0000)]
ftests: Utilize the new Cgroup validate functions
Replace the boilerplate copy/paste code of get, compare,
and fail-on-error with calls to Cgroup.get_and_validate()
and Cgroup.set_and_validate(). This is purely a cleanup
commit and is nonfunctional.
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com> Reviewed-by: Kamalesh Babulal <kamalesh.babulal@oracle.com>
Tom Hromatka [Fri, 21 Jan 2022 22:15:35 +0000 (22:15 +0000)]
cgroup: Add helper methods to validate get/set
Add helper methods, get_and_validate() and set_and_validate().
These methods do not map directly to any libcgroup command
line interfaces, but should be useful in reducing copy/paste
boilerplate code.
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com> Reviewed-by: Kamalesh Babulal <kamalesh.babulal@oracle.com>
Kamalesh Babulal [Tue, 18 Jan 2022 15:22:13 +0000 (08:22 -0700)]
api.c: cache cgrules with CGFLAG_USECACHE flag
pam_cgroup.so plugin uses /etc/cgrules.conf to assign processes
to the requested cgroup. This works well with active
cgrulesengd but in the instances where cgrulesengd is disabled,
the rules are not read and cached by default. Fix this is by
reloading and caching the rules when called with CGFLAG_USECACHE
flag.
Fixes: https://github.com/libcgroup/libcgroup/issues/84 Reported-by: Kent Overstreet <kent.overstreet@gmail.com> Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
TJH: Minor commit comment changes
Ingo van Lil [Thu, 16 Dec 2021 20:32:23 +0000 (13:32 -0700)]
Initialize cgroup version for named V1 hierarchy
Commit 3aac9889 added the 'version' field in cg_mount_table_s and
initializes it in cgroup_process_v1_mnt(). The same initialization is
required in a second place dealing with named hierarchies.
Signed-off-by: Ingo van Lil <inguin@gmx.de> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
Tom Hromatka [Tue, 7 Dec 2021 16:36:51 +0000 (09:36 -0700)]
github: Force a fresh clone on all self-hosted runners
The cgroup v2 job is being run on a self-hosted runner that
re-uses the workspace. Delete the local workspace on all
self-hosted runners prior to cloning the repo.
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
Tom Hromatka [Tue, 7 Dec 2021 16:14:26 +0000 (09:14 -0700)]
tests: Update submodule to the latest commit on libcgroup-tests main branch
Closes: https://github.com/libcgroup/libcgroup/issues/71 Reported-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
Tom Hromatka [Mon, 6 Dec 2021 21:55:17 +0000 (14:55 -0700)]
ftests: Add a test to get/set cgroup.type
Add a functional test that can get/set cgroup.type on a
cgroup v2 filesystem.
-----------------------------------------------------------------
Test Results:
Run Date: Dec 06 14:40:46
Passed: 1 test(s)
Skipped: 0 test(s)
Failed: 0 test(s)
-----------------------------------------------------------------
Timing Results:
Test Time (sec)
-------------------------------------------
setup 0.00
035-cgset-set_cgroup_type.py 2.30
teardown 0.00
-------------------------------------------
Total Run Time 2.30
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
Ross Burton [Thu, 2 Dec 2021 10:51:28 +0000 (10:51 +0000)]
automake: idiomatically mark test libraries as convenience libraries
Instead of installing then deleting, mark the libraries which are only
used at build time and should not be installed as noinst, so they don't
get installed at all.
Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
Tom Hromatka [Fri, 12 Nov 2021 13:55:20 +0000 (06:55 -0700)]
automake: Don't install testing libraries
libcgset and libcgfortesting are libraries that are used by the
unit test framework and are not intended to be installed when
`make install` is invoked. Delete them from the install path.
Closes: https://github.com/libcgroup/libcgroup/issues/62 Reviewed-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
Tom Hromatka [Fri, 12 Nov 2021 13:51:36 +0000 (06:51 -0700)]
automake: Link libcgset with libcgroup
When linking with the -Wl,--no-undefined flag enabled, libcgset
fails due to undefined symbols. Fix this by enabling this flag
and linking with libcgroup.la
Closes: https://github.com/libcgroup/libcgroup/issues/66 Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
Kamalesh Babulal [Thu, 28 Oct 2021 20:25:09 +0000 (14:25 -0600)]
ftests.py: fix test results timing alignment
The current width length of 35 characters, used as alignment for the
first column in the timing results of ftests.sh.log is not enough and
results in misaligned output. Fix it by assigning the columns format
strings width to the longest filename, calculated just before executing
every testcase. This avoids adjusting the width every time, with newer
testcases. Also, fix the banner separator lines to match the width of
the filename column + 15 (time), dynamically.
Kamalesh Babulal [Thu, 21 Oct 2021 21:28:45 +0000 (15:28 -0600)]
ftests: testcase 013 - remove debug statements
Remove the debugging statements that print the return values
(result, cause) from testcase 013-cgget-multiple_g_flags.py.
These values show up in ftests.sh.log, otherwise, and might
lead to confusion on how to interpret them.
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
Kamalesh Babulal [Thu, 21 Oct 2021 21:18:28 +0000 (15:18 -0600)]
github: re-arrange workflow run commands
The current workflow executes the functional tests from the make check
called at the top-level source directory. Though this runs the tests
case, it also has an unintended side effect of re-running gunit tests
for every functional test combination in the workflow. Fix it, by
re-arranging the function test run commands, to change into
tests/ftests directory before executing make check.
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
Ross Burton [Fri, 10 Sep 2021 17:24:47 +0000 (11:24 -0600)]
configure.ac: check for the library containing fts_open
The musl C library doesn't provide fts.h[1], so libcgroup doesn't
compile with musl. However, there is a standalone implementation of fts
for musl users[2] which can be used.
Use AC_SEARCH_LIBS to search for fts_open, which will check if it is part
of libc, and if not look in libfts, then set LIBS if needed.
Signed-off-by: Ross Burton <ross.burton@arm.com>
[TJH: minor formatting changes to match existing configure.ac] Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
Tom Hromatka [Wed, 21 Jul 2021 15:40:45 +0000 (09:40 -0600)]
README.md: Display status of main branch in build status badge
The master branch was renamed to main, but the build status
badge wasn't updated as part of this change. Display the
build status of the main branch in README.md
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
Tom Hromatka [Tue, 6 Jul 2021 15:16:09 +0000 (09:16 -0600)]
github: Delete the tests folder before bootstrap
On self-hosted github machines, the working directory for
libcgroup is reused from one run to the next. This is fine
for the root of the directory as the proper git clean/reset
commands are issues. But this is problematic for the git
submodules like the tests/ folder because clean/reset is nott
run there.
Remove the tests/ directory entirely and rely on ./bootstrap.sh
to recreate and populate it.
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
Replace __BEGIN_DECLS and __END_DECLS with extern "C".
The macros __BEGIN_DECLS and __END_DECLS are a GNU-ism found in
glibc and uClibc, but not musl. We replace them by the more general
extern "C" { ... } block exposed only if we have __cplusplus.
Forward ported from a patch by Anthony G. Basile <blueness@gentoo.org>.
Signed-off-by: Alex Xu (Hello71) <alex_y_xu@yahoo.ca> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
Tom Hromatka [Wed, 2 Jun 2021 19:46:48 +0000 (19:46 +0000)]
ftests: Skip test 032 due to Github Issue #50
On full cgroup v2 systems, skip 032-lscgroup-multiple_g_flags.py
due to Github Issue #50. Currently lscgroup is doing path matching
on the mounts that have the same path as the cgroup rather than
reading cgroup.controllers for that particular cgroup. I'm afraid
fixing it could involve a non-trivial rewrite of lscgroup since it
doesn't use any of the common structures used elsewhere in libcgroup.
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
Tom Hromatka [Wed, 2 Jun 2021 20:37:21 +0000 (20:37 +0000)]
ftests: Skip test 031 due to Github Issue #50
On full cgroup v2 systems, skip 031-lscgroup-g_flag.py
due to Github Issue #50. Currently lscgroup is doing path matching
on the mounts that have the same path as the cgroup rather than
reading cgroup.controllers for that particular cgroup. I'm afraid
fixing it could involve a non-trivial rewrite of lscgroup since it
doesn't use any of the common structures used elsewhere in libcgroup.
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
Tom Hromatka [Wed, 2 Jun 2021 13:33:14 +0000 (13:33 +0000)]
cgroup.py: Fix bug in delete with multiple controllers
When multiple controllers are passed into Cgroup.delete()
via a list, delete() was erroneously joining them without
a comma separator. Add the comma separator.
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
Tom Hromatka [Wed, 2 Jun 2021 13:58:53 +0000 (13:58 +0000)]
ftests: Modify functional test 005 to support cgroup v2
Add support for a full cgroup v2 system to the
005-cgsnapshot-basic_snapshot_v2.py functional test. It
continues to support cgroup v1 systems and mixed systems
as well.
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>