diff options
| author | Marco Elver <elver@google.com> | 2020-07-29 13:09:16 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-07-31 12:12:03 +0200 |
| commit | 92c209ac6d3d35783c16c8a717547183e6e11162 (patch) | |
| tree | bf34202bebc219dac144f09230b4ba6ce7d7327b /kernel/kcsan/report.c | |
| parent | 0584df9c12f449124d0bfef9899e5365604ee7a9 (diff) | |
| download | linux-stable-92c209ac6d3d35783c16c8a717547183e6e11162.tar.gz linux-stable-92c209ac6d3d35783c16c8a717547183e6e11162.tar.bz2 linux-stable-92c209ac6d3d35783c16c8a717547183e6e11162.zip | |
kcsan: Improve IRQ state trace reporting
To improve the general usefulness of the IRQ state trace events with
KCSAN enabled, save and restore the trace information when entering and
exiting the KCSAN runtime as well as when generating a KCSAN report.
Without this, reporting the IRQ trace events (whether via a KCSAN report
or outside of KCSAN via a lockdep report) is rather useless due to
continuously being touched by KCSAN. This is because if KCSAN is
enabled, every instrumented memory access causes changes to IRQ trace
events (either by KCSAN disabling/enabling interrupts or taking
report_lock when generating a report).
Before "lockdep: Prepare for NMI IRQ state tracking", KCSAN avoided
touching the IRQ trace events via raw_local_irq_save/restore() and
lockdep_off/on().
Fixes: 248591f5d257 ("kcsan: Make KCSAN compatible with new IRQ state tracking")
Signed-off-by: Marco Elver <elver@google.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20200729110916.3920464-2-elver@google.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/kcsan/report.c')
| -rw-r--r-- | kernel/kcsan/report.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/kcsan/report.c b/kernel/kcsan/report.c index 6b2fb1a6d8cd..9d07e175de0f 100644 --- a/kernel/kcsan/report.c +++ b/kernel/kcsan/report.c @@ -308,6 +308,9 @@ static void print_verbose_info(struct task_struct *task) if (!task) return; + /* Restore IRQ state trace for printing. */ + kcsan_restore_irqtrace(task); + pr_err("\n"); debug_show_held_locks(task); print_irqtrace_events(task); |