From: Adrian Hunter <adrian.hunter@intel.com>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>, linux-kernel@vger.kernel.org
Subject: [PATCH 1/7] perf intel-pt: Fix some PGE usage
Date: Fri, 10 Dec 2021 18:22:57 +0200 [thread overview]
Message-ID: <20211210162303.2288710-2-adrian.hunter@intel.com> (raw)
In-Reply-To: <20211210162303.2288710-1-adrian.hunter@intel.com>
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: 839598176b0554 ("perf intel-pt: Allow decoding with branch tracing disabled")
Fixes: 7c1b16ba0e26e6 ("perf intel-pt: Add support for decoding FUP/TIP only")
Cc: stable@vger.kernel.org # v5.15+
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
---
tools/perf/util/intel-pt-decoder/intel-pt-decoder.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c b/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c
index 5f83937bf8f3..6f6f163161a9 100644
--- a/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c
+++ b/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c
@@ -2678,6 +2678,7 @@ static int intel_pt_hop_trace(struct intel_pt_decoder *decoder, bool *no_tip, in
return HOP_IGNORE;
case INTEL_PT_TIP_PGD:
+ decoder->pge = false;
if (!decoder->packet.count) {
intel_pt_set_nr(decoder);
return HOP_IGNORE;
@@ -2707,7 +2708,7 @@ static int intel_pt_hop_trace(struct intel_pt_decoder *decoder, bool *no_tip, in
intel_pt_set_ip(decoder);
if (intel_pt_fup_event(decoder))
return HOP_RETURN;
- if (!decoder->branch_enable)
+ if (!decoder->branch_enable || !decoder->pge)
*no_tip = true;
if (*no_tip) {
decoder->state.type = INTEL_PT_INSTRUCTION;
@@ -2897,7 +2898,7 @@ static bool intel_pt_psb_with_fup(struct intel_pt_decoder *decoder, int *err)
{
struct intel_pt_psb_info data = { .fup = false };
- if (!decoder->branch_enable || !decoder->pge)
+ if (!decoder->branch_enable)
return false;
intel_pt_pkt_lookahead(decoder, intel_pt_psb_lookahead_cb, &data);
@@ -2999,7 +3000,7 @@ static int intel_pt_walk_trace(struct intel_pt_decoder *decoder)
break;
}
intel_pt_set_last_ip(decoder);
- if (!decoder->branch_enable) {
+ if (!decoder->branch_enable || !decoder->pge) {
decoder->ip = decoder->last_ip;
if (intel_pt_fup_event(decoder))
return 0;
--
2.25.1
next prev parent reply other threads:[~2021-12-10 16:23 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-10 16:22 [PATCH 0/7] perf intel-pt: Fixes Adrian Hunter
2021-12-10 16:22 ` Adrian Hunter [this message]
2021-12-10 16:22 ` [PATCH 2/7] perf intel-pt: Fix sync state Adrian Hunter
2021-12-10 16:22 ` [PATCH 3/7] perf intel-pt: Fix intel_pt_fup_event() assumptions Adrian Hunter
2021-12-10 16:23 ` [PATCH 4/7] perf intel-pt: Fix overflow state Adrian Hunter
2021-12-10 16:23 ` [PATCH 5/7] perf intel-pt: Fix next 'err' value, walking trace Adrian Hunter
2021-12-10 16:23 ` [PATCH 6/7] perf intel-pt: Fix missing 'instruction' events with 'q' option Adrian Hunter
2021-12-10 16:23 ` [PATCH 7/7] perf intel-pt: Fix error timestamp Adrian Hunter
2021-12-10 18:40 ` [PATCH 0/7] perf intel-pt: Fixes Arnaldo Carvalho de Melo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211210162303.2288710-2-adrian.hunter@intel.com \
--to=adrian.hunter@intel.com \
--cc=acme@kernel.org \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox