2019-05-15 09:09:58

by Alex Shi

[permalink] [raw]
Subject: [PATCH 1/3] kselftest/cgroup: fix unexcepted testing failure on test_memcontrol

The cgroup testing relys on the root cgroup's subtree_control setting,
If the 'memory' controller isn't set, all test cases will be failed
as following:

$ sudo ./test_memcontrol
not ok 1 test_memcg_subtree_control
not ok 2 test_memcg_current
ok 3 # skip test_memcg_min
not ok 4 test_memcg_low
not ok 5 test_memcg_high
not ok 6 test_memcg_max
not ok 7 test_memcg_oom_events
ok 8 # skip test_memcg_swap_max
not ok 9 test_memcg_sock
not ok 10 test_memcg_oom_group_leaf_events
not ok 11 test_memcg_oom_group_parent_events
not ok 12 test_memcg_oom_group_score_events

To correct this unexcepted failure, this patch write the 'memory' to
subtree_control of root to get a right result.

Signed-off-by: Alex Shi <[email protected]>
Cc: Shuah Khan <[email protected]>
Cc: Roman Gushchin <[email protected]>
Cc: Tejun Heo <[email protected]>
Cc: Mike Rapoport <[email protected]>
Cc: Jay Kamat <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
tools/testing/selftests/cgroup/test_memcontrol.c | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/tools/testing/selftests/cgroup/test_memcontrol.c b/tools/testing/selftests/cgroup/test_memcontrol.c
index 6f339882a6ca..73612d604a2a 100644
--- a/tools/testing/selftests/cgroup/test_memcontrol.c
+++ b/tools/testing/selftests/cgroup/test_memcontrol.c
@@ -1205,6 +1205,10 @@ int main(int argc, char **argv)
if (cg_read_strstr(root, "cgroup.controllers", "memory"))
ksft_exit_skip("memory controller isn't available\n");

+ if (cg_read_strstr(root, "cgroup.subtree_control", "memory"))
+ if (cg_write(root, "cgroup.subtree_control", "+memory"))
+ ksft_exit_skip("Failed to set root memory controller\n");
+
for (i = 0; i < ARRAY_SIZE(tests); i++) {
switch (tests[i].fn(root)) {
case KSFT_PASS:
--
2.19.1.856.g8858448bb


2019-05-15 09:10:06

by Alex Shi

[permalink] [raw]
Subject: [PATCH 3/3] kselftest/cgroup: fix incorrect test_core skip

The test_core will skip the
test_cgcore_no_internal_process_constraint_on_threads test case if the
'cpu' controller missing in root's subtree_control. In fact we need to
set the 'cpu' in subtree_control, then the testing is meaningful.

./test_core
...
ok 4 # skip test_cgcore_no_internal_process_constraint_on_threads
...

Signed-off-by: Alex Shi <[email protected]>
Cc: Shuah Khan <[email protected]>
Cc: Tejun Heo <[email protected]>
Cc: Roman Gushchin <[email protected]>
Cc: Claudio Zumbo <[email protected]>
Cc: Claudio <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
tools/testing/selftests/cgroup/test_core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/testing/selftests/cgroup/test_core.c b/tools/testing/selftests/cgroup/test_core.c
index b1a570d7c557..2ffc3e07d98d 100644
--- a/tools/testing/selftests/cgroup/test_core.c
+++ b/tools/testing/selftests/cgroup/test_core.c
@@ -198,7 +198,7 @@ static int test_cgcore_no_internal_process_constraint_on_threads(const char *roo
char *parent = NULL, *child = NULL;

if (cg_read_strstr(root, "cgroup.controllers", "cpu") ||
- cg_read_strstr(root, "cgroup.subtree_control", "cpu")) {
+ cg_write(root, "cgroup.subtree_control", "+cpu")) {
ret = KSFT_SKIP;
goto cleanup;
}
--
2.19.1.856.g8858448bb

2019-05-20 03:49:53

by Alex Shi

[permalink] [raw]
Subject: Re: [PATCH 1/3] kselftest/cgroup: fix unexcepted testing failure on test_memcontrol


> Hi Alex!
>
> Sorry for the late reply, somehow I missed your e-mails.
>
> The patchset looks good to me, except a typo in subjects/commit logs:
> you probably meant "unexpected failures".
>
> Please, fix and feel free to use:
> Reviewed-by: Roman Gushchin <[email protected]>
> for the series.

Hi Roman,

Thanks for the typo correct and review. I will resend them with your suggestion.

BTW, How do you test cgroup2 except kselftest? Any other function/performance testing case?

Thanks a lot!
Alex

2019-05-20 04:51:00

by Alex Shi

[permalink] [raw]
Subject: Re: [PATCH 1/3] kselftest/cgroup: fix unexcepted testing failure on test_memcontrol


> Hi Alex!
>
> Sorry for the late reply, somehow I missed your e-mails.
>
> The patchset looks good to me, except a typo in subjects/commit logs:
> you probably meant "unexpected failures".
>
> Please, fix and feel free to use:
> Reviewed-by: Roman Gushchin <[email protected]>
> for the series.
>

Thanks Roman!

BTW, do you know other test cases for cgroup2 function or performance?

Thanks
Alex