Skip to content

Commit

Permalink
i#6599: Relax WOW64 drmemtrace syscall invariant
Browse files Browse the repository at this point in the history
Relaxes a drmemtrace syscall invariant for WOW64 where raw2trace
delays the "syscall" call across the 2nd set of timestamp;cpuid
markers, breaking the drmemtrace invariant checker.

A full solution requires #5949 to actually identify the syscall as
such: the relaxations for this and prior changes are marked under that
issue and will be removed when it is addressed, so we can consider

Issue: #5949, $6599
Fixes #6599
  • Loading branch information
derekbruening committed Mar 26, 2024
1 parent 8b3f924 commit 796e74b
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions clients/drcachesim/tools/invariant_checker.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,9 @@ invariant_checker_t::parallel_shard_memref(void *shard_data, const memref_t &mem
}
#endif
shard->expect_syscall_marker_ = false;
// TODO i#5949,i#6599: On WOW64 the "syscall" call is delayed by raw2trace
// acros the 2nd timestamp+cpuid; we disable this check until that is solved.
#if !defined(WINDOWS) || defined(X64)
// We expect an immediately preceding timestamp + cpuid.
if (shard->trace_version_ >= TRACE_ENTRY_VERSION_FREQUENT_TIMESTAMPS) {
report_if_false(
Expand All @@ -432,6 +435,7 @@ invariant_checker_t::parallel_shard_memref(void *shard_data, const memref_t &mem
TRACE_MARKER_TYPE_TIMESTAMP,
"Syscall marker not preceded by timestamp + cpuid");
}
#endif
}
if (memref.marker.type == TRACE_TYPE_MARKER &&
memref.marker.marker_type == TRACE_MARKER_TYPE_MAYBE_BLOCKING_SYSCALL) {
Expand Down

0 comments on commit 796e74b

Please sign in to comment.