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

Merge a25a403e4b ("perf intel-pt: Fix CYC timestamps after standalone CBR") into android12-5.10-lts

Browse Source 
Steps on the way to 5.10.180

Change-Id: Iad8c37b60130351152185ac4de3052a6c150b16e
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2023-06-26 13:14:09 +00:00
parent 5cb8a3c82c a25a403e4b
commit 4a2ed7d4bc
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/perf/util/auxtrace.c
View File

@@ -2279,6 +2279,7 @@ static int find_entire_kern_cb(void *arg, const char *name __maybe_unused,
char type, u64 start) char type, u64 start)
{ {
struct sym_args *args = arg; struct sym_args *args = arg;
u64 size;
if (!kallsyms__is_function(type)) if (!kallsyms__is_function(type))
return 0; return 0;
@@ -2288,7 +2289,9 @@ static int find_entire_kern_cb(void *arg, const char *name __maybe_unused,
args->start = start; args->start = start;
} }
/* Don't know exactly where the kernel ends, so we add a page */ /* 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; return 0;
} }

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

@@ -1639,6 +1639,8 @@ static void intel_pt_calc_cbr(struct intel_pt_decoder *decoder)
decoder->cbr = cbr; decoder->cbr = cbr;
decoder->cbr_cyc_to_tsc = decoder->max_non_turbo_ratio_fp / 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); intel_pt_mtc_cyc_cnt_cbr(decoder);
} }