From 88775ea015aec9239ef77bb73b0f54e40bee9c94 Mon Sep 17 00:00:00 2001
From: Guillaume DIDIER <guillaume.didier.2014@polytechnique.org>
Date: Mon, 24 Jun 2024 17:37:14 +0200
Subject: [PATCH] Fix issues in the monitoring logic

---
 cache_slice/src/bin/scan.rs |  2 +-
 cache_slice/src/lib.rs      | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/cache_slice/src/bin/scan.rs b/cache_slice/src/bin/scan.rs
index 0564dd1..1c00017 100644
--- a/cache_slice/src/bin/scan.rs
+++ b/cache_slice/src/bin/scan.rs
@@ -8,7 +8,7 @@ pub fn main() {
     let nb_cores = core_per_package();
     println!("Found {} cores", nb_cores);
 
-    let target = vec![0x0123456789abcdefu64, 64];
+    let target = vec![0x0123456789abcdefu64; 64];
 
     let old = sched_getaffinity(Pid::from_raw(0)).unwrap();
     let mut core_set = Vec::new();
diff --git a/cache_slice/src/lib.rs b/cache_slice/src/lib.rs
index bf36754..6c30982 100644
--- a/cache_slice/src/lib.rs
+++ b/cache_slice/src/lib.rs
@@ -49,7 +49,7 @@ unsafe fn monitor_xeon(addr: *const u8, cpu: u8, max_cbox: usize) -> Result<Vec<
 
     // Reset counters
     for i in 0..max_cbox {
-        write_msr_on_cpu(performance_counters.msr_pmon_ctl0[i], cpu, performance_counters.val_box_reset)?;
+        write_msr_on_cpu(performance_counters.msr_pmon_box_ctl[i], cpu, performance_counters.val_box_reset)?;
     }
 
     // Enable counting
@@ -72,14 +72,18 @@ unsafe fn monitor_xeon(addr: *const u8, cpu: u8, max_cbox: usize) -> Result<Vec<
 
     // Freeze counters
     for i in 0..max_cbox {
-        write_msr_on_cpu(performance_counters.msr_pmon_ctr0[i], cpu, performance_counters.val_box_freeze)?;
+        write_msr_on_cpu(performance_counters.msr_pmon_box_ctl[i], cpu, performance_counters.val_box_freeze)?;
     }
 
     // Read counters
     let mut results = Vec::new();
     for i in 0..max_cbox {
         let result = read_msr_on_cpu(performance_counters.msr_pmon_ctr0[i], cpu)?;
-        results.push(result)
+        if (result - NUM_POKE as u64) < 0 {
+            results.push(0);
+        } else {
+            results.push(result - NUM_POKE as u64);
+        }
     }
 
     Ok(results)