diff --git a/CacheObserver/Cargo.toml b/CacheObserver/Cargo.toml index cdfaa8d..5c5d590 100644 --- a/CacheObserver/Cargo.toml +++ b/CacheObserver/Cargo.toml @@ -2,7 +2,7 @@ name = "CacheObserver" version = "0.1.0" authors = ["Guillaume DIDIER "] -edition = "2018" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/Cargo.toml b/Cargo.toml index 9b3fa47..2008c78 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,4 +1,5 @@ [workspace] +resolver = "2" members = [ "vga_buffer", diff --git a/TODO-refactor.md b/TODO-refactor.md new file mode 100644 index 0000000..44ccb0c --- /dev/null +++ b/TODO-refactor.md @@ -0,0 +1 @@ +- Remove the `no_std` dependencies in `cache_utils` by parameterizing for the output and input where needed ? diff --git a/aes-t-tables/.cargo/config b/aes-t-tables/.cargo/config.toml similarity index 100% rename from aes-t-tables/.cargo/config rename to aes-t-tables/.cargo/config.toml diff --git a/aes-t-tables/Cargo.toml b/aes-t-tables/Cargo.toml index 32fbac2..f846437 100644 --- a/aes-t-tables/Cargo.toml +++ b/aes-t-tables/Cargo.toml @@ -2,7 +2,7 @@ name = "aes-t-tables" version = "0.1.0" authors = ["GuillaumeDIDIER "] -edition = "2018" +edition = "2021" license = "MIT OR Apache-2.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/basic_timing_cache_channel/Cargo.toml b/basic_timing_cache_channel/Cargo.toml index 1d705cc..ac112c5 100644 --- a/basic_timing_cache_channel/Cargo.toml +++ b/basic_timing_cache_channel/Cargo.toml @@ -2,7 +2,7 @@ name = "basic_timing_cache_channel" version = "0.1.0" authors = ["Guillaume DIDIER "] -edition = "2018" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/cache_side_channel/Cargo.toml b/cache_side_channel/Cargo.toml index 2eed293..6a543ca 100644 --- a/cache_side_channel/Cargo.toml +++ b/cache_side_channel/Cargo.toml @@ -2,7 +2,7 @@ name = "cache_side_channel" version = "0.1.0" authors = ["Guillaume DIDIER "] -edition = "2018" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/cache_utils/Cargo.toml b/cache_utils/Cargo.toml index e4a28eb..3e87644 100644 --- a/cache_utils/Cargo.toml +++ b/cache_utils/Cargo.toml @@ -2,7 +2,7 @@ name = "cache_utils" version = "0.1.0" authors = ["Guillaume DIDIER "] -edition = "2018" +edition = "2021" license = "MIT OR Apache-2.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/cache_utils/src/bin/two_thread_cal.rs b/cache_utils/src/bin/two_thread_cal.rs index 13a285a..093b4cc 100644 --- a/cache_utils/src/bin/two_thread_cal.rs +++ b/cache_utils/src/bin/two_thread_cal.rs @@ -125,6 +125,9 @@ fn main() { let array = m.slice(); let cache_line_size = 64; + // CPUID EAX=1: Additional Information in EBX Bits EBX Valid + // 15:8 CLFLUSH line size (Value * 8 = cache line size in bytes) if CLFLUSH feature flag is set. + // (CPUID.01.EDX.CLFSH [bit 19]= 1) // Generate core iterator let mut core_pairs: Vec<(usize, usize)> = Vec::new(); diff --git a/cache_utils/src/main.rs b/cache_utils/src/main.rs index 977d31d..92cb6b0 100644 --- a/cache_utils/src/main.rs +++ b/cache_utils/src/main.rs @@ -10,7 +10,6 @@ use cache_utils::calibration::Verbosity; use nix::errno::Errno; use nix::sched::{sched_getaffinity, sched_setaffinity, CpuSet}; use nix::unistd::Pid; -use nix::Error::Sys; use cache_utils::mmap::MMappedMemory; use cpuid::MicroArchitecture; @@ -58,7 +57,7 @@ pub fn main() { //println!("Iteration {}...ok ", i); eprint!(" {}", i); } - Err(Sys(Errno::EINVAL)) => { + Err(Errno::EINVAL) => { //println!("skipping"); continue; } @@ -83,7 +82,7 @@ pub fn main() { println!("Iteration {}...ok ", i); eprintln!("Iteration {}...ok ", i); } - Err(Sys(Errno::EINVAL)) => { + Err(Errno::EINVAL) => { println!("skipping"); continue; } diff --git a/covert_channels_benchmark/Cargo.toml b/covert_channels_benchmark/Cargo.toml index 7a2d3c0..a578307 100644 --- a/covert_channels_benchmark/Cargo.toml +++ b/covert_channels_benchmark/Cargo.toml @@ -2,7 +2,7 @@ name = "covert_channels_benchmark" version = "0.1.0" authors = ["Guillaume DIDIER "] -edition = "2018" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/covert_channels_evaluation/Cargo.toml b/covert_channels_evaluation/Cargo.toml index 8eeffbc..bb0b038 100644 --- a/covert_channels_evaluation/Cargo.toml +++ b/covert_channels_evaluation/Cargo.toml @@ -2,7 +2,7 @@ name = "covert_channels_evaluation" version = "0.1.0" authors = ["Guillaume DIDIER "] -edition = "2018" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/cpuid/.cargo/config b/cpuid/.cargo/config.toml similarity index 100% rename from cpuid/.cargo/config rename to cpuid/.cargo/config.toml diff --git a/cpuid/Cargo.toml b/cpuid/Cargo.toml index db716f8..29df213 100644 --- a/cpuid/Cargo.toml +++ b/cpuid/Cargo.toml @@ -2,7 +2,7 @@ name = "cpuid" version = "0.1.0" authors = ["GuillaumeDIDIER "] -edition = "2018" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/dendrobates-t-azureus/Cargo.toml b/dendrobates-t-azureus/Cargo.toml index 844ae2a..b4e3f84 100644 --- a/dendrobates-t-azureus/Cargo.toml +++ b/dendrobates-t-azureus/Cargo.toml @@ -2,7 +2,7 @@ name = "dendrobates_tinctoreus_azureus" version = "0.1.0" authors = ["Guillaume DIDIER "] -edition = "2018" +edition = "2021" [package.metadata.bootimage] #run-command = ["./scripts/bochs.sh", "{}"] diff --git a/flush_flush/Cargo.toml b/flush_flush/Cargo.toml index e7bb64b..f76b6d3 100644 --- a/flush_flush/Cargo.toml +++ b/flush_flush/Cargo.toml @@ -2,7 +2,7 @@ name = "flush_flush" version = "0.1.0" authors = ["Guillaume DIDIER "] -edition = "2018" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/flush_reload/Cargo.toml b/flush_reload/Cargo.toml index d05f744..4eeccfb 100644 --- a/flush_reload/Cargo.toml +++ b/flush_reload/Cargo.toml @@ -2,7 +2,7 @@ name = "flush_reload" version = "0.1.0" authors = ["Guillaume DIDIER "] -edition = "2018" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/polling_serial/Cargo.toml b/polling_serial/Cargo.toml index e2bcc1c..aa6c73d 100644 --- a/polling_serial/Cargo.toml +++ b/polling_serial/Cargo.toml @@ -2,7 +2,7 @@ name = "polling_serial" version = "0.1.0" authors = ["Guillaume DIDIER "] -edition = "2018" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/turn_lock/Cargo.toml b/turn_lock/Cargo.toml index ab38662..13ce84a 100644 --- a/turn_lock/Cargo.toml +++ b/turn_lock/Cargo.toml @@ -2,7 +2,7 @@ name = "turn_lock" version = "0.1.0" authors = ["Guillaume DIDIER "] -edition = "2018" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/vga_buffer/Cargo.toml b/vga_buffer/Cargo.toml index 2c2727e..ced7aa6 100644 --- a/vga_buffer/Cargo.toml +++ b/vga_buffer/Cargo.toml @@ -2,7 +2,7 @@ name = "vga_buffer" version = "0.1.0" authors = ["Guillaume DIDIER "] -edition = "2018" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html