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

Commit cc7d127f authored by Joonwoo Park's avatar Joonwoo Park
Browse files

sched: introduce trace events for EAS task placement 



Introduce sched_cpu_util() and sched_task_util().  These are
mainly for ease of debugging and profiling.

Change-Id: Idc8fe37e94a798125caeb76ae835582b593b0a0a
Signed-off-by: default avatarJoonwoo Park <joonwoop@codeaurora.org>
parent 2b901d50

include/trace/events/sched.h

+87 −0
Original line number Diff line number Diff line
@@ -696,6 +696,93 @@ TRACE_EVENT(sched_freq_alert, 


#endif	/* CONFIG_SCHED_HMP */



#ifdef CONFIG_SMP

TRACE_EVENT(sched_cpu_util,



	TP_PROTO(struct task_struct *p, int cpu, int task_util, long spare_cap, int sync),



	TP_ARGS(p, cpu, task_util, spare_cap, sync),



	TP_STRUCT__entry(

		__array(char, comm, TASK_COMM_LEN	)

		__field(int, pid			)

		__field(unsigned int, cpu			)

		__field(int, task_util				)

		__field(unsigned int, nr_running		)

		__field(long, cpu_util			)

		__field(unsigned int, capacity_curr		)

		__field(unsigned int, capacity			)

		__field(long, spare_cap				)

		__field(int, sync				)

		__field(int, idle_state				)

	),



	TP_fast_assign(

		memcpy(__entry->comm, p->comm, TASK_COMM_LEN);

		__entry->pid			= p->pid;

		__entry->cpu			= cpu;

		__entry->task_util		= task_util;

		__entry->nr_running		= cpu_rq(cpu)->nr_running;

		__entry->cpu_util		= cpu_util(cpu);

		__entry->capacity_curr		= capacity_curr_of(cpu);

		__entry->capacity		= capacity_of(cpu);

		__entry->spare_cap		= spare_cap;

		__entry->sync			= sync;

		__entry->idle_state		= idle_get_state_idx(cpu_rq(cpu));

	),



	TP_printk("comm=%s pid=%d cpu=%d task_util=%d nr_running=%d cpu_util=%ld capacity_curr=%u capacity=%u spare_capacity=%ld sync=%d idle_state=%d",

		__entry->comm, __entry->pid, __entry->cpu, __entry->task_util, __entry->nr_running, __entry->cpu_util, __entry->capacity_curr, __entry->capacity, __entry->spare_cap, __entry->sync, __entry->idle_state)

);



DECLARE_EVENT_CLASS(sched_task_util,



	TP_PROTO(struct task_struct *p, int task_cpu, unsigned long task_util, int nominated_cpu, int target_cpu, int ediff),



	TP_ARGS(p, task_cpu, task_util, nominated_cpu, target_cpu, ediff),



	TP_STRUCT__entry(

		__array(char, comm, TASK_COMM_LEN	)

		__field(int, pid			)

		__field(int, task_cpu			)

		__field(unsigned long, task_util	)

		__field(unsigned long, cpu_util_freq	)

		__field(int, nominated_cpu		)

		__field(int, target_cpu			)

		__field(int, ediff			)

	),



	TP_fast_assign(

		memcpy(__entry->comm, p->comm, TASK_COMM_LEN);

		__entry->pid			= p->pid;

		__entry->task_cpu		= task_cpu;

		__entry->task_util		= task_util;

		__entry->cpu_util_freq		= cpu_util_freq(target_cpu, NULL);

		__entry->nominated_cpu		= nominated_cpu;

		__entry->target_cpu		= target_cpu;

		__entry->ediff		= ediff;

	),



	TP_printk("comm=%s pid=%d task_cpu=%d task_util=%lu nominated_cpu=%d target_cpu=%d energy_diff=%d",

		__entry->comm, __entry->pid, __entry->task_cpu, __entry->task_util, __entry->nominated_cpu, __entry->target_cpu, __entry->ediff)

);



DEFINE_EVENT(sched_task_util, sched_task_util_overutilzed,

	TP_PROTO(struct task_struct *p, int task_cpu, unsigned long task_util, int nominated_cpu, int target_cpu, int ediff),

	TP_ARGS(p, task_cpu, task_util, nominated_cpu, task_cpu, ediff)

);



DEFINE_EVENT(sched_task_util, sched_task_util_energy_diff,

	TP_PROTO(struct task_struct *p, int task_cpu, unsigned long task_util, int nominated_cpu, int target_cpu, int ediff),

	TP_ARGS(p, task_cpu, task_util, nominated_cpu, task_cpu, ediff)

);



DEFINE_EVENT(sched_task_util, sched_task_util_energy_aware,

	TP_PROTO(struct task_struct *p, int task_cpu, unsigned long task_util, int nominated_cpu, int target_cpu, int ediff),

	TP_ARGS(p, task_cpu, task_util, nominated_cpu, task_cpu, ediff)

);

#endif



/*

 * Tracepoint for waking up a task:

 */

kernel/sched/fair.c

+18 −3
Original line number Diff line number Diff line
@@ -6575,8 +6575,10 @@ static int energy_aware_wake_cpu(struct task_struct *p, int target, int sync) 
	struct sched_group *sg, *sg_target;

	int target_max_cap = INT_MAX;

	int target_cpu = task_cpu(p);

	unsigned long task_util_boosted, new_util, curr_util = 0;

	unsigned long task_util_boosted, curr_util = 0;

	long new_util;

	int i;

	int ediff;

	int cpu = smp_processor_id();



	sd = rcu_dereference(per_cpu(sd_ea, task_cpu(p)));
@@ -6633,6 +6635,8 @@ static int energy_aware_wake_cpu(struct task_struct *p, int target, int sync) 
				new_util -= curr_util;

			cap_idx = __find_new_capacity(new_util, sg_target->sge);



			trace_sched_cpu_util(p, i, new_util, 0, sync);



			/*

			 * Ensure minimum capacity to grant the required boost.

			 * The target CPU can be already at a capacity level higher
@@ -6695,13 +6699,24 @@ static int energy_aware_wake_cpu(struct task_struct *p, int target, int sync) 
		task_util_boosted = 0;

#endif

		/* Not enough spare capacity on previous cpu */

		if (__cpu_overutilized(task_cpu(p), task_util_boosted))

		if (__cpu_overutilized(task_cpu(p), task_util_boosted)) {

			trace_sched_task_util_overutilzed(p, task_cpu(p),

						task_util(p), target_cpu,

						task_cpu(p), 0);

			return target_cpu;

		}



		if (energy_diff(&eenv) >= 0)

		ediff = energy_diff(&eenv);

		if (ediff >= 0) {

			trace_sched_task_util_energy_diff(p, task_cpu(p),

						task_util(p), target_cpu,

						task_cpu(p), ediff);

			return task_cpu(p);

		}

	}



	trace_sched_task_util_energy_aware(p, task_cpu(p), task_util(p),

					   target_cpu, target_cpu, 0);

	return target_cpu;

}