From 76decb8275c764d309b8daf5ab9dc573b2411ddf Mon Sep 17 00:00:00 2001 From: Aleksandr Nogikh Date: Wed, 14 Jun 2023 15:37:49 +0200 Subject: executor: use v1 memory cgroup controller Given that we must chose only one version, fuzzing v1 of itseems to be of higher value at the moment. Later we might make it a configurable option and do both version. --- pkg/csource/generated.go | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'pkg') diff --git a/pkg/csource/generated.go b/pkg/csource/generated.go index 9f73f41e4..2d24df5ec 100644 --- a/pkg/csource/generated.go +++ b/pkg/csource/generated.go @@ -9071,9 +9071,9 @@ static void mount_cgroups2(const char** controllers, int count) static void setup_cgroups() { - const char* unified_controllers[] = {"+cpu", "+memory", "+io", "+pids"}; + const char* unified_controllers[] = {"+cpu", "+io", "+pids"}; const char* net_controllers[] = {"net", "net_prio", "devices", "blkio", "freezer"}; - const char* cpu_controllers[] = {"cpuset", "cpuacct", "hugetlb", "rlimit"}; + const char* cpu_controllers[] = {"cpuset", "cpuacct", "hugetlb", "rlimit", "memory"}; if (mkdir("/syzcgroup", 0777)) { debug("mkdir(/syzcgroup) failed: %d\n", errno); return; @@ -9101,12 +9101,6 @@ static void setup_cgroups_loop() } snprintf(file, sizeof(file), "%s/pids.max", cgroupdir); write_file(file, "32"); - snprintf(file, sizeof(file), "%s/memory.low", cgroupdir); - write_file(file, "%d", 298 << 20); - snprintf(file, sizeof(file), "%s/memory.high", cgroupdir); - write_file(file, "%d", 299 << 20); - snprintf(file, sizeof(file), "%s/memory.max", cgroupdir); - write_file(file, "%d", 300 << 20); snprintf(file, sizeof(file), "%s/cgroup.procs", cgroupdir); write_file(file, "%d", pid); snprintf(cgroupdir, sizeof(cgroupdir), "/syzcgroup/cpu/syz%llu", procid); @@ -9115,6 +9109,10 @@ static void setup_cgroups_loop() } snprintf(file, sizeof(file), "%s/cgroup.procs", cgroupdir); write_file(file, "%d", pid); + snprintf(file, sizeof(file), "%s/memory.soft_limit_in_bytes", cgroupdir); + write_file(file, "%d", 299 << 20); + snprintf(file, sizeof(file), "%s/memory.limit_in_bytes", cgroupdir); + write_file(file, "%d", 300 << 20); snprintf(cgroupdir, sizeof(cgroupdir), "/syzcgroup/net/syz%llu", procid); if (mkdir(cgroupdir, 0777)) { debug("mkdir(%s) failed: %d\n", cgroupdir, errno); -- cgit mrf-deployment