keep worst observed case, precise isns -> time calculation
This commit is contained in:
parent
63f6f02ba9
commit
cb20424cec
@ -16,7 +16,7 @@ use libafl_targets::{edges_map_mut_ptr, EDGES_MAP_DEFAULT_SIZE, MAX_EDGES_FOUND}
|
|||||||
use rand::{SeedableRng, StdRng, Rng};
|
use rand::{SeedableRng, StdRng, Rng};
|
||||||
use crate::{
|
use crate::{
|
||||||
config::{get_target_ranges, get_target_symbols}, systemstate::{self, feedbacks::{DumpSystraceFeedback, SystraceErrorFeedback}, helpers::{get_function_range, input_bytes_to_interrupt_times, load_symbol, try_load_symbol}, mutational::{InterruptShiftStage, STGSnippetStage}, schedulers::{GenerationScheduler, LongestTraceScheduler}, stg::{stg_map_mut_slice, GraphMaximizerCorpusScheduler, STGEdge, STGNode, StgFeedback, MAX_STG_NUM}, target_os::freertos::{config::get_range_groups, qemu_module::FreeRTOSSystemStateHelper, FreeRTOSSystem}}, time::{
|
config::{get_target_ranges, get_target_symbols}, systemstate::{self, feedbacks::{DumpSystraceFeedback, SystraceErrorFeedback}, helpers::{get_function_range, input_bytes_to_interrupt_times, load_symbol, try_load_symbol}, mutational::{InterruptShiftStage, STGSnippetStage}, schedulers::{GenerationScheduler, LongestTraceScheduler}, stg::{stg_map_mut_slice, GraphMaximizerCorpusScheduler, STGEdge, STGNode, StgFeedback, MAX_STG_NUM}, target_os::freertos::{config::get_range_groups, qemu_module::FreeRTOSSystemStateHelper, FreeRTOSSystem}}, time::{
|
||||||
clock::{ClockTimeFeedback, IcHist, QemuClockIncreaseFeedback, QemuClockObserver, FUZZ_START_TIMESTAMP, QEMU_ICOUNT_SHIFT, QEMU_ISNS_PER_USEC}, qemustate::QemuStateRestoreHelper, worst::{AlwaysTrueFeedback, ExecTimeIncFeedback, RateLimitedMonitor, TimeMaximizerCorpusScheduler, TimeProbMassScheduler, TimeStateMaximizerCorpusScheduler}
|
clock::{ClockTimeFeedback, IcHist, QemuClockIncreaseFeedback, QemuClockObserver, FUZZ_START_TIMESTAMP, QEMU_ICOUNT_SHIFT, QEMU_ISNS_PER_MSEC, QEMU_ISNS_PER_USEC}, qemustate::QemuStateRestoreHelper, worst::{AlwaysTrueFeedback, ExecTimeIncFeedback, RateLimitedMonitor, TimeMaximizerCorpusScheduler, TimeProbMassScheduler, TimeStateMaximizerCorpusScheduler}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
use std::time::SystemTime;
|
use std::time::SystemTime;
|
||||||
@ -209,7 +209,7 @@ fn setup_interrupt_inputs(mut input : MultipartInput<BytesInput>, interrupt_conf
|
|||||||
let name = format!("isr_{}_times",i);
|
let name = format!("isr_{}_times",i);
|
||||||
if input.parts_by_name(&name).next().is_none() {
|
if input.parts_by_name(&name).next().is_none() {
|
||||||
if let Some(random) = random.as_mut() {
|
if let Some(random) = random.as_mut() {
|
||||||
input.add_part(name, BytesInput::new((0..MAX_NUM_INTERRUPT).map(|_| (random.next_u32()%(100*1000*QEMU_ISNS_PER_USEC)).to_le_bytes()).flatten().collect()));
|
input.add_part(name, BytesInput::new((0..MAX_NUM_INTERRUPT).map(|_| (random.next_u32()%(100*QEMU_ISNS_PER_MSEC)).to_le_bytes()).flatten().collect()));
|
||||||
} else {
|
} else {
|
||||||
input.add_part(name, BytesInput::new([0; MAX_NUM_INTERRUPT*4].to_vec()));
|
input.add_part(name, BytesInput::new([0; MAX_NUM_INTERRUPT*4].to_vec()));
|
||||||
}
|
}
|
||||||
@ -323,7 +323,7 @@ let run_client = |state: Option<_>, mut mgr, _core_id| {
|
|||||||
};
|
};
|
||||||
|
|
||||||
// Create an observation channel to keep track of the execution time
|
// Create an observation channel to keep track of the execution time
|
||||||
let clock_time_observer = QemuClockObserver::new("clocktime"); // if cli.dump_times {cli.dump_name.clone().map(|x| x.with_extension("time"))} else {None}
|
let clock_time_observer = QemuClockObserver::new("clocktime", &cli.select_task); // if cli.dump_times {cli.dump_name.clone().map(|x| x.with_extension("time"))} else {None}
|
||||||
|
|
||||||
// Create an observation channel using the coverage map
|
// Create an observation channel using the coverage map
|
||||||
#[cfg(feature = "observe_edges")]
|
#[cfg(feature = "observe_edges")]
|
||||||
@ -366,7 +366,7 @@ let run_client = |state: Option<_>, mut mgr, _core_id| {
|
|||||||
// afl feedback needs to be activated first for MapIndexesMetadata
|
// afl feedback needs to be activated first for MapIndexesMetadata
|
||||||
feedback,
|
feedback,
|
||||||
// Feedback to reward any input which increses the execution time
|
// Feedback to reward any input which increses the execution time
|
||||||
ExecTimeIncFeedback::new()
|
ExecTimeIncFeedback::<FreeRTOSSystem>::new()
|
||||||
);
|
);
|
||||||
#[cfg(all(feature = "observe_systemstate"))]
|
#[cfg(all(feature = "observe_systemstate"))]
|
||||||
let mut feedback = feedback_or!(
|
let mut feedback = feedback_or!(
|
||||||
|
@ -72,7 +72,7 @@ where {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if let Some(wi) = worst_input {
|
if let Some(wi) = worst_input {
|
||||||
wi.to_file(casename);
|
wi.to_file(casename).expect("Could not dump testcase");
|
||||||
}
|
}
|
||||||
|
|
||||||
// Try dumping the current case
|
// Try dumping the current case
|
||||||
|
@ -128,7 +128,7 @@ pub fn input_bytes_to_interrupt_times(buf: &[u8], config: (usize, u32)) -> Vec<u
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
for j in i + 1..ret.len() {
|
for j in i + 1..ret.len() {
|
||||||
if ret[j] - ret[i] < config.1 * QEMU_ISNS_PER_USEC {
|
if ret[j] - ret[i] < (config.1 as f32 * QEMU_ISNS_PER_USEC) as u32 {
|
||||||
// ret[j] = u32::saturating_add(ret[i],config.1 * QEMU_ISNS_PER_USEC);
|
// ret[j] = u32::saturating_add(ret[i],config.1 * QEMU_ISNS_PER_USEC);
|
||||||
ret[j] = 0; // remove the interrupt
|
ret[j] = 0; // remove the interrupt
|
||||||
ret.sort_unstable();
|
ret.sort_unstable();
|
||||||
|
@ -61,7 +61,7 @@ where
|
|||||||
let mut new = false;
|
let mut new = false;
|
||||||
let mut new_interrupt_times = Vec::new();
|
let mut new_interrupt_times = Vec::new();
|
||||||
for (num,&interrupt_time) in interrupt_ticks.iter().enumerate() {
|
for (num,&interrupt_time) in interrupt_ticks.iter().enumerate() {
|
||||||
let lower_bound = if num==0 {FIRST_INT} else {interrupt_ticks[num-1].saturating_add(config.1 * QEMU_ISNS_PER_USEC)};
|
let lower_bound = if num==0 {FIRST_INT} else {interrupt_ticks[num-1].saturating_add((config.1 as f32 * QEMU_ISNS_PER_USEC) as u32)};
|
||||||
let next = if interrupt_ticks.len()>num+1 {interrupt_ticks[num+1]} else {u32::MAX};
|
let next = if interrupt_ticks.len()>num+1 {interrupt_ticks[num+1]} else {u32::MAX};
|
||||||
for exec_interval in meta.intervals().iter().filter(|x| x.start_tick >= lower_bound as u64 && x.start_tick < next as u64) {
|
for exec_interval in meta.intervals().iter().filter(|x| x.start_tick >= lower_bound as u64 && x.start_tick < next as u64) {
|
||||||
if !(exec_interval.start_capture.0==CaptureEvent::ISRStart) { // shortcut to skip interrupt handers without node lookup
|
if !(exec_interval.start_capture.0==CaptureEvent::ISRStart) { // shortcut to skip interrupt handers without node lookup
|
||||||
@ -302,10 +302,10 @@ where
|
|||||||
let mut ub : u32 = trace.intervals()[trace.intervals().len()-1].end_tick.try_into().expect("ticks > u32");
|
let mut ub : u32 = trace.intervals()[trace.intervals().len()-1].end_tick.try_into().expect("ticks > u32");
|
||||||
if i > 0 {
|
if i > 0 {
|
||||||
// use the new times, because changes to preceding timings are not accounted for yet
|
// use the new times, because changes to preceding timings are not accounted for yet
|
||||||
lb = u32::saturating_add(new_interrupt_times[i-1], interrup_config.1 * QEMU_ISNS_PER_USEC);
|
lb = u32::saturating_add(new_interrupt_times[i-1], (interrup_config.1 as f32 * QEMU_ISNS_PER_USEC) as u32);
|
||||||
}
|
}
|
||||||
if i < old_interrupt_times.len()-1 {
|
if i < old_interrupt_times.len()-1 {
|
||||||
ub = u32::saturating_sub(new_interrupt_times[i+1], interrup_config.1 * QEMU_ISNS_PER_USEC);
|
ub = u32::saturating_sub(new_interrupt_times[i+1], (interrup_config.1 as f32 * QEMU_ISNS_PER_USEC) as u32);
|
||||||
}
|
}
|
||||||
// get old hit and handler
|
// get old hit and handler
|
||||||
let old_hit = marks.iter().filter(
|
let old_hit = marks.iter().filter(
|
||||||
|
@ -37,6 +37,8 @@ use libafl::HasFeedback;
|
|||||||
use libafl::ExecutesInput;
|
use libafl::ExecutesInput;
|
||||||
use libafl::ExecutionProcessor;
|
use libafl::ExecutionProcessor;
|
||||||
|
|
||||||
|
use crate::time::clock::{tick_to_time, time_to_tick, IcHist};
|
||||||
|
|
||||||
/// The [`AflStatsStage`] is a simple stage that computes and reports some stats.
|
/// The [`AflStatsStage`] is a simple stage that computes and reports some stats.
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
pub struct SchedulerStatsStage<E, EM, Z> {
|
pub struct SchedulerStatsStage<E, EM, Z> {
|
||||||
@ -103,6 +105,7 @@ where
|
|||||||
let cur = current_time();
|
let cur = current_time();
|
||||||
|
|
||||||
if cur.checked_sub(self.last_report_time).unwrap_or_default() > self.stats_report_interval {
|
if cur.checked_sub(self.last_report_time).unwrap_or_default() > self.stats_report_interval {
|
||||||
|
let wort = tick_to_time(state.metadata_map().get::<IcHist>().unwrap_or(&IcHist::default()).1.0);
|
||||||
if let Some(meta) = state.metadata_map().get::<TopRatedsMetadata>() {
|
if let Some(meta) = state.metadata_map().get::<TopRatedsMetadata>() {
|
||||||
let kc = meta.map.keys().count();
|
let kc = meta.map.keys().count();
|
||||||
let mut v : Vec<_> = meta.map.values().cloned().collect();
|
let mut v : Vec<_> = meta.map.values().cloned().collect();
|
||||||
@ -146,6 +149,7 @@ where
|
|||||||
let cc = state.corpus().count();
|
let cc = state.corpus().count();
|
||||||
let to_keep = usize::max(vc*MULTI, PRUNE_MIN_KEEP);
|
let to_keep = usize::max(vc*MULTI, PRUNE_MIN_KEEP);
|
||||||
let activate = cc > PRUNE_MAX_KEEP || cc > usize::max(vc*PRUNE_THRESHOLD, PRUNE_MIN_KEEP*2);
|
let activate = cc > PRUNE_MAX_KEEP || cc > usize::max(vc*PRUNE_THRESHOLD, PRUNE_MIN_KEEP*2);
|
||||||
|
let mut wort_preserved = false;
|
||||||
if activate {
|
if activate {
|
||||||
println!("Pruning corpus, keeping {} / {}", to_keep, cc);
|
println!("Pruning corpus, keeping {} / {}", to_keep, cc);
|
||||||
let corpus = state.corpus_mut();
|
let corpus = state.corpus_mut();
|
||||||
@ -153,11 +157,16 @@ where
|
|||||||
let ids : Vec<_> = corpus.ids().filter_map(|x| {
|
let ids : Vec<_> = corpus.ids().filter_map(|x| {
|
||||||
let tc = corpus.get(x).unwrap().borrow();
|
let tc = corpus.get(x).unwrap().borrow();
|
||||||
let md = tc.metadata_map();
|
let md = tc.metadata_map();
|
||||||
|
if !wort_preserved && tc.exec_time() == &Some(wort) && wort>Duration::ZERO {
|
||||||
|
wort_preserved = true; // Keep the worst observed under all circumstances
|
||||||
|
Some((x, tc.exec_time().clone()))
|
||||||
|
} else {
|
||||||
if vc < PRUNE_MAX_KEEP && (md.get::<IsFavoredMetadata>().is_some() || &Some(x) == currid || v.contains(&&x)) {
|
if vc < PRUNE_MAX_KEEP && (md.get::<IsFavoredMetadata>().is_some() || &Some(x) == currid || v.contains(&&x)) {
|
||||||
None
|
None
|
||||||
} else {
|
} else {
|
||||||
Some((x, tc.exec_time().clone()))
|
Some((x, tc.exec_time().clone()))
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}).sorted_by_key(|x| x.1).take(usize::saturating_sub(corpus.count(),to_keep)).sorted_by_key(|x| x.0).unique().rev().collect();
|
}).sorted_by_key(|x| x.1).take(usize::saturating_sub(corpus.count(),to_keep)).sorted_by_key(|x| x.0).unique().rev().collect();
|
||||||
for (cid, _) in ids {
|
for (cid, _) in ids {
|
||||||
let c = state.corpus_mut().remove(cid).unwrap();
|
let c = state.corpus_mut().remove(cid).unwrap();
|
||||||
|
@ -167,6 +167,7 @@ where
|
|||||||
entrypoint: NodeIndex,
|
entrypoint: NodeIndex,
|
||||||
exitpoint: NodeIndex,
|
exitpoint: NodeIndex,
|
||||||
// Metadata about aggregated traces. aggegated meaning, order has been removed
|
// Metadata about aggregated traces. aggegated meaning, order has been removed
|
||||||
|
wort: u64,
|
||||||
wort_per_aggegated_path: HashMap<Vec<AtomicBasicBlock>,u64>,
|
wort_per_aggegated_path: HashMap<Vec<AtomicBasicBlock>,u64>,
|
||||||
wort_per_abb_path: HashMap<u64,u64>,
|
wort_per_abb_path: HashMap<u64,u64>,
|
||||||
wort_per_stg_path: HashMap<u64,u64>,
|
wort_per_stg_path: HashMap<u64,u64>,
|
||||||
@ -207,6 +208,7 @@ where
|
|||||||
stgnode_index: index,
|
stgnode_index: index,
|
||||||
entrypoint,
|
entrypoint,
|
||||||
exitpoint,
|
exitpoint,
|
||||||
|
wort: 0,
|
||||||
wort_per_aggegated_path: HashMap::new(),
|
wort_per_aggegated_path: HashMap::new(),
|
||||||
wort_per_abb_path: HashMap::new(),
|
wort_per_abb_path: HashMap::new(),
|
||||||
wort_per_stg_path: HashMap::new(),
|
wort_per_stg_path: HashMap::new(),
|
||||||
@ -598,8 +600,8 @@ where
|
|||||||
<S as UsesInput>::Input: Default,
|
<S as UsesInput>::Input: Default,
|
||||||
{
|
{
|
||||||
// TODO: don't remove metadata. work around ownership issues
|
// TODO: don't remove metadata. work around ownership issues
|
||||||
let trace = state.remove_metadata::<SYS::TraceData>().expect("TraceData not found");
|
let trace : SYS::TraceData = *state.remove_metadata::<SYS::TraceData>().expect("TraceData not found");
|
||||||
let clock_observer = observers.match_name::<QemuClockObserver>("clocktime")
|
let clock_observer = observers.match_name::<QemuClockObserver<SYS>>("clocktime")
|
||||||
.expect("QemuClockObserver not found");
|
.expect("QemuClockObserver not found");
|
||||||
let last_runtime = clock_observer.last_runtime();
|
let last_runtime = clock_observer.last_runtime();
|
||||||
|
|
||||||
@ -619,6 +621,11 @@ where
|
|||||||
// --------------------------------- Update STG
|
// --------------------------------- Update STG
|
||||||
let (mut nodetrace, mut edgetrace, mut interesting, mut updated) = StgFeedback::update_stg_interval(trace.intervals(), &trace.mem_reads(), trace.states_map(), feedbackstate);
|
let (mut nodetrace, mut edgetrace, mut interesting, mut updated) = StgFeedback::update_stg_interval(trace.intervals(), &trace.mem_reads(), trace.states_map(), feedbackstate);
|
||||||
|
|
||||||
|
// the longest running case is always intersting
|
||||||
|
if last_runtime > feedbackstate.wort {
|
||||||
|
feedbackstate.wort = last_runtime;
|
||||||
|
interesting |= true;
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(feature = "trace_job_response_times")]
|
#[cfg(feature = "trace_job_response_times")]
|
||||||
if let Some(worst_instance) = worst_select_job {
|
if let Some(worst_instance) = worst_select_job {
|
||||||
@ -710,6 +717,9 @@ where
|
|||||||
_tmp.sort(); // use sort+count, because we need the sorted trace anyways
|
_tmp.sort(); // use sort+count, because we need the sorted trace anyways
|
||||||
let counts = count_occurrences_sorted(&_tmp);
|
let counts = count_occurrences_sorted(&_tmp);
|
||||||
let mut top_indices = Vec::new();
|
let mut top_indices = Vec::new();
|
||||||
|
if last_runtime >= feedbackstate.wort {
|
||||||
|
top_indices.push(0xFFFF_FFFF_FFFF_FFFF); // pseudo trace to keep worts
|
||||||
|
}
|
||||||
for (k,c) in counts {
|
for (k,c) in counts {
|
||||||
if let Some(reference) = feedbackstate.worst_abb_exec_count.get_mut(k) {
|
if let Some(reference) = feedbackstate.worst_abb_exec_count.get_mut(k) {
|
||||||
if *reference < c {
|
if *reference < c {
|
||||||
@ -758,6 +768,8 @@ where
|
|||||||
writeln!(file, "{},{},{},{},{}", feedbackstate.graph.edge_count(), feedbackstate.graph.node_count(), feedbackstate.wort_per_aggegated_path.len(),feedbackstate.wort_per_stg_path.len(), timestamp).expect("Write to dump failed");
|
writeln!(file, "{},{},{},{},{}", feedbackstate.graph.edge_count(), feedbackstate.graph.node_count(), feedbackstate.wort_per_aggegated_path.len(),feedbackstate.wort_per_stg_path.len(), timestamp).expect("Write to dump failed");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// Re-add trace data
|
||||||
|
state.add_metadata(trace);
|
||||||
Ok(interesting)
|
Ok(interesting)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -23,11 +23,14 @@ use crate::systemstate::helpers::metadata_insert_or_update_get;
|
|||||||
use crate::systemstate::target_os::TargetSystem;
|
use crate::systemstate::target_os::TargetSystem;
|
||||||
use crate::systemstate::target_os::SystemTraceData;
|
use crate::systemstate::target_os::SystemTraceData;
|
||||||
|
|
||||||
|
use libafl::prelude::StateInitializer;
|
||||||
|
|
||||||
pub static mut FUZZ_START_TIMESTAMP: SystemTime = UNIX_EPOCH;
|
pub static mut FUZZ_START_TIMESTAMP: SystemTime = UNIX_EPOCH;
|
||||||
|
|
||||||
pub const QEMU_ICOUNT_SHIFT: u32 = 5;
|
pub const QEMU_ICOUNT_SHIFT: u32 = 5;
|
||||||
pub const QEMU_ISNS_PER_SEC: u32 = u32::pow(10, 9) / u32::pow(2, QEMU_ICOUNT_SHIFT);
|
pub const QEMU_ISNS_PER_SEC: u32 = u32::pow(10, 9) / u32::pow(2, QEMU_ICOUNT_SHIFT);
|
||||||
pub const QEMU_ISNS_PER_USEC: u32 = QEMU_ISNS_PER_SEC / 1000000;
|
pub const QEMU_ISNS_PER_MSEC: u32 = QEMU_ISNS_PER_SEC / 1000;
|
||||||
|
pub const QEMU_ISNS_PER_USEC: f32 = QEMU_ISNS_PER_SEC as f32 / 1000000.0;
|
||||||
pub const _QEMU_NS_PER_ISN: u32 = 1 << QEMU_ICOUNT_SHIFT;
|
pub const _QEMU_NS_PER_ISN: u32 = 1 << QEMU_ICOUNT_SHIFT;
|
||||||
pub const _TARGET_SYSCLK_FREQ: u32 = 25 * 1000 * 1000;
|
pub const _TARGET_SYSCLK_FREQ: u32 = 25 * 1000 * 1000;
|
||||||
pub const _TARGET_MHZ_PER_MIPS: f32 = _TARGET_SYSCLK_FREQ as f32 / QEMU_ISNS_PER_SEC as f32;
|
pub const _TARGET_MHZ_PER_MIPS: f32 = _TARGET_SYSCLK_FREQ as f32 / QEMU_ISNS_PER_SEC as f32;
|
||||||
@ -38,13 +41,16 @@ pub const _QEMU_SYSCLK_PER_TARGET_SEC: u32 =
|
|||||||
(_TARGET_SYSCLK_FREQ as f32 * _TARGET_MHZ_PER_MIPS) as u32;
|
(_TARGET_SYSCLK_FREQ as f32 * _TARGET_MHZ_PER_MIPS) as u32;
|
||||||
|
|
||||||
pub fn tick_to_time(ticks: u64) -> Duration {
|
pub fn tick_to_time(ticks: u64) -> Duration {
|
||||||
Duration::from_nanos((ticks << QEMU_ICOUNT_SHIFT) as u64)
|
Duration::from_nanos((ticks * _QEMU_NS_PER_ISN as u64))
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn tick_to_ms(ticks: u64) -> f32 {
|
pub fn tick_to_ms(ticks: u64) -> f32 {
|
||||||
(Duration::from_nanos(ticks << QEMU_ICOUNT_SHIFT).as_micros() as f32 / 10.0).round() / 100.0
|
(tick_to_time(ticks).as_micros() as f32 / 10.0).round() / 100.0
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn time_to_tick(time: Duration) -> u64 {
|
||||||
|
time.as_nanos() as u64 / _QEMU_NS_PER_ISN as u64
|
||||||
}
|
}
|
||||||
use libafl::prelude::StateInitializer;
|
|
||||||
|
|
||||||
//========== Metadata
|
//========== Metadata
|
||||||
#[derive(Debug, SerdeAny, Serialize, Deserialize)]
|
#[derive(Debug, SerdeAny, Serialize, Deserialize)]
|
||||||
@ -99,20 +105,24 @@ pub struct IcHist(pub Vec<(u64, u128)>, pub (u64, u128));
|
|||||||
|
|
||||||
/// A simple observer, just overlooking the runtime of the target.
|
/// A simple observer, just overlooking the runtime of the target.
|
||||||
#[derive(Serialize, Deserialize, Debug, Clone)]
|
#[derive(Serialize, Deserialize, Debug, Clone)]
|
||||||
pub struct QemuClockObserver {
|
pub struct QemuClockObserver<SYS: TargetSystem> {
|
||||||
name: Cow<'static, str>,
|
name: Cow<'static, str>,
|
||||||
start_tick: u64,
|
start_tick: u64,
|
||||||
end_tick: u64,
|
end_tick: u64,
|
||||||
|
select_task: Option<String>,
|
||||||
|
phantom: std::marker::PhantomData<SYS>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl QemuClockObserver {
|
impl<SYS: TargetSystem> QemuClockObserver<SYS> {
|
||||||
/// Creates a new [`QemuClockObserver`] with the given name.
|
/// Creates a new [`QemuClockObserver`] with the given name.
|
||||||
#[must_use]
|
#[must_use]
|
||||||
pub fn new(name: &'static str) -> Self {
|
pub fn new(name: &'static str, select_task: &Option<String>) -> Self {
|
||||||
Self {
|
Self {
|
||||||
name: Cow::from(name),
|
name: Cow::from(name),
|
||||||
start_tick: 0,
|
start_tick: 0,
|
||||||
end_tick: 0,
|
end_tick: 0,
|
||||||
|
select_task: select_task.clone(),
|
||||||
|
phantom: std::marker::PhantomData,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -123,9 +133,10 @@ impl QemuClockObserver {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<I, S> Observer<I, S> for QemuClockObserver
|
impl<I, S, SYS> Observer<I, S> for QemuClockObserver<SYS>
|
||||||
where
|
where
|
||||||
S: UsesInput + HasMetadata,
|
S: UsesInput + HasMetadata,
|
||||||
|
SYS: TargetSystem,
|
||||||
{
|
{
|
||||||
fn pre_exec(&mut self, _state: &mut S, _input: &I) -> Result<(), Error> {
|
fn pre_exec(&mut self, _state: &mut S, _input: &I) -> Result<(), Error> {
|
||||||
self.start_tick = 0;
|
self.start_tick = 0;
|
||||||
@ -140,7 +151,7 @@ where
|
|||||||
|
|
||||||
fn post_exec(
|
fn post_exec(
|
||||||
&mut self,
|
&mut self,
|
||||||
_state: &mut S,
|
state: &mut S,
|
||||||
_input: &I,
|
_input: &I,
|
||||||
_exit_kind: &ExitKind,
|
_exit_kind: &ExitKind,
|
||||||
) -> Result<(), Error> {
|
) -> Result<(), Error> {
|
||||||
@ -149,24 +160,40 @@ where
|
|||||||
self.end_tick = 0;
|
self.end_tick = 0;
|
||||||
return Ok(());
|
return Ok(());
|
||||||
}
|
}
|
||||||
unsafe { self.end_tick = libafl_qemu::sys::icount_get_raw() };
|
#[cfg(feature = "trace_job_response_times")]
|
||||||
|
let icount = {
|
||||||
|
if let Some(select) = self.select_task.as_ref() {
|
||||||
|
let trace = state
|
||||||
|
.metadata::<SYS::TraceData>()
|
||||||
|
.expect("TraceData not found");
|
||||||
|
trace.wort_of_task(select)
|
||||||
|
} else {
|
||||||
|
unsafe {libafl_qemu::sys::icount_get_raw()}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
#[cfg(not(feature = "trace_job_response_times"))]
|
||||||
|
let icount = unsafe {libafl_qemu::sys::icount_get_raw()};
|
||||||
|
|
||||||
|
self.end_tick = icount;
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Named for QemuClockObserver {
|
impl<SYS: TargetSystem> Named for QemuClockObserver<SYS> {
|
||||||
#[inline]
|
#[inline]
|
||||||
fn name(&self) -> &Cow<'static, str> {
|
fn name(&self) -> &Cow<'static, str> {
|
||||||
&self.name
|
&self.name
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Default for QemuClockObserver {
|
impl<SYS: TargetSystem> Default for QemuClockObserver<SYS> {
|
||||||
fn default() -> Self {
|
fn default() -> Self {
|
||||||
Self {
|
Self {
|
||||||
name: Cow::from(String::from("clock")),
|
name: Cow::from(String::from("clock")),
|
||||||
start_tick: 0,
|
start_tick: 0,
|
||||||
end_tick: 0,
|
end_tick: 0,
|
||||||
|
select_task: None,
|
||||||
|
phantom: std::marker::PhantomData,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -212,7 +239,7 @@ where {
|
|||||||
trace.wort_of_task(select)
|
trace.wort_of_task(select)
|
||||||
} else {
|
} else {
|
||||||
let observer = observers
|
let observer = observers
|
||||||
.match_name::<QemuClockObserver>(self.name())
|
.match_name::<QemuClockObserver<SYS>>(self.name())
|
||||||
.unwrap();
|
.unwrap();
|
||||||
observer.last_runtime()
|
observer.last_runtime()
|
||||||
}
|
}
|
||||||
@ -220,11 +247,11 @@ where {
|
|||||||
#[cfg(not(feature = "trace_job_response_times"))]
|
#[cfg(not(feature = "trace_job_response_times"))]
|
||||||
let icount = {
|
let icount = {
|
||||||
let observer = observers
|
let observer = observers
|
||||||
.match_name::<QemuClockObserver>(self.name())
|
.match_name::<QemuClockObserver<SYS>>(self.name())
|
||||||
.unwrap();
|
.unwrap();
|
||||||
observer.last_runtime()
|
observer.last_runtime()
|
||||||
};
|
};
|
||||||
self.exec_time = Some(Duration::from_nanos(icount * _QEMU_NS_PER_ISN as u64));
|
self.exec_time = Some(tick_to_time(icount));
|
||||||
|
|
||||||
// Dump the icounts to a file
|
// Dump the icounts to a file
|
||||||
if let Some(td) = &self.dump_path {
|
if let Some(td) = &self.dump_path {
|
||||||
@ -293,7 +320,7 @@ impl<SYS> Named for ClockTimeFeedback<SYS> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<SYS> ClockTimeFeedback<SYS> {
|
impl<SYS: TargetSystem> ClockTimeFeedback<SYS> {
|
||||||
/// Creates a new [`ClockFeedback`], deciding if the value of a [`QemuClockObserver`] with the given `name` of a run is interesting.
|
/// Creates a new [`ClockFeedback`], deciding if the value of a [`QemuClockObserver`] with the given `name` of a run is interesting.
|
||||||
#[must_use]
|
#[must_use]
|
||||||
pub fn new(name: &'static str, select_task: Option<String>, dump_path: Option<PathBuf>) -> Self {
|
pub fn new(name: &'static str, select_task: Option<String>, dump_path: Option<PathBuf>) -> Self {
|
||||||
@ -308,7 +335,7 @@ impl<SYS> ClockTimeFeedback<SYS> {
|
|||||||
|
|
||||||
/// Creates a new [`ClockFeedback`], deciding if the given [`QemuClockObserver`] value of a run is interesting.
|
/// Creates a new [`ClockFeedback`], deciding if the given [`QemuClockObserver`] value of a run is interesting.
|
||||||
#[must_use]
|
#[must_use]
|
||||||
pub fn new_with_observer(observer: &QemuClockObserver, select_task: &Option<String>, dump_path: Option<PathBuf>) -> Self {
|
pub fn new_with_observer(observer: &QemuClockObserver<SYS>, select_task: &Option<String>, dump_path: Option<PathBuf>) -> Self {
|
||||||
Self {
|
Self {
|
||||||
exec_time: None,
|
exec_time: None,
|
||||||
select_task: select_task.clone(),
|
select_task: select_task.clone(),
|
||||||
@ -321,13 +348,14 @@ impl<SYS> ClockTimeFeedback<SYS> {
|
|||||||
|
|
||||||
/// A [`Feedback`] rewarding increasing the execution cycles on Qemu.
|
/// A [`Feedback`] rewarding increasing the execution cycles on Qemu.
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub struct QemuClockIncreaseFeedback {
|
pub struct QemuClockIncreaseFeedback<SYS: TargetSystem> {
|
||||||
name: Cow<'static, str>,
|
name: Cow<'static, str>,
|
||||||
|
phantom: std::marker::PhantomData<SYS>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<S> StateInitializer<S> for QemuClockIncreaseFeedback {}
|
impl<S,SYS: TargetSystem> StateInitializer<S> for QemuClockIncreaseFeedback<SYS> {}
|
||||||
|
|
||||||
impl<EM, I, OT, S> Feedback<EM, I, OT, S> for QemuClockIncreaseFeedback
|
impl<EM, I, OT, S, SYS: TargetSystem> Feedback<EM, I, OT, S> for QemuClockIncreaseFeedback<SYS>
|
||||||
where
|
where
|
||||||
S: State + UsesInput + HasNamedMetadata + MaybeHasClientPerfMonitor + Debug,
|
S: State + UsesInput + HasNamedMetadata + MaybeHasClientPerfMonitor + Debug,
|
||||||
EM: EventFirer<State = S>,
|
EM: EventFirer<State = S>,
|
||||||
@ -343,7 +371,7 @@ where
|
|||||||
) -> Result<bool, Error>
|
) -> Result<bool, Error>
|
||||||
where {
|
where {
|
||||||
let observer = _observers
|
let observer = _observers
|
||||||
.match_name::<QemuClockObserver>("clock")
|
.match_name::<QemuClockObserver<SYS>>("clock")
|
||||||
.expect("QemuClockObserver not found");
|
.expect("QemuClockObserver not found");
|
||||||
let clock_state = state
|
let clock_state = state
|
||||||
.named_metadata_map_mut()
|
.named_metadata_map_mut()
|
||||||
@ -377,24 +405,25 @@ where {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Named for QemuClockIncreaseFeedback {
|
impl<SYS: TargetSystem> Named for QemuClockIncreaseFeedback<SYS> {
|
||||||
#[inline]
|
#[inline]
|
||||||
fn name(&self) -> &Cow<'static, str> {
|
fn name(&self) -> &Cow<'static, str> {
|
||||||
&self.name
|
&self.name
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl QemuClockIncreaseFeedback {
|
impl<SYS: TargetSystem> QemuClockIncreaseFeedback<SYS> {
|
||||||
/// Creates a new [`HitFeedback`]
|
/// Creates a new [`HitFeedback`]
|
||||||
#[must_use]
|
#[must_use]
|
||||||
pub fn new(name: &'static str) -> Self {
|
pub fn new(name: &'static str) -> Self {
|
||||||
Self {
|
Self {
|
||||||
name: Cow::from(String::from(name)),
|
name: Cow::from(String::from(name)),
|
||||||
|
phantom: std::marker::PhantomData,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Default for QemuClockIncreaseFeedback {
|
impl<SYS: TargetSystem> Default for QemuClockIncreaseFeedback<SYS> {
|
||||||
fn default() -> Self {
|
fn default() -> Self {
|
||||||
Self::new("MaxClock")
|
Self::new("MaxClock")
|
||||||
}
|
}
|
||||||
|
@ -90,15 +90,16 @@ where
|
|||||||
//===================================================================
|
//===================================================================
|
||||||
/// A Feedback which rewards each increase in execution time
|
/// A Feedback which rewards each increase in execution time
|
||||||
#[derive(Serialize, Deserialize, Clone, Debug)]
|
#[derive(Serialize, Deserialize, Clone, Debug)]
|
||||||
pub struct ExecTimeIncFeedback {
|
pub struct ExecTimeIncFeedback<SYS: TargetSystem> {
|
||||||
name: Cow<'static, str>,
|
name: Cow<'static, str>,
|
||||||
longest_time: u64,
|
longest_time: u64,
|
||||||
last_is_longest: bool,
|
last_is_longest: bool,
|
||||||
|
phantom: PhantomData<SYS>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<S> StateInitializer<S> for ExecTimeIncFeedback {}
|
impl<S, SYS: TargetSystem> StateInitializer<S> for ExecTimeIncFeedback<SYS> {}
|
||||||
|
|
||||||
impl<EM, I, OT, S> Feedback<EM, I, OT, S> for ExecTimeIncFeedback
|
impl<EM, I, OT, S, SYS: TargetSystem> Feedback<EM, I, OT, S> for ExecTimeIncFeedback<SYS>
|
||||||
where
|
where
|
||||||
S: State + UsesInput + MaybeHasClientPerfMonitor,
|
S: State + UsesInput + MaybeHasClientPerfMonitor,
|
||||||
EM: EventFirer<State = S>,
|
EM: EventFirer<State = S>,
|
||||||
@ -115,7 +116,7 @@ where
|
|||||||
) -> Result<bool, Error>
|
) -> Result<bool, Error>
|
||||||
where {
|
where {
|
||||||
let observer = observers
|
let observer = observers
|
||||||
.match_name::<QemuClockObserver>("clocktime")
|
.match_name::<QemuClockObserver<SYS>>("clocktime")
|
||||||
.expect("QemuClockObserver not found");
|
.expect("QemuClockObserver not found");
|
||||||
if observer.last_runtime() > self.longest_time {
|
if observer.last_runtime() > self.longest_time {
|
||||||
self.longest_time = observer.last_runtime();
|
self.longest_time = observer.last_runtime();
|
||||||
@ -143,14 +144,14 @@ where {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Named for ExecTimeIncFeedback {
|
impl<SYS: TargetSystem> Named for ExecTimeIncFeedback<SYS> {
|
||||||
#[inline]
|
#[inline]
|
||||||
fn name(&self) -> &Cow<'static, str> {
|
fn name(&self) -> &Cow<'static, str> {
|
||||||
&self.name
|
&self.name
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl ExecTimeIncFeedback {
|
impl<SYS: TargetSystem> ExecTimeIncFeedback<SYS> {
|
||||||
/// Creates a new [`ExecTimeReachedFeedback`]
|
/// Creates a new [`ExecTimeReachedFeedback`]
|
||||||
#[must_use]
|
#[must_use]
|
||||||
pub fn new() -> Self {
|
pub fn new() -> Self {
|
||||||
@ -158,6 +159,7 @@ impl ExecTimeIncFeedback {
|
|||||||
name: Cow::from("ExecTimeReachedFeedback".to_string()),
|
name: Cow::from("ExecTimeReachedFeedback".to_string()),
|
||||||
longest_time: 0,
|
longest_time: 0,
|
||||||
last_is_longest: false,
|
last_is_longest: false,
|
||||||
|
phantom: PhantomData,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
23
fuzzers/FRET/tests/times.py
Executable file
23
fuzzers/FRET/tests/times.py
Executable file
@ -0,0 +1,23 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
import sys
|
||||||
|
|
||||||
|
if len(sys.argv) < 2:
|
||||||
|
print("Usage: time.py <number>")
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
|
try:
|
||||||
|
number = float(sys.argv[1])
|
||||||
|
except ValueError:
|
||||||
|
print("The first argument must be a number.")
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
|
QEMU_SHIFT=5
|
||||||
|
ISNS_PER_US=10**3 / (2**QEMU_SHIFT)
|
||||||
|
print("Time span")
|
||||||
|
print("ISNS -> µs", f"{number / ISNS_PER_US:.2f} us")
|
||||||
|
print("µs -> ISNS", f"{number * ISNS_PER_US:.2f}")
|
||||||
|
|
||||||
|
int_offset=53430
|
||||||
|
print("Interrupt offset")
|
||||||
|
print("ISNS -> µs", f"{((number + int_offset) / ISNS_PER_US):.2f} us")
|
||||||
|
print("µs -> ISNS", f"{((number * ISNS_PER_US)-int_offset):.2f}")
|
Loading…
x
Reference in New Issue
Block a user