mirror of
https://github.com/microsoft/onefuzz.git
synced 2025-06-17 20:38:06 +00:00
libfuzzer fuzzing task perf improvements (#941)
- resuse the regex to parse the output of libfuzzer - added a cancellation notification to report_fuzzer_sys_info. ~~The code seems to be actively waiting this function and consuming some cpu time~~ The notification allows us to reduce the time waiting for the fuzzing loop to terminate. ## Summary of the Pull Request _What is this about?_ ## PR Checklist * [ ] Applies to work item: #xxx * [ ] CLA signed. If not, go over [here](https://cla.opensource.microsoft.com/microsoft/onefuzz) and sign the CLI. * [ ] Tests added/passed * [ ] Requires documentation to be updated * [ ] I've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx ## Info on Pull Request _What does this include?_ ## Validation Steps Performed _How does someone test & validate?_
This commit is contained in:
@ -17,11 +17,12 @@ use onefuzz_telemetry::{
|
||||
EventData,
|
||||
};
|
||||
use serde::Deserialize;
|
||||
use std::{collections::HashMap, path::PathBuf};
|
||||
use std::{collections::HashMap, path::PathBuf, sync::Arc};
|
||||
use tempfile::{tempdir_in, TempDir};
|
||||
use tokio::{
|
||||
io::{AsyncBufReadExt, BufReader},
|
||||
sync::mpsc,
|
||||
select,
|
||||
sync::{mpsc, Notify},
|
||||
task,
|
||||
time::{sleep, Duration},
|
||||
};
|
||||
@ -212,11 +213,12 @@ impl LibFuzzerFuzzTask {
|
||||
);
|
||||
let mut running = fuzzer.fuzz(crash_dir.path(), local_inputs, &inputs)?;
|
||||
let running_id = running.id();
|
||||
|
||||
let notify = Arc::new(Notify::new());
|
||||
let sys_info = task::spawn(report_fuzzer_sys_info(
|
||||
worker_id,
|
||||
run_id,
|
||||
running_id.unwrap_or_default(),
|
||||
notify.clone(),
|
||||
));
|
||||
|
||||
// Splitting borrow.
|
||||
@ -227,7 +229,6 @@ impl LibFuzzerFuzzTask {
|
||||
let mut stderr = BufReader::new(stderr);
|
||||
|
||||
let mut libfuzzer_output: ArrayDeque<[_; LOGS_BUFFER_SIZE], Wrapping> = ArrayDeque::new();
|
||||
|
||||
loop {
|
||||
let mut buf = vec![];
|
||||
let bytes_read = stderr.read_until(b'\n', &mut buf).await?;
|
||||
@ -243,7 +244,10 @@ impl LibFuzzerFuzzTask {
|
||||
libfuzzer_output.push_back(line);
|
||||
}
|
||||
|
||||
let (exit_status, _) = tokio::join!(running.wait(), sys_info);
|
||||
let exit_status = running.wait().await;
|
||||
notify.notify_one();
|
||||
let _ = sys_info.await;
|
||||
|
||||
let exit_status: ExitStatus = exit_status?.into();
|
||||
|
||||
let files = list_files(crash_dir.path()).await?;
|
||||
@ -323,11 +327,23 @@ fn try_report_iter_update(
|
||||
Ok(())
|
||||
}
|
||||
|
||||
async fn report_fuzzer_sys_info(worker_id: usize, run_id: Uuid, fuzzer_pid: u32) -> Result<()> {
|
||||
async fn report_fuzzer_sys_info(
|
||||
worker_id: usize,
|
||||
run_id: Uuid,
|
||||
fuzzer_pid: u32,
|
||||
cancellation: Arc<Notify>,
|
||||
) -> Result<()> {
|
||||
// Allow for sampling CPU usage.
|
||||
sleep(PROC_INFO_COLLECTION_DELAY).await;
|
||||
|
||||
let mut period = tokio::time::interval_at(
|
||||
tokio::time::Instant::now() + PROC_INFO_COLLECTION_DELAY,
|
||||
PROC_INFO_PERIOD,
|
||||
);
|
||||
loop {
|
||||
select! {
|
||||
() = cancellation.notified() => break,
|
||||
_ = period.tick() => (),
|
||||
}
|
||||
|
||||
// process doesn't exist
|
||||
if !system::refresh_process(fuzzer_pid)? {
|
||||
break;
|
||||
@ -348,8 +364,6 @@ async fn report_fuzzer_sys_info(worker_id: usize, run_id: Uuid, fuzzer_pid: u32)
|
||||
// The process no longer exists.
|
||||
break;
|
||||
}
|
||||
|
||||
sleep(PROC_INFO_PERIOD).await;
|
||||
}
|
||||
|
||||
Ok(())
|
||||
|
Reference in New Issue
Block a user