cpuidle: Use local_clock_noinstr()
With the introduction of local_clock_noinstr(), local_clock() itself is no longer marked noinstr, use the correct function. Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Acked-by: Rafael J. Wysocki <rafael@kernel.org> Tested-by: Michael Kelley <mikelley@microsoft.com> # Hyper-V Link: https://lore.kernel.org/r/20230519102716.045980863@infradead.org
This commit is contained in:
Родитель
fb7d4948c4
Коммит
e6a15fa9ea
|
@ -145,7 +145,7 @@ static noinstr void enter_s2idle_proper(struct cpuidle_driver *drv,
|
|||
|
||||
instrumentation_begin();
|
||||
|
||||
time_start = ns_to_ktime(local_clock());
|
||||
time_start = ns_to_ktime(local_clock_noinstr());
|
||||
|
||||
tick_freeze();
|
||||
/*
|
||||
|
@ -169,7 +169,7 @@ static noinstr void enter_s2idle_proper(struct cpuidle_driver *drv,
|
|||
tick_unfreeze();
|
||||
start_critical_timings();
|
||||
|
||||
time_end = ns_to_ktime(local_clock());
|
||||
time_end = ns_to_ktime(local_clock_noinstr());
|
||||
|
||||
dev->states_usage[index].s2idle_time += ktime_us_delta(time_end, time_start);
|
||||
dev->states_usage[index].s2idle_usage++;
|
||||
|
@ -243,7 +243,7 @@ noinstr int cpuidle_enter_state(struct cpuidle_device *dev,
|
|||
sched_idle_set_state(target_state);
|
||||
|
||||
trace_cpu_idle(index, dev->cpu);
|
||||
time_start = ns_to_ktime(local_clock());
|
||||
time_start = ns_to_ktime(local_clock_noinstr());
|
||||
|
||||
stop_critical_timings();
|
||||
if (!(target_state->flags & CPUIDLE_FLAG_RCU_IDLE)) {
|
||||
|
@ -276,7 +276,7 @@ noinstr int cpuidle_enter_state(struct cpuidle_device *dev,
|
|||
start_critical_timings();
|
||||
|
||||
sched_clock_idle_wakeup_event();
|
||||
time_end = ns_to_ktime(local_clock());
|
||||
time_end = ns_to_ktime(local_clock_noinstr());
|
||||
trace_cpu_idle(PWR_EVENT_EXIT, dev->cpu);
|
||||
|
||||
/* The cpu is no longer idle or about to enter idle. */
|
||||
|
|
|
@ -15,7 +15,7 @@ static int __cpuidle poll_idle(struct cpuidle_device *dev,
|
|||
{
|
||||
u64 time_start;
|
||||
|
||||
time_start = local_clock();
|
||||
time_start = local_clock_noinstr();
|
||||
|
||||
dev->poll_time_limit = false;
|
||||
|
||||
|
@ -32,7 +32,7 @@ static int __cpuidle poll_idle(struct cpuidle_device *dev,
|
|||
continue;
|
||||
|
||||
loop_count = 0;
|
||||
if (local_clock() - time_start > limit) {
|
||||
if (local_clock_noinstr() - time_start > limit) {
|
||||
dev->poll_time_limit = true;
|
||||
break;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче