kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cpuidle: move idle traces to cpuidle_enter_state()

Browse source 
idle_exit event is the first event after a core exits
idle state. So this should be traced before local irq
is ebabled. Likewise idle_entry is the last event before
a core enters idle state. This will ease visualising the
cpu idle state from kernel traces.

Signed-off-by: Sandeep Tripathy <sandeep.tripathy@linaro.org>
Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
[rjw: Subject, rebase]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Sandeep Tripathy 2014-07-02 15:00:58 +05:30 committed by Rafael J. Wysocki
parent cd3de83f14
commit 30fe688402
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/cpuidle/cpuidle.c
View file

@ -119,11 +119,13 @@ int cpuidle_enter_state(struct cpuidle_device *dev, struct cpuidle_driver *drv,
ktime_t time_start, time_end; ktime_t time_start, time_end;
s64 diff; s64 diff;
trace_cpu_idle_rcuidle(index, dev->cpu);
time_start = ktime_get(); time_start = ktime_get();
entered_state = target_state->enter(dev, drv, index); entered_state = target_state->enter(dev, drv, index);
time_end = ktime_get(); time_end = ktime_get();
trace_cpu_idle_rcuidle(PWR_EVENT_EXIT, dev->cpu);
if (!cpuidle_state_is_coupled(dev, drv, entered_state)) if (!cpuidle_state_is_coupled(dev, drv, entered_state))
local_irq_enable(); local_irq_enable();

4
kernel/sched/idle.c
View file

@ -147,8 +147,6 @@ use_default:
clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &dev->cpu)) clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &dev->cpu))
goto use_default; goto use_default;
trace_cpu_idle_rcuidle(next_state, dev->cpu);
/* /*
* Enter the idle state previously returned by the governor decision. * Enter the idle state previously returned by the governor decision.
* This function will block until an interrupt occurs and will take * This function will block until an interrupt occurs and will take
@ -156,8 +154,6 @@ use_default:
*/ */
entered_state = cpuidle_enter(drv, dev, next_state); entered_state = cpuidle_enter(drv, dev, next_state);
trace_cpu_idle_rcuidle(PWR_EVENT_EXIT, dev->cpu);
if (broadcast) if (broadcast)
clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &dev->cpu); clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &dev->cpu);