The test cases, that cover the unlikely conditions, are numbered in the
reverse starting from 999, similarly, test case 098 tries to delete a
non-existent shared point. Re-number it from '099' -> '998' to hint
at the nature of the test case.
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit 259928ed2aaac5c15a75b42c9c25583a1c707ef8)
tests/gunit: Extend the fuzzer to test cgroup_set_value_bool()
Add fuzzing to the cgroup_set_value_bool() API, by passing combination
of valid/NULL as arguments to the API.
[----------] 12 tests from APIArgsTest
[ RUN ] APIArgsTest.API_cgroup_set_permissions
[ OK ] APIArgsTest.API_cgroup_set_permissions (1 ms)
[ RUN ] APIArgsTest.API_cgroup_new_cgroup
[ OK ] APIArgsTest.API_cgroup_new_cgroup (0 ms)
[ RUN ] APIArgsTest.API_cgroup_set_value_string
[ OK ] APIArgsTest.API_cgroup_set_value_string (0 ms)
[ RUN ] APIArgsTest.API_cgroup_get_value_string
[ OK ] APIArgsTest.API_cgroup_get_value_string (0 ms)
[ RUN ] APIArgsTest.API_cgroup_add_controller
[ OK ] APIArgsTest.API_cgroup_add_controller (0 ms)
[ RUN ] APIArgsTest.API_cgroup_add_value_string
[ OK ] APIArgsTest.API_cgroup_add_value_string (0 ms)
[ RUN ] APIArgsTest.API_cgroup_get_uid_gid
[ OK ] APIArgsTest.API_cgroup_get_uid_gid (0 ms)
[ RUN ] APIArgsTest.API_cgroup_set_value_int64
[ OK ] APIArgsTest.API_cgroup_set_value_int64 (0 ms)
[ RUN ] APIArgsTest.API_cgroup_get_value_int64
[ OK ] APIArgsTest.API_cgroup_get_value_int64 (0 ms)
[ RUN ] APIArgsTest.API_cgroup_set_value_uint64
[ OK ] APIArgsTest.API_cgroup_set_value_uint64 (0 ms)
[ RUN ] APIArgsTest.API_cgroup_get_value_uint64
[ OK ] APIArgsTest.API_cgroup_get_value_uint64 (0 ms)
[ RUN ] APIArgsTest.API_cgroup_set_value_bool
[ OK ] APIArgsTest.API_cgroup_set_value_bool (0 ms)
[----------] 12 tests from APIArgsTest (1 ms total)
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit 235874aea5f1c055c4ae99d0f41ea6e7f650aa96)
The second argument passed to cgroup_set_value_bool() is of type
char * and the user might pass NULL in the place of the argument,
causing a segfault. The reason is, argument values are used without
checks, fix it by checking for NULL pointers before proceeding.
Reproducer:
----------
#include <stdlib.h>
#include <libcgroup.h>
int main(void)
{
struct cgroup_controller *cgc;
struct cgroup *cgrp;
int ret;
ret = cgroup_init();
if (ret)
exit(1);
cgrp = cgroup_new_cgroup("fuzzer");
if (!cgrp)
exit(1);
cgc = cgroup_add_controller(cgrp, "cpuset");
if (!cgc)
exit(1);
ret = cgroup_add_value_string(cgc, "cpuset.cpu_exclusive", "0");
if (ret)
exit (1);
cgroup_set_value_bool(cgc, NULL, 0);
//should not reach here
return 0;
}
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit 6b5762ceaca18122b8d7a233b1d3453945594d32)
tools/cgxset: check for delimiter in name_value string
While parsing -r option for name, and value pairs, we rely on strtok()
to return NULL, when there is no delimiter and lhf/rhf can't be mapped
into the name, and value tokens. This assumption is not true, strtok()
returns the whole string when it doesn't find the delimiter. Operating
under this assumption also segfaults later in the code. Fix it, by
checking for the presence of a delimiter in the passed name_value_str
in parse_r_flag(). This also initializes the pointer to NULL, to avoid
reading them before assignment in the error path.
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit bc414f494686c3bc66f2747b61c80a4f6e9118f5)
tools/cgset: check for delimiter in name_value string
While parsing -r option for name, and value pairs, we rely on strtok()
to return NULL, when there is no delimiter and lhf/rhf can't be mapped
into the name, and value tokens. This assumption is not true, strtok()
returns the whole string when it doesn't find the delimiter. Operating
under this assumption also segfaults later in the code. Fix it, by
checking for the presence of a delimiter in the passed name_value_str
in parse_r_flag(). This also initializes the pointer to NULL, to
avoid reading them before assignment in the error path.
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit b29c68bb5d36523e051f7ec0d92b2db93de26bf2)
tests/gunit: Extend the fuzzer to test cgroup_get_value_uint64()
Add fuzzing to the cgroup_get_value_uint64() API, by passing combination
of valid/NULL as arguments to the API.
[----------] 11 tests from APIArgsTest
[ RUN ] APIArgsTest.API_cgroup_set_permissions
[ OK ] APIArgsTest.API_cgroup_set_permissions (0 ms)
[ RUN ] APIArgsTest.API_cgroup_new_cgroup
[ OK ] APIArgsTest.API_cgroup_new_cgroup (0 ms)
[ RUN ] APIArgsTest.API_cgroup_set_value_string
[ OK ] APIArgsTest.API_cgroup_set_value_string (0 ms)
[ RUN ] APIArgsTest.API_cgroup_get_value_string
[ OK ] APIArgsTest.API_cgroup_get_value_string (0 ms)
[ RUN ] APIArgsTest.API_cgroup_add_controller
[ OK ] APIArgsTest.API_cgroup_add_controller (0 ms)
[ RUN ] APIArgsTest.API_cgroup_add_value_string
[ OK ] APIArgsTest.API_cgroup_add_value_string (0 ms)
[ RUN ] APIArgsTest.API_cgroup_get_uid_gid
[ OK ] APIArgsTest.API_cgroup_get_uid_gid (0 ms)
[ RUN ] APIArgsTest.API_cgroup_set_value_int64
[ OK ] APIArgsTest.API_cgroup_set_value_int64 (0 ms)
[ RUN ] APIArgsTest.API_cgroup_get_value_int64
[ OK ] APIArgsTest.API_cgroup_get_value_int64 (0 ms)
[ RUN ] APIArgsTest.API_cgroup_set_value_uint64
[ OK ] APIArgsTest.API_cgroup_set_value_uint64 (0 ms)
[ RUN ] APIArgsTest.API_cgroup_get_value_uint64
[ OK ] APIArgsTest.API_cgroup_get_value_uint64 (0 ms)
[----------] 11 tests from APIArgsTest (0 ms total)
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
TJH: Fix comment typo
(cherry picked from commit 81f12364c78a8f7f1e90b5ce90e9f02cf057c623)
wrapper: fix segfault in cgroup_get_value_uint64()
The second and third arguments passed to cgroup_get_value_uint64() are
of type char * and the user might pass NULL in place of one or both of
the arguments, causing a segfault. The reason is, argument values are
used without checks, fix it by checking for NULL pointers before
proceeding.
tests/gunit: Extend the fuzzer to test cgroup_set_value_uint64()
Add fuzzing to the cgroup_set_value_uint64() API, by passing combination
of valid/NULL as arguments to the API.
[----------] 10 tests from APIArgsTest
[ RUN ] APIArgsTest.API_cgroup_set_permissions
[ OK ] APIArgsTest.API_cgroup_set_permissions (0 ms)
[ RUN ] APIArgsTest.API_cgroup_new_cgroup
[ OK ] APIArgsTest.API_cgroup_new_cgroup (0 ms)
[ RUN ] APIArgsTest.API_cgroup_set_value_string
[ OK ] APIArgsTest.API_cgroup_set_value_string (0 ms)
[ RUN ] APIArgsTest.API_cgroup_get_value_string
[ OK ] APIArgsTest.API_cgroup_get_value_string (0 ms)
[ RUN ] APIArgsTest.API_cgroup_add_controller
[ OK ] APIArgsTest.API_cgroup_add_controller (0 ms)
[ RUN ] APIArgsTest.API_cgroup_add_value_string
[ OK ] APIArgsTest.API_cgroup_add_value_string (0 ms)
[ RUN ] APIArgsTest.API_cgroup_get_uid_gid
[ OK ] APIArgsTest.API_cgroup_get_uid_gid (0 ms)
[ RUN ] APIArgsTest.API_cgroup_set_value_int64
[ OK ] APIArgsTest.API_cgroup_set_value_int64 (0 ms)
[ RUN ] APIArgsTest.API_cgroup_get_value_int64
[ OK ] APIArgsTest.API_cgroup_get_value_int64 (0 ms)
[ RUN ] APIArgsTest.API_cgroup_set_value_uint64
[ OK ] APIArgsTest.API_cgroup_set_value_uint64 (0 ms)
[----------] 10 tests from APIArgsTest (0 ms total)
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit 4467ccbd0bf54aa4ad8c7c50628ce2a46668181f)
wrapper: fix segfault in cgroup_set_value_uint64()
The second argument passed to cgroup_set_value_uint64() is of type
char * and the user might pass NULL in the place of the argument,
causing a segfault. The reason is, argument values are used without
checks, fix it by checking for NULL pointers before proceeding.
tests/gunit: Extend the fuzzer to test cgroup_get_value_int64()
Add fuzzing to the cgroup_get_value_int64() API, by passing combination
of valid/NULL as arguments to the API.
[----------] 9 tests from APIArgsTest
[ RUN ] APIArgsTest.API_cgroup_set_permissions
[ OK ] APIArgsTest.API_cgroup_set_permissions (0 ms)
[ RUN ] APIArgsTest.API_cgroup_new_cgroup
[ OK ] APIArgsTest.API_cgroup_new_cgroup (0 ms)
[ RUN ] APIArgsTest.API_cgroup_set_value_string
[ OK ] APIArgsTest.API_cgroup_set_value_string (0 ms)
[ RUN ] APIArgsTest.API_cgroup_get_value_string
[ OK ] APIArgsTest.API_cgroup_get_value_string (0 ms)
[ RUN ] APIArgsTest.API_cgroup_add_controller
[ OK ] APIArgsTest.API_cgroup_add_controller (0 ms)
[ RUN ] APIArgsTest.API_cgroup_add_value_string
[ OK ] APIArgsTest.API_cgroup_add_value_string (0 ms)
[ RUN ] APIArgsTest.API_cgroup_get_uid_gid
[ OK ] APIArgsTest.API_cgroup_get_uid_gid (0 ms)
[ RUN ] APIArgsTest.API_cgroup_set_value_int64
[ OK ] APIArgsTest.API_cgroup_set_value_int64 (0 ms)
[ RUN ] APIArgsTest.API_cgroup_get_value_int64
[ OK ] APIArgsTest.API_cgroup_get_value_int64 (0 ms)
[----------] 9 tests from APIArgsTest (0 ms total)
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit f9c1524f8e8c855885982ace43ca655bea077468)
The second and third arguments passed to cgroup_get_value_int64() are of
type char * and the user might pass NULL in place of one or both of the
arguments, causing a segfault. The reason is, argument values are used
without checks, fix it by checking for NULL pointers before proceeding.
tests/gunit: Extend the fuzzer to test cgroup_set_value_int64()
Add fuzzing to the cgroup_set_value_int64() API, by passing combination
of valid/NULL as arguments to the API.
[----------] 8 tests from APIArgsTest
[ RUN ] APIArgsTest.API_cgroup_set_permissions
[ OK ] APIArgsTest.API_cgroup_set_permissions (1 ms)
[ RUN ] APIArgsTest.API_cgroup_new_cgroup
[ OK ] APIArgsTest.API_cgroup_new_cgroup (0 ms)
[ RUN ] APIArgsTest.API_cgroup_set_value_string
[ OK ] APIArgsTest.API_cgroup_set_value_string (0 ms)
[ RUN ] APIArgsTest.API_cgroup_get_value_string
[ OK ] APIArgsTest.API_cgroup_get_value_string (0 ms)
[ RUN ] APIArgsTest.API_cgroup_add_controller
[ OK ] APIArgsTest.API_cgroup_add_controller (0 ms)
[ RUN ] APIArgsTest.API_cgroup_add_value_string
[ OK ] APIArgsTest.API_cgroup_add_value_string (0 ms)
[ RUN ] APIArgsTest.API_cgroup_get_uid_gid
[ OK ] APIArgsTest.API_cgroup_get_uid_gid (0 ms)
[ RUN ] APIArgsTest.API_cgroup_set_value_int64
[ OK ] APIArgsTest.API_cgroup_set_value_int64 (0 ms)
[----------] 8 tests from APIArgsTest (1 ms total)
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit bcecc2d45b3848c5d1075a6f24f4c2302621fedf)
The second argument passed to cgroup_set_value_int64() is of type char *
and the user might pass NULL in the place of the argument, causing a
segfault. The reason is, argument values are used without checks, fix
it by checking for NULL pointers before proceeding.
Tom Hromatka [Fri, 17 Feb 2023 22:16:34 +0000 (15:16 -0700)]
ftests: Cleanup pid logic in functional tests
PIDs were inconsistently being managed in the functional tests. Some
functions treated them as `int` and in others they were `str`. Modify
all functions that deal with PIDs to treat them as `int` or a list of
`int`s.
Reviewed-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit 8483426ea7dcfe1e513ecbfc287a3a51f1097335)
Kamalesh Babulal [Tue, 28 Feb 2023 09:15:11 +0000 (14:45 +0530)]
tests/gunit: Extend the fuzzer to test cgroup_get_uid_gid()
Add fuzzing to the cgroup_get_uid_gid() API, by passing combination of
of valid/NULL as arguments to the API.
[----------] 7 tests from APIArgsTest
[ RUN ] APIArgsTest.API_cgroup_set_permissions
[ OK ] APIArgsTest.API_cgroup_set_permissions (0 ms)
[ RUN ] APIArgsTest.API_cgroup_new_cgroup
[ OK ] APIArgsTest.API_cgroup_new_cgroup (0 ms)
[ RUN ] APIArgsTest.API_cgroup_set_value_string
[ OK ] APIArgsTest.API_cgroup_set_value_string (0 ms)
[ RUN ] APIArgsTest.API_cgroup_get_value_string
[ OK ] APIArgsTest.API_cgroup_get_value_string (0 ms)
[ RUN ] APIArgsTest.API_cgroup_add_controller
[ OK ] APIArgsTest.API_cgroup_add_controller (0 ms)
[ RUN ] APIArgsTest.API_cgroup_add_value_string
[ OK ] APIArgsTest.API_cgroup_add_value_string (0 ms)
[ RUN ] APIArgsTest.API_cgroup_get_uid_gid
[ OK ] APIArgsTest.API_cgroup_get_uid_gid (0 ms)
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit 72a3d75036f00541cbc4a0dac3d9c6ca138869e8)
Kamalesh Babulal [Tue, 28 Feb 2023 09:15:05 +0000 (14:45 +0530)]
wrapper: fix segfault in cgroup_get_uid_gid()
The arguments passed to cgroup_get_uid_gid() are of type pointers and
the user might pass NULL in place of or all of the arguments, causing
a segfault. segfault is triggered when the NULL, argument value is
passed without check, fix it by checking for NULL before proceeding.
Kamalesh Babulal [Wed, 22 Feb 2023 14:43:45 +0000 (20:13 +0530)]
github/actions: Introduce a timeout to avoid apt races
There are chances that apt-get operations are run on the same VM by
different runners both competing to get apt locks. Introduce timeout of
3 seconds, in case the lock is already taken by another instance of
a runner.
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit ddcd79dede4265d891247004432f9c4e845a5a4a)
Kamalesh Babulal [Wed, 22 Feb 2023 17:06:13 +0000 (10:06 -0700)]
tests/ftests: synchronize between github runners
If a VM is shared between multiple github runners, there are chances of
each other stomping over other's run, if executed parallelly. To avoid
the race between the runners, introduce lock file, that gets acquired
(created) when ftest.sh starts and get removed by ftest-nocontainer.sh,
this ensures that both test cases are executed before other runner,
that's waiting for its chance to run. A runner would wait for
10 minutes before re-trying to run. At the max, a runner would wait for
50 minutes (5 retries) before giving up.
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit ec78fee3b4970f24024be21fd20e3031dcbc71ab)
Kamalesh Babulal [Mon, 27 Feb 2023 04:21:19 +0000 (09:51 +0530)]
tests/gunit: Extend the fuzzer to test cgroup_add_value_string()
Add fuzzing to the cgroup_add_value_string() API, by passing combination
of valid/NULL as arguments to the API.
[----------] 6 tests from APIArgsTest
[ RUN ] APIArgsTest.API_cgroup_set_permissions
[ OK ] APIArgsTest.API_cgroup_set_permissions (0 ms)
[ RUN ] APIArgsTest.API_cgroup_new_cgroup
[ OK ] APIArgsTest.API_cgroup_new_cgroup (0 ms)
[ RUN ] APIArgsTest.API_cgroup_set_value_string
[ OK ] APIArgsTest.API_cgroup_set_value_string (0 ms)
[ RUN ] APIArgsTest.API_cgroup_get_value_string
[ OK ] APIArgsTest.API_cgroup_get_value_string (0 ms)
[ RUN ] APIArgsTest.API_cgroup_add_controller
[ OK ] APIArgsTest.API_cgroup_add_controller (0 ms)
[ RUN ] APIArgsTest.API_cgroup_add_value_string
[ OK ] APIArgsTest.API_cgroup_add_value_string (0 ms)
[----------] 6 tests from APIArgsTest (0 ms total)
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit aa1148a7b50e7f8bc33cad0a013b9545716365a2)
Kamalesh Babulal [Mon, 27 Feb 2023 04:20:34 +0000 (09:50 +0530)]
wrapper: fix segfault in cgroup_add_value_string
The second and third arguments passed to cgroup_add_value_string() are
of type char * and the user might pass NULL in place of one or both of
the arguments, causing a segfault. segfault is trigger when the NULL,
argument value is passed to second argument without check, fix it by
checking for NULL before proceeding.
Reproducer:
----------
int main(void)
{
struct cgroup_controller *cgc;
struct cgroup *cgrp;
int ret;
ret = cgroup_init();
if (ret)
exit (1);
cgrp = cgroup_new_cgroup("fuzzer");
if (!cgrp)
exit (1);
cgc = cgroup_add_controller(cgrp, "cpu");
if (!cgc)
exit (1);
cgroup_add_value_string(cgc, NULL, NULL);
// should not reach here
return 0;
}
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit 097a766dd055c41cc6639276d54b8817e512a252)
Tom Hromatka [Wed, 22 Feb 2023 21:09:07 +0000 (14:09 -0700)]
tools/cgxset: Fix potential memory leak in converted_src_cgroup
There's a brief window where converted_src_cgroup is allocated but
hasn't been assigned to the *cgroup pointer. If a failure occurs in
this window, then converted_src_cgroup must be freed before doing the
goto to the error path.
Also, simplify the error-handling logic in cgxset::main() by having all
errors goto "err".
Reviewed-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit f1579cec2734c767d24f69944e1e5f07e1c1e3af)
Kamalesh Babulal [Fri, 24 Feb 2023 05:35:07 +0000 (11:05 +0530)]
tests/gunit: Extend the fuzzer to test cgroup_add_controller()
Add fuzzing to the cgroup_add_controller() API, by passing combination
of valid/NULL as arguments to the API.
[----------] 5 tests from APIArgsTest
[ RUN ] APIArgsTest.API_cgroup_set_permissions
[ OK ] APIArgsTest.API_cgroup_set_permissions (0 ms)
[ RUN ] APIArgsTest.API_cgroup_new_cgroup
[ OK ] APIArgsTest.API_cgroup_new_cgroup (0 ms)
[ RUN ] APIArgsTest.API_cgroup_set_value_string
[ OK ] APIArgsTest.API_cgroup_set_value_string (0 ms)
[ RUN ] APIArgsTest.API_cgroup_get_value_string
[ OK ] APIArgsTest.API_cgroup_get_value_string (0 ms)
[ RUN ] APIArgsTest.API_cgroup_add_controller
[ OK ] APIArgsTest.API_cgroup_add_controller (0 ms)
[----------] 5 tests from APIArgsTest (0 ms total)
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit 4bec8844d71e3c7428dddcff29c7006dc378a5ec)
Kamalesh Babulal [Fri, 24 Feb 2023 05:35:02 +0000 (11:05 +0530)]
wrapper: fix segfault in cgroup_add_controller()
The second argument passed to cgroup_add_controller() is of type
char * and the user might pass NULL in place of the arguments, causing
a segfault. segfault is trigger when the NULL, argument values is used
without checks, fix it by checking for NULL before proceeding.
Reproducer:
-----------
int main(void)
{
struct cgroup_controller *cgc;
struct cgroup *cgrp;
int ret;
cgroup_init();
if (ret)
exit(1);
cgrp = cgroup_new_cgroup("fuzzer");
if (!cgrp)
exit(1);
cgc = cgroup_add_controller(cgrp, "cpu");
if (!cgc)
exit(1);
cgroup_add_controller(cgrp, NULL);
// should not reach here
return 0;
}
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit 42436e7e32412c32d2130198fe8a4c0ff48e1d07)
Kamalesh Babulal [Thu, 23 Feb 2023 13:45:54 +0000 (13:45 +0000)]
tests/ftest: use string filter() to concatenation cause
if, then, else construction is used to concatenate the 'cause' string,
that appends the reason for the test failures. The reason to use the
checks to TypeError that occurs while concatenating None and str type.
Replace them with a one-liner string.filter(), across the test sources.
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit 5d4bd5c2532a7ffdbf0bab333dee4a9be4cb17ba)
Kamalesh Babulal [Tue, 21 Feb 2023 13:10:05 +0000 (13:10 +0000)]
tests/gunit: Extend the fuzzer to test cgroup_get_value_string()
Add fuzzing to the cgroup_get_value_string() API, by passing combination
of valid/NULL as arguments to the API.
s
[----------] 4 tests from APIArgsTest
[ RUN ] APIArgsTest.API_cgroup_set_permissions
[ OK ] APIArgsTest.API_cgroup_set_permissions (0 ms)
[ RUN ] APIArgsTest.API_cgroup_new_cgroup
[ OK ] APIArgsTest.API_cgroup_new_cgroup (0 ms)
[ RUN ] APIArgsTest.API_cgroup_set_value_string
[ OK ] APIArgsTest.API_cgroup_set_value_string (0 ms)
[ RUN ] APIArgsTest.API_cgroup_get_value_string
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit 689d7fb7105727675ba6487530903b1f7e6ef50a)
Kamalesh Babulal [Tue, 21 Feb 2023 10:49:06 +0000 (10:49 +0000)]
wrapper: fix segfault in cgroup_get_value_string()
The second and third arguments passed to cgroup_get_value_string() are
of type char * and the user might pass NULL in place of one or both of
the arguments, causing a segfault. segfault is trigger when the NULL,
argument values are used without checks, fix it by checking for NULL
before proceeding.
Reproducer:
-----------
int main(void)
{
struct cgroup_controller *cgc;
struct cgroup *cgrp;
int ret;
cgroup_init();
if (ret)
exit(1);
cgrp = cgroup_new_cgroup("fuzzer");
if (!cgrp)
exit(1);
cgc = cgroup_add_controller(cgrp, "cpu");
if (!cgc)
exit(1);
ret = cgroup_add_value_string(cgc, "cpu.shares", "1024");
if (!cgc)
exit(1);
ret = cgroup_create_cgroup(cgrp, 1);
if (ret)
exit(1);
cgc = cgroup_get_controller(cgrp, "cpu");
if (!cgc)
exit(1);
cgroup_get_value_string(cgc, NULL, NULL);
return 0;
}
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit 08bb9a32592079b982e93b1e21fc084431334c2d)
Kamalesh Babulal [Tue, 21 Feb 2023 13:13:25 +0000 (13:13 +0000)]
tests/gunit: Extend the fuzzer to test cgroup_set_value_string()
Add fuzzing to the cgroup_set_value_string() API, by passing combination
of valid/NULL as arguments to the API.
[----------] 3 tests from APIArgsTest
[ RUN ] APIArgsTest.API_cgroup_set_permissions
[ OK ] APIArgsTest.API_cgroup_set_permissions (0 ms)
[ RUN ] APIArgsTest.API_cgroup_new_cgroup
[ OK ] APIArgsTest.API_cgroup_new_cgroup (0 ms)
[ RUN ] APIArgsTest.API_cgroup_set_value_string
[ OK ] APIArgsTest.API_cgroup_set_value_string (19 ms)
[----------] 3 tests from APIArgsTest (19 ms total)
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit c259bb79641582f08a5ddd3e1f85aa7a018ba716)
Kamalesh Babulal [Mon, 20 Feb 2023 15:09:07 +0000 (15:09 +0000)]
wrapper: fix segfault in cgroup_set_value_string()
The second and third arguments passed to cgroup_set_value_string() are
of type char * and the user might pass NULL in place of one or both of
the arguments, causing a segfault. segfault is trigger when the NULL,
argument values are used without checks, fix it by checking for NULL
before proceeding.
Reproducer:
-----------
int main(void)
{
struct cgroup_controller *cgc;
struct cgroup *cgrp;
cgroup_init();
if (ret)
exit(1);
cgrp = cgroup_new_cgroup("fuzzer");
if (!cgrp)
exit(1);
cgc = cgroup_add_controller(cgrp, "cpu");
if (!cgc)
exit(1);
ret = cgroup_create_cgroup(cgrp, 1);
if (ret)
exit(1);
cgroup_set_value_string(cgc, NULL, NULL);
// should not reach here.
return 0;
}
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit 3eabc319b1af5ab8024eb9145e196270c4cdec94)
Tom Hromatka [Wed, 15 Feb 2023 21:50:14 +0000 (14:50 -0700)]
ftests: Add cgroup_get_cgroup() pybindings test
Add a test to exercise cgroup_get_cgroup() and its python bindings.
-----------------------------------------------------------------
Test Results:
Run Date: Feb 15 14:50:00
Passed: 1 test(s)
Skipped: 0 test(s)
Failed: 0 test(s)
-----------------------------------------------------------------
Timing Results:
Test Time (sec)
--------------------------------------------------
setup 0.00
072-pybindings-cgroup_get_cgroup.py 2.66
teardown 0.00
--------------------------------------------------
Total Run Time 2.66
Reviewed-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit 62426a9b1395c34b2527eb1b193eaaa8b5906b35)
Prior to this change, the above python code returned ECGROUPNOTEXIST in
the cg.get() line. Now it successfully completes, but no controllers
are populated.
Reported-by: Justin Israel <justinisrael@gmail.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit 7c99c8a385c5946c8873313b8c99cc9b5cf25bfd)
Tom Hromatka [Tue, 14 Feb 2023 19:58:59 +0000 (12:58 -0700)]
api: Add support for "cgroup" controller in cgroup v2
The "cgroup" controller has settings that the user may want to
read/write, e.g. cgroup.controllers, cgroup.subtree_control,
cgroup.procs, etc.
Add support for this controller when the cgroup v2 mount table is
parsed by creating a custom controller for the "cgroup" settings.
Note that this feature has not been added to cgroup v1 and cgroup v1
will continue to have limited access to the cgroup.* files.
Reported-by: Justin Israel <justinisrael@gmail.com> Reviewed-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit b09f6e750ecdf605f5b9cae97e6b831b6ecf187d)
Tom Hromatka [Tue, 14 Feb 2023 19:53:03 +0000 (12:53 -0700)]
api: Support specifying controllers in cgroup_get_cgroup()
Add support for the user to explicitly specify controllers of interest
when calling cgroup_get_cgroup(). Controllers not specified will not
be added to the struct cgroup. Also, this allows users to view cgroup
v2 controllers that aren't enabled. This may be useful for seeing
settings like cpuset.cpus.effective even when the cpuset controller
isn't enabled.
If no controllers are specified, then the previous behavior should be
utilized. All controllers that are enabled for that cgroup will be
added to the struct cgroup.
Here is a simple example python program that exercises these changes:
#!/usr/bin/env python3
from libcgroup import Cgroup, Version
Kamalesh Babulal [Fri, 17 Feb 2023 09:59:30 +0000 (09:59 +0000)]
tools/cgset: fix Uninitialized pointer read
Fix Uninitialized pointer read, reported by Coverity Tool:
CID 307779 (#2 of 2): Uninitialized pointer read (UNINIT)22.
uninit_use_in_call: Using uninitialized value src_cgroup when calling
cgroup_free.
In main(), src_cgrp points to a valid struct cgroup only when the
user calls cgxset using --copy-from flag, Coverity warns about the
freeing src_cgrp, which is uninitialized in the error path. This patch
initializes converted_src_cgroup, src_cgroup and cgroup uninitialized
pointers and checks is src_cgrp is valid pointer before passing it to
cgroup_free()
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit 94ba8b65f8b3424232cf3fea5a06fbbfb921789a)
Kamalesh Babulal [Fri, 17 Feb 2023 09:54:50 +0000 (09:54 +0000)]
tools/cgset: fix Uninitialized pointers read
Fix Uninitialized pointer read, reported by Coverity Tool:
CID 307778 (#2 of 2): Uninitialized pointer read (UNINIT)22.
uninit_use_in_call: Using uninitialized value src_cgroup when calling
cgroup_free.
In main(), src_cgrp points to a valid struct cgroup only when the user
calls cgset using --copy-from flag, Coverity warns about the freeing
src_cgrp, which is uninitialized in the error path. This patch
initializes src_cgrp and cgroup uninitialized pointers and checks
is src_cgrp is valid pointer before passing it to cgroup_free()
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit 4611135a0672ba2bb2b275cd71e57873da4ec293)
Kamalesh Babulal [Thu, 16 Feb 2023 13:36:48 +0000 (13:36 +0000)]
tests: Add a test for the python bindings to cgroup_set_default_systemd_cgroup
Add a test for the python bindings to cgroup_set_default_systemd_cgroup()
-----------------------------------------------------------------
Test Results:
Run Date: Feb 16 13:36:28
Passed: 1 test(s)
Skipped: 0 test(s)
Failed: 0 test(s)
-----------------------------------------------------------------
Timing Results:
Test Time (sec)
-----------------------------------------------------
setup 0.00
071-sudo-set_default_systemd_cgroup.py 0.02
teardown 0.00
-----------------------------------------------------
Total Run Time 0.02
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
TJH: Remove unnecessary int() typecast and add the test to Makefile.am
(cherry picked from commit 0b4016adcb47ee4dd5f478389281e84386527d89)
Kamalesh Babulal [Mon, 13 Feb 2023 06:49:59 +0000 (06:49 +0000)]
python: binding to read and set systemd_default_cgroup
Add an python binding that reads /run/libcgroup/systemd and if the file
exists, sets the systemd_default_cgroup. Then on all the paths
constructed, has the systemd_default_cgroup appended to it. This is
used when cgroup sub-tree is constructed for systemd delegation.
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit 67805afc3f02495ab32fdc640f062c48b6e6b8f0)
Kamalesh Babulal [Thu, 16 Feb 2023 12:08:54 +0000 (17:38 +0530)]
man: document cgexec's -b (systemd) option
Add documentation about the -b option in the cgexec's man page. This
option ignores the default systemd delegated hierarchy path and
constructs the path of the control groups relative to the cgroup root
hierarchy.
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit 9be92b8ddb2f63201ae028bee9d44e5a01e93b9a)
Kamalesh Babulal [Thu, 16 Feb 2023 12:08:54 +0000 (17:38 +0530)]
man: document cgclassify's -b (systemd) option
Add documentation about the -b option in the cgclassify's man page.
This option ignores the default systemd delegated hierarchy path
and constructs the path of the control groups relative to the cgroup
root hierarchy.
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit ba505b05cd22370de0d0bf37818275075199afe7)
Kamalesh Babulal [Thu, 16 Feb 2023 12:08:54 +0000 (17:38 +0530)]
man: document cgcreate's -b (systemd) option
Add documentation about the -b option in the cgcreate's man page. This
option ignores the default systemd delegated hierarchy path and
constructs the path of the control groups relative to the cgroup root
hierarchy.
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit 230dbbe679688864ce2a7005b5bea3d246efdd11)
Kamalesh Babulal [Thu, 16 Feb 2023 12:08:54 +0000 (17:38 +0530)]
man: document cgxset's -b (systemd) option
Add documentation about the -b option in the cgxset's man page. This
option ignores the default systemd delegated hierarchy path and
constructs the path of the control groups relative to the cgroup root
hierarchy.
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit ae92896abd762cbc8cdcd66387931913f0e13eb7)
Kamalesh Babulal [Thu, 16 Feb 2023 12:08:54 +0000 (17:38 +0530)]
man: document cgxget's -b (systemd) option
Add documentation about the -b option in the cgxget's man page. This
option ignores the default systemd delegated hierarchy path and
constructs the path of the control groups relative to the cgroup root
hierarchy.
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit d4e4bff5b612939267779f0a14f6b2a261bb0744)
Kamalesh Babulal [Thu, 16 Feb 2023 12:08:54 +0000 (17:38 +0530)]
man: document cgdelete's -b (systemd) option
Add documentation about the -b option in the cgdelete's man page. This
option ignores the default systemd delegated hierarchy path and
constructs the path of the control groups relative to the cgroup root
hierarchy.
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit 7992ea983fdf5a819b7daeb9b0791e2e5cb331e1)
Kamalesh Babulal [Thu, 16 Feb 2023 12:08:54 +0000 (17:38 +0530)]
man: document cgset's -b (systemd) option
Add documentation about the -b option in the cgset's man page. This
option ignores the default systemd delegated hierarchy path and
constructs the path of the control groups relative to the cgroup root
hierarchy.
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit a3319e29f07172b0c906e83109e86b8360813502)
Kamalesh Babulal [Thu, 16 Feb 2023 12:08:54 +0000 (17:38 +0530)]
man: document cgget's -b (systemd) option
Add documentation about the -b option in the cgget's man page. This
option ignores the default systemd delegated hierarchy path and
constructs the path of the control groups relative to the cgroup root
hierarchy.
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit 2df89264ac8c8ba6693d3e48cc2424a9e73ff951)
Kamalesh Babulal [Wed, 15 Feb 2023 19:06:33 +0000 (12:06 -0700)]
pybindings: Fix a build warning on Fedora
While building python bindings on Fedora 34, gcc 11.3.1 triggers a
build warning:
[1/1] Cythonizing libcgroup.pyx
In file included from /usr/include/bits/libc-header-start.h:33,
from /usr/include/limits.h:26,
from /usr/lib/gcc/x86_64-redhat-linux/11/include/limits.h:203,
from /usr/lib/gcc/x86_64-redhat-linux/11/include/syslimits.h:7,
from /usr/lib/gcc/x86_64-redhat-linux/11/include/limits.h:34,
from /usr/include/python3.9/Python.h:11,
from libcgroup.c:25:
/usr/include/features.h:397:4: warning: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Wcpp]
397 | # warning _FORTIFY_SOURCE requires compiling with optimization (-O)
| ^~~~~~~
the reason being the default compiler flags for c/c++ includes
'-Wp,-D_FORTIFY_SOURCE=2' and '-D_FORTIFY_SOURCE=2'. Whereas Ubuntu
compilers include '-D_FORTIFY_SOURCE=2' option only. This can be
fixed by adding '-O2' to the CPP Flags in the pybinding Makefile and
there is no side effect in both Fedora and Ubuntu because by default
'-D_FORTIFY_SOURCE=2' is included. The Ubuntu automatically auto
includes '-D_FORTIFY_SOURCE=2' when '-O2' is passed but here it's been
already explicitly passed.
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit 577d364472701b24a85a1bdadd8ec32b76c45eb5)
Kamalesh Babulal [Fri, 10 Feb 2023 21:54:22 +0000 (14:54 -0700)]
ftests: Add a test to validate cgx{get,set} systemd options (cgroup v2)
Add a test case to validate cgx{get, set} tool's systemd options on
cgroup unified setup mode.
-----------------------------------------------------------------
Test Results:
Run Date: Feb 05 08:15:40
Passed: 1 test(s)
Skipped: 0 test(s)
Failed: 0 test(s)
-----------------------------------------------------------------
Timing Results:
Test Time (sec)
---------------------------------------------------------
setup 0.00
070-sudo-systemd_cgxget-cpu-settings-v2.py 3.00
teardown 0.00
---------------------------------------------------------
Total Run Time
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit 418842dcae4285741f1a8ed22a41bfe03d58bdb7)
Kamalesh Babulal [Fri, 10 Feb 2023 21:54:10 +0000 (14:54 -0700)]
ftests: Add a test to validate cgx{get,set} systemd options (cgroup v1)
Add a test case to validate cgx(get, set} tool's systemd options on
cgroup legacy/hybrid setup modes.
-----------------------------------------------------------------
Test Results:
Run Date: Feb 05 08:09:43
Passed: 1 test(s)
Skipped: 0 test(s)
Failed: 0 test(s)
-----------------------------------------------------------------
Timing Results:
Test Time (sec)
---------------------------------------------------------
setup 0.00
069-sudo-systemd_cgxget-cpu-settings-v1.py 2.74
teardown 0.00
---------------------------------------------------------
Total Run Time 2.74
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit c1adfed29ff3d475484ba57d4a910679d9ecc493)
Kamalesh Babulal [Fri, 10 Feb 2023 21:53:58 +0000 (14:53 -0700)]
ftests: Add a test to validate cgexec's systemd options (cgroup v2)
Add a test case to validate cgexec tool's systemd options on cgroup
unified setup mode.
-----------------------------------------------------------------
Test Results:
Run Date: Feb 05 07:57:18
Passed: 1 test(s)
Skipped: 0 test(s)
Failed: 0 test(s)
-----------------------------------------------------------------
Timing Results:
Test Time (sec)
--------------------------------------------
setup 0.00
068-sudo-systemd_cgexec-v2.py 5.53
teardown 0.00
--------------------------------------------
Total Run Time 5.53
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit b2cd7beb5b6b6bab43495cbb6b82a58fa5dee152)
Kamalesh Babulal [Fri, 10 Feb 2023 21:53:48 +0000 (14:53 -0700)]
ftests: Add a test to validate cgexec's systemd options (cgroup v1)
Add a test case to validate cgexec tool's systemd options on cgroup
legacy/hybrid setup modes.
-----------------------------------------------------------------
Test Results:
Run Date: Feb 05 07:48:48
Passed: 1 test(s)
Skipped: 0 test(s)
Failed: 0 test(s)
-----------------------------------------------------------------
Timing Results:
Test Time (sec)
--------------------------------------------
setup 0.00
067-sudo-systemd_cgexec-v1.py 5.32
teardown 0.00
--------------------------------------------
Total Run Time 5.32
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit 4e3dc1b617881f0dcfc75e83a345779eca61e8c8)
Kamalesh Babulal [Fri, 10 Feb 2023 21:53:33 +0000 (14:53 -0700)]
ftests: Add a test to validate cgclassify's systemd options (cgroup v2)
Add a test case to validate cgclassify tool's systemd options on cgroup
unified mode.
-----------------------------------------------------------------
Test Results:
Run Date: Feb 05 07:43:23
Passed: 1 test(s)
Skipped: 0 test(s)
Failed: 0 test(s)
-----------------------------------------------------------------
Timing Results:
Test Time (sec)
------------------------------------------------
setup 0.00
066-sudo-systemd_cgclassify-v2.py 7.57
teardown 0.00
------------------------------------------------
Total Run Time 7.57
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit 98c11c7ba4f7269627c523f3c81b386e795e72c3)
Kamalesh Babulal [Fri, 10 Feb 2023 21:53:12 +0000 (14:53 -0700)]
ftests: Add a test to validate cgclassify's systemd options (cgroup v1)
Add a test case to validate cgclassify tool's systemd options on cgroup
legacy/hybrid setup modes.
-----------------------------------------------------------------
Test Results:
Run Date: Feb 05 06:51:38
Passed: 1 test(s)
Skipped: 0 test(s)
Failed: 0 test(s)
-----------------------------------------------------------------
Timing Results:
Test Time (sec)
------------------------------------------------
setup 0.00
065-sudo-systemd_cgclassify-v1.py 7.38
teardown 0.00
------------------------------------------------
Total Run Time 7.38
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit e99ea81b93fc031735c343fa91e0a34dc8380a98)
Kamalesh Babulal [Fri, 10 Feb 2023 21:53:01 +0000 (14:53 -0700)]
ftests: Add to test to validate cgset's systemd options (cgroup v2)
Add a test case to validate cgset tool's systemd options on cgroup
unified setup mode.
-----------------------------------------------------------------
Test Results:
Run Date: Feb 05 14:38:30
Passed: 1 test(s)
Skipped: 0 test(s)
Failed: 0 test(s)
-----------------------------------------------------------------
Timing Results:
Test Time (sec)
-------------------------------------------
setup 0.00
064-sudo-systemd_cgset-v2.py 2.33
teardown 0.00
-------------------------------------------
Total Run Time 2.33
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit 2c54492f27407119f7173a09c8fb2eec9d8f6b60)
Tom Hromatka [Fri, 10 Feb 2023 21:52:48 +0000 (14:52 -0700)]
ftests: Add to test to validate cgset's systemd options (cgroup v1)
Add a test case to validate cgset tool's systemd options on cgroup
legacy and hybrid setup modes.
-----------------------------------------------------------------
Test Results:
Run Date: Feb 05 12:53:35
Passed: 1 test(s)
Skipped: 0 test(s)
Failed: 0 test(s)
-----------------------------------------------------------------
Timing Results:
Test Time (sec)
-------------------------------------------
setup 0.00
063-sudo-systemd_cgset-v1.py 2.20
teardown 0.00
-------------------------------------------
Total Run Time 2.20
[Kamalesh improvised on the original test case] Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit 7afe1debf47b816878eea0f5feccd7fc21befd77)
Kamalesh Babulal [Fri, 10 Feb 2023 21:52:32 +0000 (14:52 -0700)]
ftests: Add a test to validate cgget's systemd options (cgroup v2)
Add a test case to validate cgget tool's systemd options on cgroup
unified setup mode.
-----------------------------------------------------------------
Test Results:
Run Date: Feb 05 12:00:26
Passed: 1 test(s)
Skipped: 0 test(s)
Failed: 0 test(s)
-----------------------------------------------------------------
Timing Results:
Test Time (sec)
------------------------------------------------------------
setup 0.00
062-sudo-g_flag_controller_only_systemd-v2.py 2.25
teardown 0.00
------------------------------------------------------------
Total Run Time 2.25
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit 9f98e1a6fd322660c432789b24e51598f7455004)
Tom Hromatka [Fri, 10 Feb 2023 21:52:18 +0000 (14:52 -0700)]
ftests: Add a test to validate cgget's systemd options (cgroup v1)
Add a test case to validate cgget tool's systemd options on cgroup
legacy/hybrid setup modes.
-----------------------------------------------------------------
Test Results:
Run Date: Feb 05 08:42:19
Passed: 1 test(s)
Skipped: 0 test(s)
Failed: 0 test(s)
-----------------------------------------------------------------
Timing Results:
Test Time (sec)
------------------------------------------------------------
setup 0.00
061-sudo-g_flag_controller_only_systemd-v1.py 2.16
teardown 0.00
------------------------------------------------------------
Total Run Time 2.16
[Kamalesh improvised on the original test case] Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit 6e02b80865c8ad29758670428c0b4e992b7aeec1)
Kamalesh Babulal [Fri, 10 Feb 2023 21:52:04 +0000 (14:52 -0700)]
ftests: Add a test to validate systemd configurations
Add a test case to parse test different combination of valid and invalid
systemd configurations.
-----------------------------------------------------------------
Test Results:
Run Date: Feb 05 08:33:41
Passed: 1 test(s)
Skipped: 0 test(s)
Failed: 0 test(s)
-----------------------------------------------------------------
Timing Results:
Test Time (sec)
-------------------------------------------------
setup 0.00
060-sudo-cgconfigparser-systemd.py 4.31
teardown 0.00
-------------------------------------------------
Total Run Time 4.31
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit 0da586ec36e0f0a9bd918ea9d1afc6db20d80b65)
Kamalesh Babulal [Fri, 10 Feb 2023 21:51:52 +0000 (14:51 -0700)]
tests/systemd - Add more helpers for cgroup delegation
Add more helpers to work with systemd cgroup delegation, this patch
adds:
- remove_scope_slice_conf() to remove the cgconfig file created and
remove the scope cgroup and slice cgroups.
- write_config_with_pid() to write a cgconfig file with the systemd
configurations.
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit c49b9aebd8c27b06cb3a7742a9daf2adfc20138c)
Kamalesh Babulal [Fri, 10 Feb 2023 21:51:40 +0000 (14:51 -0700)]
tests/cgroup - Add more helpers for cgroup delegation
Add more helpers to work with systemd cgroup delegation, this patch
adds:
- create_and_validate() to create cgroups and validate if they were
created under the delegate systemd subtree.
- exists() is called by create_and_validate() to perform the
validation part.
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>
(cherry picked from commit 2b383cf6eb379efca0f0ee807c7fc2d648640ebb)
Tom Hromatka [Fri, 10 Feb 2023 21:51:03 +0000 (14:51 -0700)]
ftests: Add ignore_systemd support to the CLI tools
Add ignore_systemd support (-b flag) to the CLI tools in the functional
tests, so that the functions calling the CLI tools are aware of the
delegated systemd subtree support in the tools and switch between cgroup
controllers root and systemd subtree using -b switch.
[Kamalesh extended the -b flags to some of the CLI tools] Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit 7ad92f62b9d1db753f6627cd850f07aacac36645)
Kamalesh Babulal [Fri, 10 Feb 2023 21:50:51 +0000 (14:50 -0700)]
tests/cgroup: Add None as controller get_controller_mount_point()
Cgroup hybrid/unified setup modes support creating cgroups without
attaching them to any controller. Enhance get_controller_mount_point()
to support 'None' as a valid controller and return a mount point.
Kamalesh Babulal [Fri, 10 Feb 2023 21:50:40 +0000 (14:50 -0700)]
tools/cgexec: add support for default systemd delegation slice/scope
Enhance the cgexec tool to support default systemd delegation
slice/scope, if set in the cgconfig.conf's systemd setting. Parse the
configuration file and read the systemd::delegate setting, if any, and
set it as the default systemd slice/scope in
systemd_default_cgroup. Setting it appends the slice/scope
name to the constructed default cgroup mount path.
When the user passes the relative cgroup name, its appends to the
sub-tree (delegated slice/scope) by default and if the user wishes to
create a cgroup in another subtree or cgroup root hierarchy, they need
to use the absolute path. For example:
Kamalesh Babulal [Fri, 10 Feb 2023 21:50:22 +0000 (14:50 -0700)]
tools/cgclassify: add support for default systemd delegation slice/scope
Enhance the cgclassify tool to support default systemd delegation
slice/scope, if set in the cgconfig.conf's systemd setting. Parse the
configuration file and read the systemd::delegate setting, if
any, and set it as the default systemd slice/scope in
systemd_default_cgroup. Setting it appends the slice/scope
name to the constructed default cgroup mount path.
When the user passes the relative cgroup name, its appends to the
sub-tree (delegated slice/scope) by default and if the user wishes to
create a cgroup in another subtree or cgroup root hierarchy, they need
to use the absolute path. For example:
Kamalesh Babulal [Fri, 10 Feb 2023 21:50:05 +0000 (14:50 -0700)]
tools/lscgroup: add support for default systemd delegation slice/scope
Enhance the lscgroup tool to support default systemd delegation
slice/scope, if set in the cgconfig.conf's systemd setting. Parse the
configuration file and read the systemd::delegate setting, if
any, and set it as the default systemd slice/scope in
systemd_default_cgroup. Setting it appends the slice/scope
name to the constructed default cgroup mount path.
When the user passes the relative cgroup name, its appends to the
sub-tree (delegated slice/scope) by default and if the user wishes to
create a cgroup in another subtree or cgroup root hierarchy, they need
to use the absolute path. For example:
Kamalesh Babulal [Fri, 10 Feb 2023 21:49:50 +0000 (14:49 -0700)]
tools/cgcreate: add support for default systemd delegation slice/scope
Enhance the cgcreate tool to support default systemd delegation
slice/scope, if set in the cgconfig.conf's systemd setting. Parse the
configuration file and read the systemd::delegate setting, if
any, and set it as the default systemd slice/scope in
systemd_default_cgroup. Setting it appends the slice/scope
name to the constructed default cgroup mount path.
When the user passes the relative cgroup name, its appends to the
sub-tree (delegated slice/scope) by default and if the user wishes to
create a cgroup in another subtree or cgroup root hierarchy, they need
to use the absolute path. For example:
Kamalesh Babulal [Fri, 10 Feb 2023 21:49:28 +0000 (14:49 -0700)]
tools/cgxset add support for default systemd delegation slice/scope
Enhance the cgxset tool to support default systemd delegation slice/scope,
if set in the cgconfig.conf's systemd setting. Parse the configuration
file and read the systemd::delegate setting, if any, and set it as
the default systemd slice/scope in systemd_default_cgroup.
Setting it appends the slice/scope name to the constructed default cgroup
mount path.
When the user passes the relative cgroup name, its appends to the
sub-tree (delegated slice/scope) by default and if the user wishes to set
controller::value in a cgroup under another subtree or cgroup root
hierarchy, they need to use the absolute path. For example:
cgroup_root
/ \
/ \
systemd.slice* cgrp1
|
systemd.scope
|
cgrp-d1
* default system delegation slice/scope - read from cgconfig.conf
Kamalesh Babulal [Fri, 10 Feb 2023 21:49:13 +0000 (14:49 -0700)]
tools/cgxget: add support for default systemd delegation slice/scope
Enhance the cgxget tool to support default systemd delegation
slice/scope, if set in the cgconfig.conf's systemd setting. Parse the
configuration file and read the systemd::delegate setting, if any, and
set it as the default systemd slice/scope in systemd_default_cgroup.
Setting it appends the slice/scope name to the constructed default cgroup
mount path.
When the user passes the relative cgroup name, its appends to the
sub-tree (delegated slice/scope) by default and if the user wishes to get
details about the cgroups in another subtree or cgroup root hierarchy,
they need to use the absolute path. For example:
cgroup_root
/ \
/ \
systemd.slice* cgrp1
|
systemd.scope
|
cgrp-d1
* default system delegation slice/scope - read from cgconfig.conf
$ sudo cgxget -1 -r cpu.shares cgrp-d1
will display the cpu controller information under the
cgroup_root:systemd_default_cgroup:cgrp-d1
and for viewing the cpu controller information of cgrp1, the user
can use:
$ sudo cgxget -1 -r cpu.shares /cgrp1
or use the newly introduced -b switch to ignore the systemd
slice/scope:
$ sudo cgxget -b -1 -r cpu.shares /cgrp1
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
TJH: Fix minor typo in a comment where delegate was written instead
of setdefault
(cherry picked from commit 36ed9afee2dfbd6b5e16df6d5f37cd05bb44eecb)
Kamalesh Babulal [Fri, 10 Feb 2023 21:48:48 +0000 (14:48 -0700)]
tools/cgdelete: add support for default systemd delegation slice/scope
Enhance the cgdelete tool to support default systemd delegation
slice/scope, if set in the cgconfig.conf's systemd setting. Parse the
configuration file and read the systemd::delegate setting, if any,
and set it as the default systemd slice/scope in systemd_default_cgroup.
Setting it appends the slice/scope name to the constructed default cgroup
mount path.
When the user passes the relative cgroup name, its appends to the
sub-tree (delegated slice/scope) by default and if the user wishes to
delete the cgroups in another subtree or cgroup root hierarchy, they
need to use the absolute path. For example:
cgroup_root
/ \
/ \
systemd.slice* cgrp1
|
systemd.scope
|
cgrp-d1
* default system delegation slice/scope - read from cgconfig.conf
$ sudo cgdelete -g cpu:cgrp-d1
will delete the cgroup cgrp-d1 under the
cgroup_root:systemd_default_cgroup:cgrp-d1
and for deleting the cgroup cgrp1, the user can use:
$ sudo cgdelete -g cpu:/cgrp1
or use the newly introduced -b switch to ignore the systemd slice/scope:
$ sudo cgdelete -b -g cpu:cgrp1
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit 529f0e77f4e252187298a4e91c891efc1223cd56)
Kamalesh Babulal [Fri, 10 Feb 2023 21:48:33 +0000 (14:48 -0700)]
tools/cgset: add support for default systemd delegation slice/scope
Enhance the cgset tool to support default systemd delegation
slice/scope, if set in the cgconfig.conf's systemd setting. Parse the
configuration file and read the systemd::delegate setting, if any,
and set it as the default systemd slice/scope in systemd_default_cgroup.
Setting it appends the slice/scope name to the constructed default cgroup
mount path.
When the user passes the relative cgroup name, it appends to the
sub-tree (delegated slice/scope) by default and if the user wishes to set
controller::value in a cgroup under another subtree or cgroup root
hierarchy, they need to use the absolute path. For example:
cgroup_root
/ \
/ \
systemd.slice* cgrp1
|
systemd.scope
|
cgrp-d1
* default system delegation slice/scope - read from cgconfig.conf
$ sudo ./src/tools/cgset -r cpu.weight=99 cgrp-d1
will set the cpu controller::cpu.weight setting under the
cgroup_root:systemd_default_cgroup:cgrp-d1
and for setting the cpu controller information of cgrp1, the user can
use:
$ sudo ./src/tools/cgset -r cpu.weight=99 /cgrp1
or use the newly introduced -b switch to ignore the systemd slice/scope:
$ sudo ./src/tools/cgset -b -r cpu.weight=99 cgrp1
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit 4dccb28d4a85990896940ec831cb88a90e778036)
Kamalesh Babulal [Fri, 10 Feb 2023 21:48:14 +0000 (14:48 -0700)]
tools/cgget: add support for default systemd delegation slice/scope
Enhance the cgget tool to support default systemd delegation
slice/scope, if set in the cgconfig.conf's systemd setting.
Parse the configuration file and read the systemd::delegate setting,
if any, and set it as the default systemd slice/scope in
systemd_default_cgroup. Setting it appends the slice/scope name to
the constructed default cgroup mount path.
When the user passes the relative cgroup name, its appends to the
sub-tree (delegated slice/scope) by default and if the user wishes to get
details about the cgroups in another subtree or cgroup root hierarchy,
they need to use the absolute path. For example:
cgroup_root
/ \
/ \
systemd.slice[1] cgrp1
|
systemd.scope
|
cgrp-d1
[1] default systemd delegation slice/scope - read from cgconfig.conf
$ sudo cgget -g cpu:cgrp-d1
will display the CPU controller information under the
cgroup_root:systemd_default_cgroup:cgrp-d1
and for viewing the CPU controller information of cgrp1, the user can
use:
$ sudo cgget -g cpu:/cgrp1
or use the newly introduced -b switch to ignore the systemd slice/scope:
$ sudo cgget -b -g cpu:cgrp
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
TJH: Fix minor typo in a comment where delegate was written instead
of setdefault
(cherry picked from commit aa9c756add6f1ca9b61cb54ce1334d6b0be745b9)
Kamalesh Babulal [Fri, 10 Feb 2023 21:47:52 +0000 (14:47 -0700)]
tools/Makefile: add WITH_SYSTEMD CFLAGS
Introduce EXTRA_CFLAGS, "-DWITH_SYSTEMD" that will get passed to tools
and depending upon the configure options, enable and disable the systemd
support.
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit b6f81ed5cd67173d722db854bda14157476b75b9)
Kamalesh Babulal [Fri, 10 Feb 2023 21:47:38 +0000 (14:47 -0700)]
API: add cgroup_set_default_systemd_cgroup()
Introduce an API cgroup_set_default_systemd_cgroup(), that reads the
systemd_default_cgroup_file, if exists, and only sets the
systemd_default_cgroup path if both of the following conditions are met:
1. The minimum length of the default slice/scope read is 15
characters, because at the minimum it should be <n>.slice/<n>.scope.
2. Checks if the /sys/fs/cgroup/<systemd_default_cgroup> cgroup exists
and if it doesn't, it also deletes the systemd_default_cgroup_file
(/var/run/libcgroup/systemd) file.
this will be used by the tools and can be used by any applications
to set the default cgroup tree to systemd_default_cgroup after loading
the cgconfig.conf file(s).
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit 23f9f03fd4ff5c7e48438813650b21b7cfbc11be)
Kamalesh Babulal [Fri, 10 Feb 2023 21:47:23 +0000 (14:47 -0700)]
samples/config: add a sample systemd delegation configuration
Add a sample cgconfig.conf configuration file, that serves as a template
for systemd delegation and how users can control the resources limit
allocation such as cpu, memory, or any other valid cgroup settings for
the systemd slice/scope cgroup created.
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit a06b236316d27cc19f5d0bbfd3ecf197328170c9)
cg_build_path() constructs the cgroup path to the mount point of the
given cgroup controller. With the support for the default systemd scope,
the default cgroup path for the controller, appends the slice/scope
name, making it the default cgroup root.
Allowing the users to set their default cgroup path from
'/sys/fs/cgroup/' to
'/sys/fs/cgroup/<systemd slice name>/<systemd scope name>/', while
using the libcgroup tools, allowing them to work on the delegated
cgroup hierarchy.
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit e4ec9a941ec0d1a92934a97a4226bb1fe14a34aa)
Kamalesh Babulal [Fri, 10 Feb 2023 21:46:45 +0000 (14:46 -0700)]
config: Support systemd's slice/scope creation/delegation using configuration
Add support for the creation of systemd slices and scopes (transient).
Users can create a systemd slice and scope using the new setting
'systemd' in the cgconfig.conf.
systemd configuration requires two mandatory settings, slice and scope,
those represent the systemd slice and scope name and other optional
settings are 'setdefault', that allows the users to append one of the
systemd slice/scope name to as default cgroup root, making the delegated
subtree as the new cgroup root, i.e., the default cgroup path is
changed to '/sys/fs/cgroup/database.slice/db.scope/' from
'/sys/fs/cgroup/', this is useful to the libcgroup tools, where users
can work on new subtree hierarchy, they created and other optional
setting is pid, which can be used as the default task for transient
scope, created by us, by default a task that spins an idle loop is
created and set as default task.
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
TJH: Fix minor typos in a couple comments where delegate was written
instead of setdefault
TJH: Explicitly initialize the list head and tail to NULL. May not be
needed but better safe than sorry
(cherry picked from commit 4fd38393d3934e62351a680bdad0c9f4deb4d3d2)
Kamalesh Babulal [Fri, 10 Feb 2023 21:46:27 +0000 (14:46 -0700)]
api.c: cg_build_path_locked() - work around snprintf() warnings
Recent gcc are unhappy when sizeof(dest) <= sizeof(src) with
snprintf()'s. We could need too many strncpy()'s and strcat()'s for
constructing file path, so let's workaround it by allocating long
enough space for keeping snprintf() happy and then use the temporarily
allocated array and use it as src for strncpy() with limit of
FILENAME_MAX.
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit e751b3236c7ed2544e49f377bb6356872b313c31)
tests/gunit: Extend the fuzzer to test cgroup_new_cgroup()
Add fuzzing to the cgroup_new_cgroup() API, by passing NULL as cgroup
name.
[----------] 2 tests from APIArgsTest
[ RUN ] APIArgsTest.API_cgroup_set_permissions
[ OK ] APIArgsTest.API_cgroup_set_permissions (0 ms)
[ RUN ] APIArgsTest.API_cgroup_new_cgroup
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit be62c2649a845726ca67faa7707fbeae7eb84c90)
Tom Hromatka [Thu, 2 Feb 2023 15:12:09 +0000 (08:12 -0700)]
github: Update to checkout@v3
Update the checkout action to v3. This is to appease the
following warning:
Node.js 12 actions are deprecated. Please update the
following actions to use Node.js 16: actions/checkout@v2,
actions/setup-python@v2. For more information see:
https://github.blog/changelog/2022-09-22-github-actions-all-actions-will-begin-running-on-node16-instead-of-node12/.
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com> Reviewed-by: Kamalesh Babulal <kamalesh.babulal@oracle.com>
(cherry picked from commit 0d4660202c7357b394d59e078bc00705937e7f78)
Tom Hromatka [Thu, 2 Feb 2023 15:11:54 +0000 (08:11 -0700)]
github: Update actions to remove warnings
Update the setup-python action to v4 and the upload-artifact
action to v3. This should remove the following warnings:
Node.js 12 actions are deprecated. Please update the following
actions to use Node.js 16: actions/setup-python@v2. For more
information see:
https://github.blog/changelog/2022-09-22-github-actions-all-actions-will-begin-running-on-node16-instead-of-node12/.
Node.js 12 actions are deprecated. Please update the following
actions to use Node.js 16: actions/upload-artifact@v2,
coverallsapp/github-action@master. For more information see:
https://github.blog/changelog/2022-09-22-github-actions-all-actions-will-begin-running-on-node16-instead-of-node12/
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com> Reviewed-by: Kamalesh Babulal <kamalesh.babulal@oracle.com>
(cherry picked from commit aa03bb20393ab881ed164cf28fd81b244075defe)
Kamalesh Babulal [Tue, 31 Jan 2023 18:30:56 +0000 (11:30 -0700)]
tests/gunit: Add a simple fuzzer
Add a simple fuzzing test case that would exercise API's unlikely code
paths by passing NULL/negative values as arguments.
Output:
--------
[...]
[----------] 1 test from APIArgsTest
[ RUN ] APIArgsTest.API_cgroup_set_permissions
[ OK ] APIArgsTest.API_cgroup_set_permissions (0 ms)
[----------] 1 test from APIArgsTest (0 ms total)
to begin with, it exercises cgroup_set_permissions() by passing a NULL
pointer in place of struct cgroup. This test case will be extended to
cover almost all APIs.
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit dac22679ee3e888be5dedc50e22e0d001bfceb4a)
Kamalesh Babulal [Tue, 31 Jan 2023 18:30:21 +0000 (11:30 -0700)]
api: fix segfault in cgroup_set_permissions()
In cgroup_set_permissions(), we don't validate the cgroup and a NULL may
be passed to it in place of the cgroup, causing a segfault, when the
NULL pointer is dereferenced to set the permissions. This patch
introduces a check to validate the cgroup argument.
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit 9795cdf9c18878388b9aa5c428c29eca8d6ad0a7)
Tom Hromatka [Fri, 27 Jan 2023 21:10:45 +0000 (14:10 -0700)]
github: Roll back distcheck and v1 functests to Ubuntu 20.04
Ubuntu 22.04 VMs hosted by Github cannot find the LXD package.
Revert back to Ubuntu 20.04 for the Dist Check and the v1
Functional Test jobs until Github gets this sorted out.
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com> Reviewed-by: Kamalesh Babulal <kamalesh.babulal@oracle.com>
(cherry picked from commit 6b83b7f200ee1b110c526e17c15ecd954e1e363f)
Tom Hromatka [Fri, 27 Jan 2023 21:10:36 +0000 (14:10 -0700)]
ftests: Add a test to exercise invalid systemd parameters
Add a test that exercises invalid parameters to
cgroup_create_scope2().
-----------------------------------------------------------------
Test Results:
Run Date: Jan 25 09:32:58
Passed: 1 test(s)
Skipped: 0 test(s)
Failed: 0 test(s)
-----------------------------------------------------------------
Timing Results:
Test Time (sec)
--------------------------------------------------------
setup 0.00
059-sudo-invalid_systemd_create_scope2.py 0.00
teardown 0.00
--------------------------------------------------------
Total Run Time 0.00
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com> Reviewed-by: Kamalesh Babulal <kamalesh.babulal@oracle.com>
(cherry picked from commit 8012757a76d1d9f179ca33fa156397c0ea53e72b)
Tom Hromatka [Fri, 27 Jan 2023 21:10:18 +0000 (14:10 -0700)]
ftests: Add a test for creating a systemd scope
Add a test to exercise cgroup_create_scope2().
-----------------------------------------------------------------
Test Results:
Run Date: Nov 18 16:12:16
Passed: 1 test(s)
Skipped: 0 test(s)
Failed: 0 test(s)
-----------------------------------------------------------------
Timing Results:
Test Time (sec)
------------------------------------------------
setup 0.00
058-sudo-systemd_create_scope2.py 2.05
teardown 0.00
------------------------------------------------
Total Run Time 2.05
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com> Reviewed-by: Kamalesh Babulal <kamalesh.babulal@oracle.com>
(cherry picked from commit e6d6a5e441ad6a3a55ddd54892caeca3b032efe3)
Tom Hromatka [Fri, 27 Jan 2023 21:09:47 +0000 (14:09 -0700)]
ftests: Add a test for setting permissions
Add a test to exercise the python bindings to set permissions on
a cgroup.
-----------------------------------------------------------------
Test Results:
Run Date: Nov 17 22:00:51
Passed: 1 test(s)
Skipped: 0 test(s)
Failed: 0 test(s)
-----------------------------------------------------------------
Timing Results:
Test Time (sec)
---------------------------------------------
setup 0.00
057-sudo-set_permissions_v1.py 0.05
teardown 0.00
---------------------------------------------
Total Run Time 0.05
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com> Reviewed-by: Kamalesh Babulal <kamalesh.babulal@oracle.com>
(cherry picked from commit 1a5e4d894800ea686ecd8fd43faba983e7d4585d)
Tom Hromatka [Fri, 27 Jan 2023 21:09:32 +0000 (14:09 -0700)]
ftests: Add a test for setting permissions
Add a test to exercise the python bindings to set permissions on
a cgroup.
-----------------------------------------------------------------
Test Results:
Run Date: Nov 17 21:55:52
Passed: 1 test(s)
Skipped: 0 test(s)
Failed: 0 test(s)
-----------------------------------------------------------------
Timing Results:
Test Time (sec)
---------------------------------------------
setup 0.00
056-sudo-set_permissions_v2.py 0.05
teardown 0.00
---------------------------------------------
Total Run Time 0.05
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com> Reviewed-by: Kamalesh Babulal <kamalesh.babulal@oracle.com>
(cherry picked from commit 6bd95ff4ced4be209f0b505df5a0dcc95e8bbc89)
Tom Hromatka [Fri, 27 Jan 2023 21:09:23 +0000 (14:09 -0700)]
ftests: Add a test for set uid/gid
Add a test to exercise the python bindings to set the uid/gid on
a cgroup.
-----------------------------------------------------------------
Test Results:
Run Date: Nov 17 21:10:08
Passed: 1 test(s)
Skipped: 0 test(s)
Failed: 0 test(s)
-----------------------------------------------------------------
Timing Results:
Test Time (sec)
-----------------------------------------
setup 0.00
055-sudo-set_uid_gid_v1.py 0.05
teardown 0.00
-----------------------------------------
Total Run Time 0.05
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com> Reviewed-by: Kamalesh Babulal <kamalesh.babulal@oracle.com>
(cherry picked from commit 9d2dbb7f22a5bbb9d3c32f405b0d954e1fb77081)
Tom Hromatka [Fri, 27 Jan 2023 21:09:12 +0000 (14:09 -0700)]
ftests: Add a test for set uid/gid
Add a test to exercise the python bindings to set the uid/gid on
a cgroup.
-----------------------------------------------------------------
Test Results:
Run Date: Nov 16 23:12:25
Passed: 1 test(s)
Skipped: 0 test(s)
Failed: 0 test(s)
-----------------------------------------------------------------
Timing Results:
Test Time (sec)
-----------------------------------------
setup 0.00
054-sudo-set_uid_gid_v2.py 0.02
teardown 0.00
-----------------------------------------
Total Run Time 0.02
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com> Reviewed-by: Kamalesh Babulal <kamalesh.babulal@oracle.com>
(cherry picked from commit a7b6d6d0690aaa1f9d54736ca69c5fe84fe9a30b)
Tom Hromatka [Fri, 27 Jan 2023 21:08:52 +0000 (14:08 -0700)]
ftests: Change util get uid/gid functions to return an int
get_file_owner_uid() and get_file_owner_gid() previously returned
the owning uid and gid as strings, respectively. Change them to
return the uid and gid as ints.
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com> Reviewed-by: Kamalesh Babulal <kamalesh.babulal@oracle.com>
(cherry picked from commit 3db22a7aec2bc3e6a5f896b57abfffc46cc677e5)
Tom Hromatka [Fri, 27 Jan 2023 21:08:25 +0000 (14:08 -0700)]
systemd: Add cgroup_create_scope2()
Add cgroup_create_scope2() as a wrapper function around
cgroup_create_scope(). cgroup_create_scope2() is more libcgroup-ish
and utilizes struct cgroup rather than systemd-style parameters.
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com> Reviewed-by: Kamalesh Babulal <kamalesh.babulal@oracle.com>
(cherry picked from commit a1ec6c4ec58710451ef73a2043fdfb192028babc)
Kamalesh Babulal [Tue, 24 Jan 2023 19:43:20 +0000 (12:43 -0700)]
ftests: Add recursive cgdelete function test on shared mount
Add a test that tries deleting non-existing cgroups on shared mount
mount shared by controllers on cgroup v1.
-----------------------------------------------------------------
Test Results:
Run Date: Jan 23 09:21:48
Passed: 1 test(s)
Skipped: 0 test(s)
Failed: 0 test(s)
-----------------------------------------------------------------
Timing Results:
Test Time (sec)
----------------------------------------------------------------
setup 0.00
098-cgdelete-non-existing-shared-mnt-cgroup-v1.py 0.03
teardown 0.00
----------------------------------------------------------------
Total Run Time 0.03
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
TJH: Fix minor variable name typo. Also, add the new test to the EXTRA
DIST list in Makefile.am
(cherry picked from commit 01fc4107de92ea2818de82399cae41ded527addf)
Kamalesh Babulal [Tue, 24 Jan 2023 19:43:02 +0000 (12:43 -0700)]
tests-047: adopt the change to cgroup_delete_cgroup_ext()
With the bug fix to the cgroup_delete_cgroup_ext(), where calling
cgdelete twice back to back (not using -r option) on the cgroup created
on the mount point shared by the controller will fail. Adopt the
change in the API to testcase too.
Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com> Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
(cherry picked from commit 1179fa92a66e763db878a963336a154d5acb5fd7)
Kamalesh Babulal [Tue, 24 Jan 2023 19:42:19 +0000 (12:42 -0700)]
src/api: Fix cgroup_delete_cgroup_ext() on shared mount point
In cgroup v1, the controllers can share mount points and when the cgroup
is deleted on one of controller mount point (symlink), as the side effect
are deleted for the controllers sharing the mount point. But this might
not true always, the user might try call cgroup_delete_cgroup_ext() with
a cgroup that doesn't exist over the share mount point and still get the
return code to be zero.
Fix this issue by introducing cgrp_del_shared_mnt flag, that gets set
when deleting the cgroup on the first of the controllers sharing the
mount point and check the flag on the second controller mount point
to ensure that cgroup existed.
projects / thirdparty / libcgroup.git / log
