diff --git a/tools/testing/selftests/cgroup/test_memcontrol.c b/tools/testing/selftests/cgroup/test_memcontrol.c index 7bcf772bcea2..a88241d14b7d 100644 --- a/tools/testing/selftests/cgroup/test_memcontrol.c +++ b/tools/testing/selftests/cgroup/test_memcontrol.c @@ -1379,6 +1379,24 @@ free_ainfo: return ret; } +static bool memcg_sockets_disabled(void) +{ + char buf[4 * BUF_SIZE], *opt; + + if (read_text("/proc/cmdline", buf, sizeof(buf)) <= 0) + return false; + + for (opt = strstr(buf, "cgroup.memory="); opt; + opt = strstr(opt + 1, "cgroup.memory=")) { + char *end = strchrnul(opt, ' '); + char *ns = strstr(opt, "nosocket"); + + if (ns && ns < end) + return true; + } + return false; +} + /* * This test checks socket memory accounting. * The test forks a TCP server listens on a random port between 1000 @@ -1394,6 +1412,9 @@ static int test_memcg_sock(const char *root) char *memcg; long sock_post = -1; + if (memcg_sockets_disabled()) + return KSFT_SKIP; + memcg = cg_name(root, "memcg_test"); if (!memcg) goto cleanup;