xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf intel-pt: Fix some PGE (packet generation enable/control flow packets) usage

Browse Source 
commit 057ae59f5a1d924511beb1b09f395bdb316cfd03 upstream.

Packet generation enable (PGE) refers to whether control flow (COFI)
packets are being produced.

PGE may be false even when branch-tracing is enabled, due to being
out-of-context, or outside a filter address range.  Fix some missing PGE
usage.

Fixes: 7c1b16ba0e ("perf intel-pt: Add support for decoding FUP/TIP only")
Fixes: 839598176b ("perf intel-pt: Allow decoding with branch tracing disabled")
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: stable@vger.kernel.org # v5.15+
Link: https://lore.kernel.org/r/20211210162303.2288710-2-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
[Adrian: Backport to v5.10]
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Adrian Hunter
2021-12-13 17:45:42 +02:00
committed by Greg Kroah-Hartman
parent b23f9252a4
commit 731ff78841
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/perf/util/intel-pt-decoder/intel-pt-decoder.c
View File

@@ -1949,6 +1949,7 @@ static int intel_pt_hop_trace(struct intel_pt_decoder *decoder, bool *no_tip, in
return HOP_IGNORE; return HOP_IGNORE;
case INTEL_PT_TIP_PGD: case INTEL_PT_TIP_PGD:
decoder->pge = false;
if (!decoder->packet.count) if (!decoder->packet.count)
return HOP_IGNORE; return HOP_IGNORE;
intel_pt_set_ip(decoder); intel_pt_set_ip(decoder);
@@ -1972,7 +1973,7 @@ static int intel_pt_hop_trace(struct intel_pt_decoder *decoder, bool *no_tip, in
intel_pt_set_ip(decoder); intel_pt_set_ip(decoder);
if (intel_pt_fup_event(decoder)) if (intel_pt_fup_event(decoder))
return HOP_RETURN; return HOP_RETURN;
if (!decoder->branch_enable) if (!decoder->branch_enable || !decoder->pge)
*no_tip = true; *no_tip = true;
if (*no_tip) { if (*no_tip) {
decoder->state.type = INTEL_PT_INSTRUCTION; decoder->state.type = INTEL_PT_INSTRUCTION;
@@ -2124,7 +2125,7 @@ next:
break; break;
} }
intel_pt_set_last_ip(decoder); intel_pt_set_last_ip(decoder);
if (!decoder->branch_enable) { if (!decoder->branch_enable || !decoder->pge) {
decoder->ip = decoder->last_ip; decoder->ip = decoder->last_ip;
if (intel_pt_fup_event(decoder)) if (intel_pt_fup_event(decoder))
return 0; return 0;