Skip to content

Commit 1d90934

Browse files
trishumePeter Zijlstra
authored andcommitted
perf/x86/intel/pt: Fix crash with stop filters in single-range mode
Add a check for !buf->single before calling pt_buffer_region_size in a place where a missing check can cause a kernel crash. Fixes a bug introduced by commit 6706384 ("perf/x86/intel/pt: Opportunistically use single range output mode"), which added a support for PT single-range output mode. Since that commit if a PT stop filter range is hit while tracing, the kernel will crash because of a null pointer dereference in pt_handle_status due to calling pt_buffer_region_size without a ToPA configured. The commit which introduced single-range mode guarded almost all uses of the ToPA buffer variables with checks of the buf->single variable, but missed the case where tracing was stopped by the PT hardware, which happens when execution hits a configured stop filter. Tested that hitting a stop filter while PT recording successfully records a trace with this patch but crashes without this patch. Fixes: 6706384 ("perf/x86/intel/pt: Opportunistically use single range output mode") Signed-off-by: Tristan Hume <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Reviewed-by: Adrian Hunter <[email protected]> Cc: [email protected] Link: https://lkml.kernel.org/r/[email protected]
1 parent ddecd22 commit 1d90934

File tree

1 file changed

+3
-2
lines changed
  • arch/x86/events/intel

1 file changed

+3
-2
lines changed

arch/x86/events/intel/pt.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -897,8 +897,9 @@ static void pt_handle_status(struct pt *pt)
897897
* means we are already losing data; need to let the decoder
898898
* know.
899899
*/
900-
if (!intel_pt_validate_hw_cap(PT_CAP_topa_multiple_entries) ||
901-
buf->output_off == pt_buffer_region_size(buf)) {
900+
if (!buf->single &&
901+
(!intel_pt_validate_hw_cap(PT_CAP_topa_multiple_entries) ||
902+
buf->output_off == pt_buffer_region_size(buf))) {
902903
perf_aux_output_flag(&pt->handle,
903904
PERF_AUX_FLAG_TRUNCATED);
904905
advance++;

0 commit comments

Comments
 (0)