[PATCH V3 01/10] perf/x86: Fix native_perf_sched_clock_from_tsc() with __sched_clock_offset

Adrian Hunter
2022-03-07T08:53:26Z

native_perf_sched_clock_from_tsc() is used to produce a time value that can
be consistent with perf_clock(). Consequently, it should be adjusted by
__sched_clock_offset, the same as perf_clock() would be.

Fixes: 698eff6355f735 ("sched/clock, x86/perf: Fix perf test tsc")
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
---
arch/x86/kernel/tsc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
index a698196377be..d9fe277c2471 100644
--- a/arch/x86/kernel/tsc.c
+++ b/arch/x86/kernel/tsc.c
@@ -242,7 +242,7 @@ u64 native_sched_clock(void)
*/
u64 native_sched_clock_from_tsc(u64 tsc)
{
- return cycles_2_ns(tsc);
+ return cycles_2_ns(tsc) + __sched_clock_offset;
}

/* We need to define a real function for sched_clock, to override the
--
2.25.1