-
Notifications
You must be signed in to change notification settings - Fork 99
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add record keeping for debugging #628
Open
Goirad
wants to merge
1
commit into
master
Choose a base branch
from
dario/add-stats
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+262
−17
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,211 @@ | ||
| use std::collections::HashMap; | ||
| use std::convert::TryInto; | ||
| use std::fmt::{Write, Error as FmtError}; | ||
| use std::result::Result as StdResult; | ||
| use std::sync::atomic::{AtomicUsize, Ordering}; | ||
| use std::sync::{Arc, Mutex}; | ||
|
|
||
| use crate::usercalls::*; | ||
|
|
||
| use fortanix_sgx_abi::*; | ||
|
|
||
| use lazy_static::lazy_static; | ||
|
|
||
| lazy_static! { | ||
| static ref USERCALL_COUNTERS: [AtomicUsize; 17] = [ | ||
| AtomicUsize::default(), | ||
| AtomicUsize::default(), AtomicUsize::default(), AtomicUsize::default(), AtomicUsize::default(), | ||
| AtomicUsize::default(), AtomicUsize::default(), AtomicUsize::default(), AtomicUsize::default(), | ||
| AtomicUsize::default(), AtomicUsize::default(), AtomicUsize::default(), AtomicUsize::default(), | ||
| AtomicUsize::default(), AtomicUsize::default(), AtomicUsize::default(), AtomicUsize::default(), | ||
| ]; | ||
| static ref TCS_MAPPINGS: Arc<Mutex<HashMap<usize, TcsStats>>> = Arc::new(Mutex::new(HashMap::new())); | ||
| } | ||
|
|
||
| #[derive(Clone, Default, Debug)] | ||
| pub struct TcsStats { | ||
| // Each index corresponds to that usercall number | ||
| sync_calls: [usize; 17], | ||
| // WAIT_NO, WAIT_INDEFINITE, other | ||
| // There are 16 because there are 4 possible events to wait for | ||
| waits: [(usize, usize, usize); 16], | ||
| // targeted, not targeted | ||
| sends: [usize; 16], | ||
| } | ||
|
|
||
| pub struct RunnerStats { | ||
| pub sync_calls: HashMap<usize, TcsStats>, | ||
| pub async_calls: [usize; 17], | ||
| } | ||
|
|
||
| impl RunnerStats { | ||
| /// The total number of sync usercalls that have been handled as of this snapshot | ||
| pub fn total_sync_calls(&self) -> usize { | ||
| self.sync_calls.iter() | ||
| .map(|(_, stats)| stats.sync_calls.iter().sum::<usize>()) | ||
| .sum() | ||
| } | ||
|
|
||
| /// The total number of async usercalls that have been handled as of this snapshot | ||
| pub fn total_async_calls(&self) -> usize { | ||
| self.async_calls.iter().sum::<usize>() | ||
| } | ||
|
|
||
| /// The total number of usercalls that have been handled as of this snapshot | ||
| pub fn total_calls(&self) -> usize { | ||
| self.total_sync_calls() + self.total_async_calls() | ||
| } | ||
|
|
||
| // A "stock" formatting for this information | ||
| pub fn pretty_format(&self) -> StdResult<String, FmtError> { | ||
| let mut out = String::new(); | ||
| let mut counts = USERCALL_COUNTERS.iter() | ||
| .enumerate() | ||
| .map(|(i, counter)| (i, counter.load(Ordering::Relaxed))) | ||
| .filter(|(_, counter)| *counter > 0) | ||
| .map(|(i, counter)| format!("{:?}: {}", abi::UsercallList::from_u64(i as _), counter)) | ||
| .collect::<Vec<_>>() | ||
| .join(", "); | ||
|
|
||
| if counts.is_empty() { | ||
| counts = "None".to_owned(); | ||
| } | ||
|
|
||
| writeln!(out, "Async usercall counts: {}", counts)?; | ||
| writeln!(out, "Sync usercall count mappings:")?; | ||
| for (addr, stats) in TCS_MAPPINGS.lock().map_err(|_| FmtError)?.iter() { | ||
| if stats.should_print() { | ||
| writeln!(out, "Address: 0x{:0>16x}", addr)?; | ||
| write!(out, "{}", stats.format()?)?; | ||
| } | ||
| } | ||
|
|
||
| Ok(out) | ||
| } | ||
| } | ||
|
|
||
| fn mask_to_str(ev: usize) -> String { | ||
| let mut events = vec!(); | ||
| let ev = ev as u64; | ||
| if ev & EV_CANCELQ_NOT_FULL != 0 { | ||
| events.push("CANCELQ_NOT_FULL"); | ||
| } | ||
| if ev & EV_RETURNQ_NOT_EMPTY != 0 { | ||
| events.push("RETURNQ_NOT_EMPTY"); | ||
| } | ||
| if ev & EV_USERCALLQ_NOT_FULL != 0 { | ||
| events.push("USERCALLQ_NOT_FULL"); | ||
| } | ||
| if ev & EV_UNPARK != 0 { | ||
| events.push("UNPARK"); | ||
| } | ||
| if events.is_empty() { | ||
| events.push("NONE"); | ||
| } | ||
| events.join(" | ") | ||
| } | ||
|
|
||
| pub(crate) fn record_usercall( | ||
| tcs_address: Option<TcsAddress>, | ||
| p1: u64, | ||
| p2: u64, | ||
| p3: u64 | ||
| ) { | ||
| // Map sync usercalls to the TCS that made them | ||
| if let Some(tcs_address) = tcs_address { | ||
| let mut mappings = TCS_MAPPINGS.lock().expect("poisoned mutex"); | ||
| let entry = mappings.entry(tcs_address.0).or_default(); | ||
| // type | ||
| entry.sync_calls[p1 as usize] += 1; | ||
| if p1 == 11 { | ||
| // waits | ||
| let mask = &mut entry.waits[p2 as usize]; | ||
| match p3 { | ||
| WAIT_NO => mask.0 += 1, | ||
| WAIT_INDEFINITE => mask.1 += 1, | ||
| _ => mask.2 += 1, | ||
| } | ||
| } else if p1 == 12 { | ||
| // sends | ||
| entry.sends[p2 as usize] += 1; // event mask | ||
| } | ||
| } else { | ||
| // For async calls where we don't know the TCS, just store aggregates | ||
| USERCALL_COUNTERS[p1 as usize].fetch_add(1, Ordering::Relaxed); | ||
| } | ||
| } | ||
|
|
||
| impl TcsStats { | ||
| fn should_print(&self) -> bool { | ||
| self.sync_calls.iter().sum::<usize>() > 10 | ||
| } | ||
|
|
||
| pub fn format(&self) -> StdResult<String, FmtError> { | ||
| let mut out = String::new(); | ||
| writeln!(out, | ||
| " Sync Totals: {}", | ||
| self.sync_calls.iter() | ||
| .enumerate() | ||
| .filter(|(_, cnt)| **cnt > 0) | ||
| .map(|(idx, cnt)| { | ||
| format!("{:?}: {}", abi::UsercallList::from_u64(idx as u64), cnt) | ||
| }) | ||
| .collect::<Vec<_>>() | ||
| .join(", ") | ||
| )?; | ||
| writeln!(out, | ||
| " Wait Totals: {}", | ||
| self.waits.iter() | ||
| .enumerate() | ||
| .filter(|(_, (a, b, c))| a + b + c > 0) | ||
| .map(|(idx, cnt)| { | ||
| let mut out = format!("{}: ", mask_to_str(idx)); | ||
| let mut masks = Vec::new(); | ||
| if cnt.0 > 0 { | ||
| masks.push(format!("WAIT_NO: {}", cnt.0)) | ||
| } | ||
| if cnt.1 > 0 { | ||
| masks.push(format!("WAIT_INDEFINITE: {}", cnt.1)); | ||
| } | ||
| if cnt.2 > 0 { | ||
| masks.push(format!("OTHER: {}", cnt.2)); | ||
| } | ||
| out.push_str(&masks.join(", ")); | ||
| out | ||
| }) | ||
| .collect::<Vec<_>>() | ||
| .join("\n ") | ||
| )?; | ||
| writeln!(out, | ||
| " Send Totals: {}", | ||
| self.sends.iter() | ||
| .enumerate() | ||
| .filter(|(_, cnt)| **cnt > 0) | ||
| .map(|(idx, cnt)| { | ||
| format!("{}: {}", mask_to_str(idx), cnt) | ||
| }) | ||
| .collect::<Vec<_>>() | ||
| .join(", ") | ||
| )?; | ||
| Ok(out) | ||
| } | ||
| } | ||
|
|
||
| pub fn get_stats() -> RunnerStats { | ||
| let async_calls: [usize; 17] = USERCALL_COUNTERS.iter() | ||
| .map(|c| c.load(Ordering::Relaxed)) | ||
| .collect::<Vec<_>>() | ||
| .try_into() | ||
| .unwrap(); | ||
|
|
||
| assert!(async_calls.len() == 17); | ||
|
|
||
| let sync_calls = { | ||
| TCS_MAPPINGS.lock().expect("poison error").clone() | ||
| }; | ||
|
|
||
| RunnerStats { | ||
| sync_calls, | ||
| async_calls, | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Unrelated change?