Commit 057ae59f authored by Adrian Hunter's avatar Adrian Hunter Committed by Arnaldo Carvalho de Melo
Browse files

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



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: 7c1b16ba ("perf intel-pt: Add support for decoding FUP/TIP only")
Fixes: 83959817 ("perf intel-pt: Allow decoding with branch tracing disabled")
Signed-off-by: default avatarAdrian 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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent c8978997

tools/perf/util/intel-pt-decoder/intel-pt-decoder.c

+4 −3
Original line number Diff line number Diff line
@@ -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;