This is a note to let you know that I've just added the patch titled perf intel-pt: Fix missing 'instruction' events with 'q' option to the 5.10-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: perf-intel-pt-fix-missing-instruction-events-with-q-option.patch and it can be found in the queue-5.10 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From foo@baz Wed Dec 15 02:59:52 PM CET 2021 From: Adrian Hunter <adrian.hunter@xxxxxxxxx> Date: Mon, 13 Dec 2021 17:45:47 +0200 Subject: perf intel-pt: Fix missing 'instruction' events with 'q' option To: stable@xxxxxxxxxxxxxxx Message-ID: <20211213154548.122728-8-adrian.hunter@xxxxxxxxx> From: Adrian Hunter <adrian.hunter@xxxxxxxxx> commit a882cc94971093e146ffa1163b140ad956236754 upstream. FUP packets contain IP information, which makes them also an 'instruction' event in 'hop' mode i.e. the itrace 'q' option. That wasn't happening, so restructure the logic so that FUP events are added along with appropriate 'instruction' and 'branch' events. Fixes: 7c1b16ba0e26e6 ("perf intel-pt: Add support for decoding FUP/TIP only") Signed-off-by: Adrian Hunter <adrian.hunter@xxxxxxxxx> Cc: Jiri Olsa <jolsa@xxxxxxxxxx> Cc: stable@xxxxxxxxxxxxxxx # v5.15+ Link: https://lore.kernel.org/r/20211210162303.2288710-7-adrian.hunter@xxxxxxxxx Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx> [Adrian: Backport to v5.10] Signed-off-by: Adrian Hunter <adrian.hunter@xxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- tools/perf/util/intel-pt-decoder/intel-pt-decoder.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) --- a/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c +++ b/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c @@ -1954,6 +1954,8 @@ static int intel_pt_scan_for_psb(struct /* Hop mode: Ignore TNT, do not walk code, but get ip from FUPs and TIPs */ static int intel_pt_hop_trace(struct intel_pt_decoder *decoder, bool *no_tip, int *err) { + *err = 0; + /* Leap from PSB to PSB, getting ip from FUP within PSB+ */ if (decoder->leap && !decoder->in_psb && decoder->packet.type != INTEL_PT_PSB) { *err = intel_pt_scan_for_psb(decoder); @@ -1988,18 +1990,21 @@ static int intel_pt_hop_trace(struct int if (!decoder->packet.count) return HOP_IGNORE; intel_pt_set_ip(decoder); - if (intel_pt_fup_event(decoder)) - return HOP_RETURN; + if (decoder->set_fup_mwait || decoder->set_fup_pwre) + *no_tip = true; if (!decoder->branch_enable || !decoder->pge) *no_tip = true; if (*no_tip) { decoder->state.type = INTEL_PT_INSTRUCTION; decoder->state.from_ip = decoder->ip; decoder->state.to_ip = 0; + intel_pt_fup_event(decoder); return HOP_RETURN; } + intel_pt_fup_event(decoder); + decoder->state.type |= INTEL_PT_INSTRUCTION | INTEL_PT_BRANCH; *err = intel_pt_walk_fup_tip(decoder); - if (!*err) + if (!*err && decoder->state.to_ip) decoder->pkt_state = INTEL_PT_STATE_RESAMPLE; return HOP_RETURN; Patches currently in stable-queue which might be from adrian.hunter@xxxxxxxxx are queue-5.10/perf-intel-pt-fix-some-pge-packet-generation-enable-control-flow-packets-usage.patch queue-5.10/perf-intel-pt-fix-intel_pt_fup_event-assumptions-about-setting-state-type.patch queue-5.10/perf-intel-pt-fix-next-err-value-walking-trace.patch queue-5.10/perf-intel-pt-fix-error-timestamp-setting-on-the-decoder-error-path.patch queue-5.10/perf-intel-pt-fix-state-setting-when-receiving-overflow-ovf-packet.patch queue-5.10/perf-intel-pt-fix-sync-state-when-a-psb-synchronization-packet-is-found.patch queue-5.10/perf-inject-fix-itrace-space-allowed-for-new-attributes.patch queue-5.10/perf-intel-pt-fix-missing-instruction-events-with-q-option.patch