github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-04-30 20:54:26 +00:00
Code Issues Projects Releases Wiki Activity

cgroup: fix the issue of crashed when meet unsupported cgroup

Browse Source 
Fix the issue of applying/set to unsupported cgroups.

Fixes: #408

Signed-off-by: fupan.lfp <fupan.lfp@antfin.com>
This commit is contained in:
fupan.lfp 2020-07-15 09:44:06 +08:00
parent 2bff7a16f5
commit 73bf9329ca
1 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/agent/rustjail/src/cgroups/fs/mod.rs
View File

@ -49,6 +49,11 @@ pub trait Subsystem {
fn set(&self, _dir: &str, _r: &LinuxResources, _update: bool) -> Result<()> { fn set(&self, _dir: &str, _r: &LinuxResources, _update: bool) -> Result<()> {
Ok(()) Ok(())
} }
fn apply(&self, path: &str, pid: pid_t) -> Result<()> {
write_file(path, CGROUP_PROCS, pid)?;
Ok(())
}
} }
pub const WILDCARD: i64 = -1; pub const WILDCARD: i64 = -1;
@ -307,7 +312,8 @@ where
T: ToString, T: ToString,
{ {
let p = format!("{}/{}", dir, file); let p = format!("{}/{}", dir, file);
fs::write(p.as_str(), v.to_string().as_bytes())?; fs::write(p.as_str(), v.to_string().as_bytes())
.chain_err(|| format!("couldn't write to file: {:?}", p))?;
Ok(()) Ok(())
} }
@ -1122,22 +1128,25 @@ impl Subsystem for Named {
} }
} }
fn get_subsystem(name: &str) -> Result<Box<dyn Subsystem>> { fn get_subsystem(name: &str) -> Option<Box<dyn Subsystem>> {
match name { match name {
"cpuset" => Ok(Box::new(CpuSet())), "cpuset" => Some(Box::new(CpuSet())),
"cpu" => Ok(Box::new(Cpu())), "cpu" => Some(Box::new(Cpu())),
"devices" => Ok(Box::new(Devices())), "devices" => Some(Box::new(Devices())),
"memory" => Ok(Box::new(Memory())), "memory" => Some(Box::new(Memory())),
"cpuacct" => Ok(Box::new(CpuAcct())), "cpuacct" => Some(Box::new(CpuAcct())),
"pids" => Ok(Box::new(Pids())), "pids" => Some(Box::new(Pids())),
"blkio" => Ok(Box::new(Blkio())), "blkio" => Some(Box::new(Blkio())),
"hugetlb" => Ok(Box::new(HugeTLB())), "hugetlb" => Some(Box::new(HugeTLB())),
"net_cls" => Ok(Box::new(NetCls())), "net_cls" => Some(Box::new(NetCls())),
"net_prio" => Ok(Box::new(NetPrio())), "net_prio" => Some(Box::new(NetPrio())),
"perf_event" => Ok(Box::new(PerfEvent())), "perf_event" => Some(Box::new(PerfEvent())),
"freezer" => Ok(Box::new(Freezer())), "freezer" => Some(Box::new(Freezer())),
"name=systemd" => Ok(Box::new(Named())), "name=systemd" => Some(Box::new(Named())),
_ => Err(nix::Error::Sys(Errno::EINVAL).into()), _ => {
info!(sl!(), "Found unexpected cgroup"; "cgroup" => name);
None
}
} }
} }
@ -1242,7 +1251,9 @@ pub const FROZEN: &'static str = "FROZEN";
impl CgroupManager for Manager { impl CgroupManager for Manager {
fn apply(&self, pid: pid_t) -> Result<()> { fn apply(&self, pid: pid_t) -> Result<()> {
for (key, value) in &self.paths { for (key, value) in &self.paths {
apply(value, pid)?; if let Some(sub) = get_subsystem(key) {
sub.apply(value, pid)?;
}
} }
Ok(()) Ok(())
@ -1251,8 +1262,9 @@ impl CgroupManager for Manager {
fn set(&self, spec: &LinuxResources, update: bool) -> Result<()> { fn set(&self, spec: &LinuxResources, update: bool) -> Result<()> {
for (key, value) in &self.paths { for (key, value) in &self.paths {
let _ = fs::create_dir_all(value); let _ = fs::create_dir_all(value);
let sub = get_subsystem(key)?; if let Some(sub) = get_subsystem(key) {
sub.set(value, spec, update)?; sub.set(value, spec, update)?;
}
} }
Ok(()) Ok(())