Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48454650 authored by Steven Rostedt's avatar Steven Rostedt Committed by Steven Rostedt
Browse files

x86/tracing: Denote the power and cpuidle tracepoints as _rcuidle() 



The power and cpuidle tracepoints are called within a rcu_idle_exit()
section, and must be denoted with the _rcuidle() version of the tracepoint.

Acked-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Reviewed-by: default avatarJosh Triplett <josh@joshtriplett.org>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 2fbb90db

arch/x86/kernel/process.c

+12 −12
Original line number Diff line number Diff line
@@ -377,8 +377,8 @@ static inline int hlt_use_halt(void) 
void default_idle(void)

{

	if (hlt_use_halt()) {

		trace_power_start(POWER_CSTATE, 1, smp_processor_id());

		trace_cpu_idle(1, smp_processor_id());

		trace_power_start_rcuidle(POWER_CSTATE, 1, smp_processor_id());

		trace_cpu_idle_rcuidle(1, smp_processor_id());

		current_thread_info()->status &= ~TS_POLLING;

		/*

		 * TS_POLLING-cleared state must be visible before we
@@ -391,8 +391,8 @@ void default_idle(void) 
		else

			local_irq_enable();

		current_thread_info()->status |= TS_POLLING;

		trace_power_end(smp_processor_id());

		trace_cpu_idle(PWR_EVENT_EXIT, smp_processor_id());

		trace_power_end_rcuidle(smp_processor_id());

		trace_cpu_idle_rcuidle(PWR_EVENT_EXIT, smp_processor_id());

	} else {

		local_irq_enable();

		/* loop is done by the caller */
@@ -450,8 +450,8 @@ EXPORT_SYMBOL_GPL(cpu_idle_wait); 
static void mwait_idle(void)

{

	if (!need_resched()) {

		trace_power_start(POWER_CSTATE, 1, smp_processor_id());

		trace_cpu_idle(1, smp_processor_id());

		trace_power_start_rcuidle(POWER_CSTATE, 1, smp_processor_id());

		trace_cpu_idle_rcuidle(1, smp_processor_id());

		if (this_cpu_has(X86_FEATURE_CLFLUSH_MONITOR))

			clflush((void *)&current_thread_info()->flags);
@@ -461,8 +461,8 @@ static void mwait_idle(void) 
			__sti_mwait(0, 0);

		else

			local_irq_enable();

		trace_power_end(smp_processor_id());

		trace_cpu_idle(PWR_EVENT_EXIT, smp_processor_id());

		trace_power_end_rcuidle(smp_processor_id());

		trace_cpu_idle_rcuidle(PWR_EVENT_EXIT, smp_processor_id());

	} else

		local_irq_enable();

}
@@ -474,13 +474,13 @@ static void mwait_idle(void) 
 */

static void poll_idle(void)

{

	trace_power_start(POWER_CSTATE, 0, smp_processor_id());

	trace_cpu_idle(0, smp_processor_id());

	trace_power_start_rcuidle(POWER_CSTATE, 0, smp_processor_id());

	trace_cpu_idle_rcuidle(0, smp_processor_id());

	local_irq_enable();

	while (!need_resched())

		cpu_relax();

	trace_power_end(smp_processor_id());

	trace_cpu_idle(PWR_EVENT_EXIT, smp_processor_id());

	trace_power_end_rcuidle(smp_processor_id());

	trace_cpu_idle_rcuidle(PWR_EVENT_EXIT, smp_processor_id());

}



/*

include/trace/events/power.h

+2 −0
Original line number Diff line number Diff line
@@ -151,6 +151,8 @@ enum { 
   events get removed */

static inline void trace_power_start(u64 type, u64 state, u64 cpuid) {};

static inline void trace_power_end(u64 cpuid) {};

static inline void trace_power_start_rcuidle(u64 type, u64 state, u64 cpuid) {};

static inline void trace_power_end_rcuidle(u64 cpuid) {};

static inline void trace_power_frequency(u64 type, u64 state, u64 cpuid) {};

#endif /* _PWR_EVENT_AVOID_DOUBLE_DEFINING_DEPRECATED */