* [PATCH v3 1/3] kselftest/cgroup: fix unexpected testing failure on test_memcontrol
@ 2019-05-27 6:28 alex.shi
2019-05-27 6:28 ` Alex Shi
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: alex.shi @ 2019-05-27 6:28 UTC (permalink / raw)
The cgroup testing relies 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 unexpected failure, this patch write the 'memory' to
subtree_control of root to get a right result.
Signed-off-by: Alex Shi <alex.shi at linux.alibaba.com>
Cc: Shuah Khan <shuah at kernel.org>
Cc: Roman Gushchin <guro at fb.com>
Cc: Tejun Heo <tj at kernel.org>
Cc: Mike Rapoport <rppt at linux.vnet.ibm.com>
Cc: Jay Kamat <jgkamat at fb.com>
Cc: linux-kselftest at vger.kernel.org
Cc: linux-kernel at vger.kernel.org
Reviewed-by: Roman Gushchin <guro at fb.com>
Acked-by: Tejun Heo <tj at kernel.org>
---
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..c19a97dd02d4 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 memory controller\n");
+
for (i = 0; i < ARRAY_SIZE(tests); i++) {
switch (tests[i].fn(root)) {
case KSFT_PASS:
--
2.19.1.856.g8858448bb
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v3 1/3] kselftest/cgroup: fix unexpected testing failure on test_memcontrol
2019-05-27 6:28 [PATCH v3 1/3] kselftest/cgroup: fix unexpected testing failure on test_memcontrol alex.shi
@ 2019-05-27 6:28 ` Alex Shi
2019-05-27 6:28 ` [PATCH v3 2/3] kselftest/cgroup: fix unexpected testing failure on test_core alex.shi
2019-05-27 6:28 ` [PATCH v3 3/3] kselftest/cgroup: fix incorrect test_core skip alex.shi
2 siblings, 0 replies; 6+ messages in thread
From: Alex Shi @ 2019-05-27 6:28 UTC (permalink / raw)
The cgroup testing relies 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 unexpected failure, this patch write the 'memory' to
subtree_control of root to get a right result.
Signed-off-by: Alex Shi <alex.shi at linux.alibaba.com>
Cc: Shuah Khan <shuah at kernel.org>
Cc: Roman Gushchin <guro at fb.com>
Cc: Tejun Heo <tj at kernel.org>
Cc: Mike Rapoport <rppt at linux.vnet.ibm.com>
Cc: Jay Kamat <jgkamat at fb.com>
Cc: linux-kselftest at vger.kernel.org
Cc: linux-kernel at vger.kernel.org
Reviewed-by: Roman Gushchin <guro at fb.com>
Acked-by: Tejun Heo <tj at kernel.org>
---
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..c19a97dd02d4 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 memory controller\n");
+
for (i = 0; i < ARRAY_SIZE(tests); i++) {
switch (tests[i].fn(root)) {
case KSFT_PASS:
--
2.19.1.856.g8858448bb
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v3 2/3] kselftest/cgroup: fix unexpected testing failure on test_core
2019-05-27 6:28 [PATCH v3 1/3] kselftest/cgroup: fix unexpected testing failure on test_memcontrol alex.shi
2019-05-27 6:28 ` Alex Shi
@ 2019-05-27 6:28 ` alex.shi
2019-05-27 6:28 ` Alex Shi
2019-05-27 6:28 ` [PATCH v3 3/3] kselftest/cgroup: fix incorrect test_core skip alex.shi
2 siblings, 1 reply; 6+ messages in thread
From: alex.shi @ 2019-05-27 6:28 UTC (permalink / raw)
The cgroup testing relys on the root cgroup's subtree_control setting,
If the 'memory' controller isn't set, some test cases will be failed
as following:
$sudo ./test_core
not ok 1 test_cgcore_internal_process_constraint
ok 2 test_cgcore_top_down_constraint_enable
not ok 3 test_cgcore_top_down_constraint_disable
...
To correct this unexpected failure, this patch write the 'memory' to
subtree_control of root to get a right result.
Signed-off-by: Alex Shi <alex.shi at linux.alibaba.com>
Cc: Shuah Khan <shuah at kernel.org>
Cc: Tejun Heo <tj at kernel.org>
Cc: Roman Gushchin <guro at fb.com>
Cc: Claudio Zumbo <claudioz at fb.com>
Cc: Claudio <claudiozumbo at gmail.com>
Cc: linux-kselftest at vger.kernel.org
Cc: linux-kernel at vger.kernel.org
Reviewed-by: Roman Gushchin <guro at fb.com>
Acked-by: Tejun Heo <tj at kernel.org>
---
tools/testing/selftests/cgroup/test_core.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/tools/testing/selftests/cgroup/test_core.c b/tools/testing/selftests/cgroup/test_core.c
index be59f9c34ea2..d78f1c5366d3 100644
--- a/tools/testing/selftests/cgroup/test_core.c
+++ b/tools/testing/selftests/cgroup/test_core.c
@@ -376,6 +376,11 @@ int main(int argc, char *argv[])
if (cg_find_unified_root(root, sizeof(root)))
ksft_exit_skip("cgroup v2 isn't mounted\n");
+
+ if (cg_read_strstr(root, "cgroup.subtree_control", "memory"))
+ if (cg_write(root, "cgroup.subtree_control", "+memory"))
+ ksft_exit_skip("Failed to set memory controller\n");
+
for (i = 0; i < ARRAY_SIZE(tests); i++) {
switch (tests[i].fn(root)) {
case KSFT_PASS:
--
2.19.1.856.g8858448bb
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v3 2/3] kselftest/cgroup: fix unexpected testing failure on test_core
2019-05-27 6:28 ` [PATCH v3 2/3] kselftest/cgroup: fix unexpected testing failure on test_core alex.shi
@ 2019-05-27 6:28 ` Alex Shi
0 siblings, 0 replies; 6+ messages in thread
From: Alex Shi @ 2019-05-27 6:28 UTC (permalink / raw)
The cgroup testing relys on the root cgroup's subtree_control setting,
If the 'memory' controller isn't set, some test cases will be failed
as following:
$sudo ./test_core
not ok 1 test_cgcore_internal_process_constraint
ok 2 test_cgcore_top_down_constraint_enable
not ok 3 test_cgcore_top_down_constraint_disable
...
To correct this unexpected failure, this patch write the 'memory' to
subtree_control of root to get a right result.
Signed-off-by: Alex Shi <alex.shi at linux.alibaba.com>
Cc: Shuah Khan <shuah at kernel.org>
Cc: Tejun Heo <tj at kernel.org>
Cc: Roman Gushchin <guro at fb.com>
Cc: Claudio Zumbo <claudioz at fb.com>
Cc: Claudio <claudiozumbo at gmail.com>
Cc: linux-kselftest at vger.kernel.org
Cc: linux-kernel at vger.kernel.org
Reviewed-by: Roman Gushchin <guro at fb.com>
Acked-by: Tejun Heo <tj at kernel.org>
---
tools/testing/selftests/cgroup/test_core.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/tools/testing/selftests/cgroup/test_core.c b/tools/testing/selftests/cgroup/test_core.c
index be59f9c34ea2..d78f1c5366d3 100644
--- a/tools/testing/selftests/cgroup/test_core.c
+++ b/tools/testing/selftests/cgroup/test_core.c
@@ -376,6 +376,11 @@ int main(int argc, char *argv[])
if (cg_find_unified_root(root, sizeof(root)))
ksft_exit_skip("cgroup v2 isn't mounted\n");
+
+ if (cg_read_strstr(root, "cgroup.subtree_control", "memory"))
+ if (cg_write(root, "cgroup.subtree_control", "+memory"))
+ ksft_exit_skip("Failed to set memory controller\n");
+
for (i = 0; i < ARRAY_SIZE(tests); i++) {
switch (tests[i].fn(root)) {
case KSFT_PASS:
--
2.19.1.856.g8858448bb
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v3 3/3] kselftest/cgroup: fix incorrect test_core skip
2019-05-27 6:28 [PATCH v3 1/3] kselftest/cgroup: fix unexpected testing failure on test_memcontrol alex.shi
2019-05-27 6:28 ` Alex Shi
2019-05-27 6:28 ` [PATCH v3 2/3] kselftest/cgroup: fix unexpected testing failure on test_core alex.shi
@ 2019-05-27 6:28 ` alex.shi
2019-05-27 6:28 ` Alex Shi
2 siblings, 1 reply; 6+ messages in thread
From: alex.shi @ 2019-05-27 6:28 UTC (permalink / raw)
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, to make the testing meaningful.
./test_core
...
ok 4 # skip test_cgcore_no_internal_process_constraint_on_threads
...
Signed-off-by: Alex Shi <alex.shi at linux.alibaba.com>
Cc: Shuah Khan <shuah at kernel.org>
Cc: Tejun Heo <tj at kernel.org>
Cc: Roman Gushchin <guro at fb.com>
Cc: Claudio Zumbo <claudioz at fb.com>
Cc: Claudio <claudiozumbo at gmail.com>
Cc: linux-kselftest at vger.kernel.org
Cc: linux-kernel at vger.kernel.org
Reviewed-by: Roman Gushchin <guro at fb.com>
Acked-by: Tejun Heo <tj at kernel.org>
---
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 d78f1c5366d3..79053a4f4783 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
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v3 3/3] kselftest/cgroup: fix incorrect test_core skip
2019-05-27 6:28 ` [PATCH v3 3/3] kselftest/cgroup: fix incorrect test_core skip alex.shi
@ 2019-05-27 6:28 ` Alex Shi
0 siblings, 0 replies; 6+ messages in thread
From: Alex Shi @ 2019-05-27 6:28 UTC (permalink / raw)
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, to make the testing meaningful.
./test_core
...
ok 4 # skip test_cgcore_no_internal_process_constraint_on_threads
...
Signed-off-by: Alex Shi <alex.shi at linux.alibaba.com>
Cc: Shuah Khan <shuah at kernel.org>
Cc: Tejun Heo <tj at kernel.org>
Cc: Roman Gushchin <guro at fb.com>
Cc: Claudio Zumbo <claudioz at fb.com>
Cc: Claudio <claudiozumbo at gmail.com>
Cc: linux-kselftest at vger.kernel.org
Cc: linux-kernel at vger.kernel.org
Reviewed-by: Roman Gushchin <guro at fb.com>
Acked-by: Tejun Heo <tj at kernel.org>
---
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 d78f1c5366d3..79053a4f4783 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
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-05-27 6:28 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-05-27 6:28 [PATCH v3 1/3] kselftest/cgroup: fix unexpected testing failure on test_memcontrol alex.shi
2019-05-27 6:28 ` Alex Shi
2019-05-27 6:28 ` [PATCH v3 2/3] kselftest/cgroup: fix unexpected testing failure on test_core alex.shi
2019-05-27 6:28 ` Alex Shi
2019-05-27 6:28 ` [PATCH v3 3/3] kselftest/cgroup: fix incorrect test_core skip alex.shi
2019-05-27 6:28 ` Alex Shi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox