woj/nsjail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cgroup2: support cgroup_mem_memsw_max

Browse Source
This commit is contained in:
Philip 2021-10-26 15:27:46 -04:00 committed by happyCoder92
parent cf4cfd5499
commit 5a8ad82311
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cgroup2.cc
View File

@ -84,14 +84,25 @@ static void removeCgroup(const std::string &cgroup_path) {
}
static bool initNsFromParentMem(nsjconf_t *nsjconf, pid_t pid) {
if (nsjconf->cgroup_mem_max == (size_t)0) {
if (nsjconf->cgroup_mem_max == (size_t)0 && nsjconf->cgroup_mem_memsw_max == (size_t)0) {
return true;
}
std::string cgroup_path = getCgroupPath(nsjconf, pid);
RETURN_ON_FAILURE(createCgroup(cgroup_path, pid));
RETURN_ON_FAILURE(addPidToProcList(cgroup_path, pid));
return writeToCgroup(cgroup_path, "memory.max", std::to_string(nsjconf->cgroup_mem_max));
if (nsjconf->cgroup_mem_max > (size_t)0) {
RETURN_ON_FAILURE(writeToCgroup(
cgroup_path, "memory.max", std::to_string(nsjconf->cgroup_mem_max)));
}
if (nsjconf->cgroup_mem_memsw_max >= nsjconf->cgroup_mem_max) {
RETURN_ON_FAILURE(writeToCgroup(cgroup_path, "memory.swap.max",
std::to_string(nsjconf->cgroup_mem_memsw_max - nsjconf->cgroup_mem_max)));
}
return true;
}
static bool initNsFromParentPids(nsjconf_t *nsjconf, pid_t pid) {