diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2021-10-11 14:19:42 +0200 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2021-10-12 15:25:31 +0200 |
| commit | 607ad2b370822491f074f06a4e751c23cfefce05 (patch) | |
| tree | 4ecdc0a0a2ddccb3f6e366dff55523d9427aab5d /pkg/csource | |
| parent | fe37c8029dd9595e960f518080e12f79f832386a (diff) | |
executor: setup cgroups once
Currently we setup cgroups on every test process start
(along with sandbox creation). That's unnecessary because
that's global per-machine setup. Move cgroup setup into setup section
that's executed once per machine from pkg/host.Setup.
Diffstat (limited to 'pkg/csource')
| -rw-r--r-- | pkg/csource/generated.go | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/pkg/csource/generated.go b/pkg/csource/generated.go index 4662a8b84..69da1124d 100644 --- a/pkg/csource/generated.go +++ b/pkg/csource/generated.go @@ -8128,10 +8128,6 @@ static void mount_cgroups(const char* dir, const char** controllers, int count) static void setup_cgroups() { -#if SYZ_EXECUTOR - if (!flag_cgroups) - return; -#endif const char* unified_controllers[] = {"+cpu", "+memory", "+io", "+pids", "+rdma"}; const char* net_controllers[] = {"net", "net_cls", "net_prio", "devices", "blkio", "freezer"}; const char* cpu_controllers[] = {"cpuset", "cpuacct", "perf_event", "hugetlb", "rlimit"}; @@ -8260,9 +8256,6 @@ static void setup_common() if (mount(0, "/sys/fs/fuse/connections", "fusectl", 0, 0)) { debug("mount(fusectl) failed: %d\n", errno); } -#if SYZ_EXECUTOR || SYZ_CGROUPS - setup_cgroups(); -#endif } #include <sched.h> @@ -10660,6 +10653,9 @@ int main(void) #if SYZ_SYSCTL setup_sysctl(); #endif +#if SYZ_CGROUPS + setup_cgroups(); +#endif #if SYZ_BINFMT_MISC setup_binfmt_misc(); #endif |