diff --git a/Cargo.lock b/Cargo.lock index 07415692b65a1c28d47f15f8c94fb395ac35ed91..b3bad04861f8736ac25ca6480f3ec4615b7dbf27 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -242,7 +242,7 @@ checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" [[package]] name = "fdt" version = "0.1.0" -source = "git+https://github.com/Zera-Algorithm/libfdt-rs?rev=61ec00#61ec003305148d00903b137a846b2bf36139f880" +source = "git+https://github.com/Zera-Algorithm/libfdt-rs#44570fbbb5dde4b234e9b5d0e26ce08f966ad3e0" dependencies = [ "bindgen", "cc", diff --git a/Cargo.toml b/Cargo.toml index d4651d67f9084a70163a0e086b8e7cf5b67aa583..a51cf70e0dbacf9ab9689198886da8af88a11a48 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,7 +35,7 @@ gethostname = "0.4.3" [dependencies] vm-fdt = { git = "https://github.com/OhmR/vm-fdt" } -fdt = { git = "https://github.com/Zera-Algorithm/libfdt-rs", rev = "61ec00" } +fdt = { git = "https://github.com/Zera-Algorithm/libfdt-rs" } log = { version = "0.4", features = [ "max_level_trace", "release_max_level_info", diff --git a/cli/src/blk.rs b/cli/src/blk.rs index 414ae4fc505c5c78bcab0be54a2eb43e6b5059b7..c1072257b252b3d6f465774a9db50365d873e13d 100644 --- a/cli/src/blk.rs +++ b/cli/src/blk.rs @@ -28,7 +28,7 @@ use crate::{ util::{check_cache_address, cstr_arr_to_string, string_to_cstr_arr, virt_to_phys_user}, }; -pub const HUGE_TLB_MAX: usize = 2 * 1024 * 1024; +pub const HUGE_TLB_MAX: usize = 32 * 1024 * 1024; pub const BLOCK_SIZE: usize = 512; pub static SHYPER_FD: OnceCell = OnceCell::new(); @@ -194,7 +194,7 @@ pub fn mediated_blk_init() { .arg("-t") .arg("hugetlbfs") .arg("-o") - .arg("pagesize=2M") + .arg("pagesize=32M") .arg("none") .arg("/mnt/huge") .output() diff --git a/cli/src/config.rs b/cli/src/config.rs index 4c4519997c0cc488ae446c89e7f28388f3ceaba1..87dff40e9879af35994154ab32e70765d8ff463c 100644 --- a/cli/src/config.rs +++ b/cli/src/config.rs @@ -43,7 +43,7 @@ use crate::{ util::{check_cache_address, file_size, string_to_u64, virt_to_phys_user}, }; -const CACHE_MAX: usize = 2 * 1024 * 1024; +const CACHE_MAX: usize = 32 * 1024 * 1024; const CMDLINE_MAX_LEN: usize = 1024; const PASSTHROUGH_DEV_MAX_NUM: usize = 128; diff --git a/tools/shyper b/tools/shyper index 73a37e39a5d46e501c9e119eefbc2679195d10cf..9bbddfa5b1b56cd90d353b780bef78526247fccd 100644 Binary files a/tools/shyper and b/tools/shyper differ