Skip to contentSkip to conversation

perf intel-pt: Two small fixes for stable

PATCH Applied Adrian Hunter 2 participants 4 messages Apr 3, 2023 perf events

lore
Share & tools
lore

Adrian Hunter

author reviewer
#0 lore raw

cover perf intel-pt: Two small fixes for stable

Hi

Here are 2 small fixes for stable.

Adrian Hunter (2):
perf auxtrace: Fix address filter entire kernel size perf intel-pt: Fix CYC timestamps after standalone CBR

 tools/perf/util/auxtrace.c                          | 5 ++++-
 tools/perf/util/intel-pt-decoder/intel-pt-decoder.c | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

Regards
Adrian

author reviewer
#1 lore raw

PATCH 1/2 perf auxtrace: Fix address filter entire kernel size

kallsyms is not completely in address order.

In find_entire_kern_cb(), calculate the kernel end from the maximum address not the last symbol.

Example:

Before:

    $ sudo cat /proc/kallsyms | grep ' [twTw] ' | tail -1
    ffffffffc00b8bd0 t bpf_prog_6deef7357e7b4530    [bpf]
    $ sudo cat /proc/kallsyms | grep ' [twTw] ' | sort | tail -1
    ffffffffc15e0cc0 t iwl_mvm_exit [iwlmvm]
    $ perf.d093603a05aa record -v --kcore -e intel_pt// --filter 'filter *' -- uname |& grep filter
    Address filter: filter 0xffffffff93200000/0x2ceba000

After:

    $ perf.8fb0f7a01f8e record -v --kcore -e intel_pt// --filter 'filter *' -- uname |& grep filter
    Address filter: filter 0xffffffff93200000/0x2e3e2000
Fixes 1b36c03e3569 ("perf record: Add support for using symbols in address filters")
---
 tools/perf/util/auxtrace.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
tools/perf/util/auxtrace.c +4 -1
index 498ff7f24463..b2a5e5397bad 100644
@@ -2449,6 +2449,7 @@ static int find_entire_kern_cb(void *arg, const char *name __maybe_unused,
 			       char type, u64 start)
 {
 	struct sym_args *args = arg;
+	u64 size;
 
 	if (!kallsyms__is_function(type))
 		return 0;
@@ -2458,7 +2459,9 @@ static int find_entire_kern_cb(void *arg, const char *name __maybe_unused,
 		args->start = start;
 	}
 	/* Don't know exactly where the kernel ends, so we add a page */
-	args->size = round_up(start, page_size) + page_size - args->start;
+	size = round_up(start, page_size) + page_size - args->start;
+	if (size > args->size)
+		args->size = size;
 
 	return 0;
 }
Signature · 1 line
2.34.1
author reviewer
#2 lore raw

PATCH 2/2 perf intel-pt: Fix CYC timestamps after standalone CBR

In reply to Adrian Hunter

After a standalone CBR (not associated with TSC), update the cycles reference timestamp and reset the cycle count, so that CYC timestamps are calculated relative to that point with the new frequency.

Fixes cc33618619ce ("perf tools: Add Intel PT support for decoding CYC packets")
---
 tools/perf/util/intel-pt-decoder/intel-pt-decoder.c | 2 ++
 1 file changed, 2 insertions(+)
tools/perf/util/intel-pt-decoder/intel-pt-decoder.c +2 -0
index 0ac860c8dd2b..7145c5890de0 100644
@@ -1998,6 +1998,8 @@ static void intel_pt_calc_cbr(struct intel_pt_decoder *decoder)
 
 	decoder->cbr = cbr;
 	decoder->cbr_cyc_to_tsc = decoder->max_non_turbo_ratio_fp / cbr;
+	decoder->cyc_ref_timestamp = decoder->timestamp;
+	decoder->cycle_cnt = 0;
 
 	intel_pt_mtc_cyc_cnt_cbr(decoder);
 }
Signature · 1 line
2.34.1
maintainer Applied
#3 lore raw
In reply to Adrian Hunter

Em Mon, Apr 03, 2023 at 06:48:29PM +0300, Adrian Hunter escreveu:

Quoted 8 lines

Hi

Here are 2 small fixes for stable.

Adrian Hunter (2):
perf auxtrace: Fix address filter entire kernel size perf intel-pt: Fix CYC timestamps after standalone CBR

Thanks, applied.

- Arnaldo

Quoted 7 lines
 tools/perf/util/auxtrace.c                          | 5 ++++-
 tools/perf/util/intel-pt-decoder/intel-pt-decoder.c | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

Regards
Adrian

Signature · 1 line
- Arnaldo