diff options
| author | Andrei Vagin <avagin@google.com> | 2023-06-15 00:13:50 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-15 09:13:50 +0200 |
| commit | ee64538c9ffd9061beed35146e37813a1e26a152 (patch) | |
| tree | 63b00ea1316201e0d68f07c2ab3999544ce6729d /executor/executor.cc | |
| parent | 76decb8275c764d309b8daf5ab9dc573b2411ddf (diff) | |
executor: use exitf instead of fail outside of setup sequence (#3959)
We have a long history of executor managing to corrupt itself in various
interesting ways (e.g. using read with a pointer pointing to some
global/stack variable and then kernel overwrites it). Or rt_sigreturn
can corrupt other registers which won't cause immediate SIGSEGV, but
rather some random behavior later. This is the race we can't win.
We can't rely on memory consistency when the test already started, so we
should use exitf instead of fail outside of setup sequence (and relying
more on unit testing to ensure that executor works as expected for sane
programs).
Suggested-by: Dmitry Vyukov <dvyukov@google.com>
Signed-off-by: Andrei Vagin <avagin@google.com>
Diffstat (limited to 'executor/executor.cc')
| -rw-r--r-- | executor/executor.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/executor/executor.cc b/executor/executor.cc index f6b09f30a..b2e24f46b 100644 --- a/executor/executor.cc +++ b/executor/executor.cc @@ -980,8 +980,8 @@ thread_t* schedule_call(int call_index, int call_num, uint64 copyout_index, uint exitf("out of threads"); thread_t* th = &threads[i]; if (event_isset(&th->ready) || !event_isset(&th->done) || th->executing) - failmsg("bad thread state in schedule", "ready=%d done=%d executing=%d", - event_isset(&th->ready), event_isset(&th->done), th->executing); + exitf("bad thread state in schedule: ready=%d done=%d executing=%d", + event_isset(&th->ready), event_isset(&th->done), th->executing); last_scheduled = th; th->copyout_pos = pos; th->copyout_index = copyout_index; @@ -1054,8 +1054,8 @@ void write_coverage_signal(cover_t* cov, uint32* signal_count_pos, uint32* cover void handle_completion(thread_t* th) { if (event_isset(&th->ready) || !event_isset(&th->done) || !th->executing) - failmsg("bad thread state in completion", "ready=%d done=%d executing=%d", - event_isset(&th->ready), event_isset(&th->done), th->executing); + exitf("bad thread state in completion: ready=%d done=%d executing=%d", + event_isset(&th->ready), event_isset(&th->done), th->executing); if (th->res != (intptr_t)-1) copyout_call_results(th); |