Update edition

CacheObserver/Cargo.toml

@@ -2,7 +2,7 @@
 name = "CacheObserver"
 version = "0.1.0"
 authors = ["Guillaume DIDIER <guillaume.didier.2014@polytechnique.org>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

Cargo.toml

@@ -1,4 +1,5 @@
 [workspace]
+resolver = "2"
 
 members = [
     "vga_buffer",

TODO-refactor.md

@@ -0,0 +1 @@
+- Remove the `no_std` dependencies in `cache_utils` by parameterizing for the output and input where needed ?

aes-t-tables/Cargo.toml

@@ -2,7 +2,7 @@
 name = "aes-t-tables"
 version = "0.1.0"
 authors = ["GuillaumeDIDIER <guillaume.didier95@hotmail.fr>"]
-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

basic_timing_cache_channel/Cargo.toml

@@ -2,7 +2,7 @@
 name = "basic_timing_cache_channel"
 version = "0.1.0"
 authors = ["Guillaume DIDIER <guillaume.didier.2014@polytechnique.org>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

cache_side_channel/Cargo.toml

@@ -2,7 +2,7 @@
 name = "cache_side_channel"
 version = "0.1.0"
 authors = ["Guillaume DIDIER <guillaume.didier.2014@polytechnique.org>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

cache_utils/Cargo.toml

@@ -2,7 +2,7 @@
 name = "cache_utils"
 version = "0.1.0"
 authors = ["Guillaume DIDIER <guillaume.didier.2014@polytechnique.org>"]
-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

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();

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;
                 }

covert_channels_benchmark/Cargo.toml

@@ -2,7 +2,7 @@
 name = "covert_channels_benchmark"
 version = "0.1.0"
 authors = ["Guillaume DIDIER <guillaume.didier.2014@polytechnique.org>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

covert_channels_evaluation/Cargo.toml

@@ -2,7 +2,7 @@
 name = "covert_channels_evaluation"
 version = "0.1.0"
 authors = ["Guillaume DIDIER <guillaume.didier.2014@polytechnique.org>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

cpuid/Cargo.toml

@@ -2,7 +2,7 @@
 name = "cpuid"
 version = "0.1.0"
 authors = ["GuillaumeDIDIER <guillaume.didier95@hotmail.fr>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

dendrobates-t-azureus/Cargo.toml

@@ -2,7 +2,7 @@
 name = "dendrobates_tinctoreus_azureus"
 version = "0.1.0"
 authors = ["Guillaume DIDIER <guillaume.didier.2014@polytechnique.org>"]
-edition = "2018"
+edition = "2021"
 
 [package.metadata.bootimage]
 #run-command = ["./scripts/bochs.sh", "{}"]

flush_flush/Cargo.toml

@@ -2,7 +2,7 @@
 name = "flush_flush"
 version = "0.1.0"
 authors = ["Guillaume DIDIER <guillaume.didier.2014@polytechnique.org>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

flush_reload/Cargo.toml

@@ -2,7 +2,7 @@
 name = "flush_reload"
 version = "0.1.0"
 authors = ["Guillaume DIDIER <guillaume.didier.2014@polytechnique.org>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

polling_serial/Cargo.toml

@@ -2,7 +2,7 @@
 name = "polling_serial"
 version = "0.1.0"
 authors = ["Guillaume DIDIER <guillaume.didier.2014@polytechnique.org>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

turn_lock/Cargo.toml

@@ -2,7 +2,7 @@
 name = "turn_lock"
 version = "0.1.0"
 authors = ["Guillaume DIDIER <guillaume.didier.2014@polytechnique.org>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

vga_buffer/Cargo.toml

@@ -2,7 +2,7 @@
 name = "vga_buffer"
 version = "0.1.0"
 authors = ["Guillaume DIDIER <guillaume.didier.2014@polytechnique.org>"]
-edition = "2018"
+edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html