Commit 0dd2671d authored by Song Liu's avatar Song Liu Committed by Lee Jones
Browse files

UPSTREAM: perf: fix perf_event_context->time



[ Upstream commit baf1b12a ]

Time readers rely on perf_event_context->[time|timestamp|timeoffset] to get
accurate time_enabled and time_running for an event. The difference between
ctx->timestamp and ctx->time is the among of time when the context is not
enabled. __update_context_time(ctx, false) is used to increase timestamp,
but not time. Therefore, it should only be called in ctx_sched_in() when
EVENT_TIME was not enabled.

Bug: 283482355
Fixes: 09f5e7dc ("perf: Fix perf_event_read_local() time")
Signed-off-by: default avatarSong Liu <song@kernel.org>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: default avatarNamhyung Kim <namhyung@kernel.org>
Link: https://lkml.kernel.org/r/20230313171608.298734-1-song@kernel.org


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
(cherry picked from commit 5255e6d4)
Signed-off-by: default avatarLee Jones <joneslee@google.com>
Change-Id: I5769f5d59c5ed9667a12869d132270cd3ec78c6e
parent ab3443a8
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment