diff --git a/crates/runc-shim/Cargo.toml b/crates/runc-shim/Cargo.toml index 2e31e3fe..996316b9 100644 --- a/crates/runc-shim/Cargo.toml +++ b/crates/runc-shim/Cargo.toml @@ -33,6 +33,7 @@ serde_json = "1.0.74" oci-spec = "0.6.0" crossbeam = "0.8.1" uuid = { version = "1.0.0", features = ["v4"] } +prctl = "1.0.0" # Async dependencies async-trait = { workspace = true } diff --git a/crates/runc-shim/src/service.rs b/crates/runc-shim/src/service.rs index 512a3d31..c1a04ee3 100644 --- a/crates/runc-shim/src/service.rs +++ b/crates/runc-shim/src/service.rs @@ -79,7 +79,17 @@ impl Shim for Service { None => {} } - let address = spawn(opts, &grouping, Vec::new()).await?; + let mut vars: Vec<(&str, &str)> = Vec::new(); + let mut thp_disabled = String::new(); + + #[cfg(target_os = "linux")] + if let Ok(x) = prctl::get_thp_disable() { + thp_disabled = x.to_string(); + let _ = prctl::set_thp_disable(true); + }; + + vars.push(("THP_DISABLED", thp_disabled.as_str())); + let address = spawn(opts, &grouping, vars).await?; write_str_to_file("address", &address).await?; Ok(address) } diff --git a/crates/runc/Cargo.toml b/crates/runc/Cargo.toml index a4c8b67a..e06276ce 100644 --- a/crates/runc/Cargo.toml +++ b/crates/runc/Cargo.toml @@ -28,6 +28,7 @@ thiserror = "1.0.30" time = { version = "0.3.7", features = ["serde", "std"] } uuid = { version = "1.0.0", features = ["v4"] } os_pipe = "1.0.0" +prctl = "1.0.0" # Async dependencies tokio = { workspace = true, features = ["full"], optional = true } diff --git a/crates/runc/src/lib.rs b/crates/runc/src/lib.rs index d222dc1b..6d9fe252 100644 --- a/crates/runc/src/lib.rs +++ b/crates/runc/src/lib.rs @@ -368,6 +368,22 @@ pub trait Spawner: Debug { impl Runc { async fn launch(&self, cmd: Command, combined_output: bool) -> Result { debug!("Execute command {:?}", cmd); + #[cfg(target_os = "linux")] + let mut cmd = cmd; + #[cfg(target_os = "linux")] + if let Ok(thp) = std::env::var("THP_DISABLED") { + if let Ok(thp_disabled) = thp.parse::() { + unsafe { + cmd.pre_exec(move || { + if let Err(e) = prctl::set_thp_disable(thp_disabled) { + log::debug!("set_thp_disable err: {}", e); + }; + Ok(()) + }); + } + } + } + let (status, pid, stdout, stderr) = self.spawner.execute(cmd).await?; if status.success() { let output = if combined_output {