sched: Remove rq argument to the tracepoints (27a9da65) · Commits · e / devices / android_kernel_teracube_2e

include/trace/events/sched.h

+10 −22

Original line number	Original line	Diff line number	Diff line
	@@ -51,15 +51,12 @@ TRACE_EVENT(sched_kthread_stop_ret,

	/*		/*
	* Tracepoint for waiting on task to unschedule:		* Tracepoint for waiting on task to unschedule:
	*
	* (NOTE: the 'rq' argument is not used by generic trace events,
	* but used by the latency tracer plugin. )
	*/		*/
	TRACE_EVENT(sched_wait_task,		TRACE_EVENT(sched_wait_task,

	TP_PROTO(struct rq rq, struct task_struct p),		TP_PROTO(struct task_struct *p),

	TP_ARGS(rq, p),		TP_ARGS(p),

	TP_STRUCT__entry(		TP_STRUCT__entry(
	__array( char, comm, TASK_COMM_LEN )		__array( char, comm, TASK_COMM_LEN )
	@@ -79,15 +76,12 @@ TRACE_EVENT(sched_wait_task,

	/*		/*
	* Tracepoint for waking up a task:		* Tracepoint for waking up a task:
	*
	* (NOTE: the 'rq' argument is not used by generic trace events,
	* but used by the latency tracer plugin. )
	*/		*/
	DECLARE_EVENT_CLASS(sched_wakeup_template,		DECLARE_EVENT_CLASS(sched_wakeup_template,

	TP_PROTO(struct rq rq, struct task_struct p, int success),		TP_PROTO(struct task_struct *p, int success),

	TP_ARGS(rq, p, success),		TP_ARGS(p, success),

	TP_STRUCT__entry(		TP_STRUCT__entry(
	__array( char, comm, TASK_COMM_LEN )		__array( char, comm, TASK_COMM_LEN )
	@@ -111,31 +105,25 @@ DECLARE_EVENT_CLASS(sched_wakeup_template,
	);		);

	DEFINE_EVENT(sched_wakeup_template, sched_wakeup,		DEFINE_EVENT(sched_wakeup_template, sched_wakeup,
	TP_PROTO(struct rq rq, struct task_struct p, int success),		TP_PROTO(struct task_struct *p, int success),
	TP_ARGS(rq, p, success));		TP_ARGS(p, success));

	/*		/*
	* Tracepoint for waking up a new task:		* Tracepoint for waking up a new task:
	*
	* (NOTE: the 'rq' argument is not used by generic trace events,
	* but used by the latency tracer plugin. )
	*/		*/
	DEFINE_EVENT(sched_wakeup_template, sched_wakeup_new,		DEFINE_EVENT(sched_wakeup_template, sched_wakeup_new,
	TP_PROTO(struct rq rq, struct task_struct p, int success),		TP_PROTO(struct task_struct *p, int success),
	TP_ARGS(rq, p, success));		TP_ARGS(p, success));

	/*		/*
	* Tracepoint for task switches, performed by the scheduler:		* Tracepoint for task switches, performed by the scheduler:
	*
	* (NOTE: the 'rq' argument is not used by generic trace events,
	* but used by the latency tracer plugin. )
	*/		*/
	TRACE_EVENT(sched_switch,		TRACE_EVENT(sched_switch,

	TP_PROTO(struct rq rq, struct task_struct prev,		TP_PROTO(struct task_struct *prev,
	struct task_struct *next),		struct task_struct *next),

	TP_ARGS(rq, prev, next),		TP_ARGS(prev, next),

	TP_STRUCT__entry(		TP_STRUCT__entry(
	__array( char, prev_comm, TASK_COMM_LEN )		__array( char, prev_comm, TASK_COMM_LEN )

kernel/sched.c

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -2168,7 +2168,7 @@ unsigned long wait_task_inactive(struct task_struct *p, long match_state)
	* just go back and repeat.		* just go back and repeat.
	*/		*/
	rq = task_rq_lock(p, &flags);		rq = task_rq_lock(p, &flags);
	trace_sched_wait_task(rq, p);		trace_sched_wait_task(p);
	running = task_running(rq, p);		running = task_running(rq, p);
	on_rq = p->se.on_rq;		on_rq = p->se.on_rq;
	ncsw = 0;		ncsw = 0;
	@@ -2439,7 +2439,7 @@ static int try_to_wake_up(struct task_struct *p, unsigned int state,
	success = 1;		success = 1;

	out_running:		out_running:
	trace_sched_wakeup(rq, p, success);		trace_sched_wakeup(p, success);
	check_preempt_curr(rq, p, wake_flags);		check_preempt_curr(rq, p, wake_flags);

	p->state = TASK_RUNNING;		p->state = TASK_RUNNING;
	@@ -2613,7 +2613,7 @@ void wake_up_new_task(struct task_struct *p, unsigned long clone_flags)

	rq = task_rq_lock(p, &flags);		rq = task_rq_lock(p, &flags);
	activate_task(rq, p, 0);		activate_task(rq, p, 0);
	trace_sched_wakeup_new(rq, p, 1);		trace_sched_wakeup_new(p, 1);
	check_preempt_curr(rq, p, WF_FORK);		check_preempt_curr(rq, p, WF_FORK);
	#ifdef CONFIG_SMP		#ifdef CONFIG_SMP
	if (p->sched_class->task_woken)		if (p->sched_class->task_woken)
	@@ -2833,7 +2833,7 @@ context_switch(struct rq rq, struct task_struct prev,
	struct mm_struct mm, oldmm;		struct mm_struct mm, oldmm;

	prepare_task_switch(rq, prev, next);		prepare_task_switch(rq, prev, next);
	trace_sched_switch(rq, prev, next);		trace_sched_switch(prev, next);
	mm = next->mm;		mm = next->mm;
	oldmm = prev->active_mm;		oldmm = prev->active_mm;
	/*		/*

kernel/trace/ftrace.c

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -3212,8 +3212,7 @@ static int alloc_retstack_tasklist(struct ftrace_ret_stack **ret_stack_list)
	}		}

	static void		static void
	ftrace_graph_probe_sched_switch(struct rq __rq, struct task_struct prev,		ftrace_graph_probe_sched_switch(struct task_struct prev, struct task_struct next)
	struct task_struct *next)
	{		{
	unsigned long long timestamp;		unsigned long long timestamp;
	int index;		int index;

kernel/trace/trace_sched_switch.c

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -50,8 +50,7 @@ tracing_sched_switch_trace(struct trace_array *tr,
	}		}

	static void		static void
	probe_sched_switch(struct rq __rq, struct task_struct prev,		probe_sched_switch(struct task_struct prev, struct task_struct next)
	struct task_struct *next)
	{		{
	struct trace_array_cpu *data;		struct trace_array_cpu *data;
	unsigned long flags;		unsigned long flags;
	@@ -109,7 +108,7 @@ tracing_sched_wakeup_trace(struct trace_array *tr,
	}		}

	static void		static void
	probe_sched_wakeup(struct rq __rq, struct task_struct wakee, int success)		probe_sched_wakeup(struct task_struct *wakee, int success)
	{		{
	struct trace_array_cpu *data;		struct trace_array_cpu *data;
	unsigned long flags;		unsigned long flags;

kernel/trace/trace_sched_wakeup.c

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -107,8 +107,7 @@ static void probe_wakeup_migrate_task(struct task_struct *task, int cpu)
	}		}

	static void notrace		static void notrace
	probe_wakeup_sched_switch(struct rq rq, struct task_struct prev,		probe_wakeup_sched_switch(struct task_struct prev, struct task_struct next)
	struct task_struct *next)
	{		{
	struct trace_array_cpu *data;		struct trace_array_cpu *data;
	cycle_t T0, T1, delta;		cycle_t T0, T1, delta;
	@@ -200,7 +199,7 @@ static void wakeup_reset(struct trace_array *tr)
	}		}

	static void		static void
	probe_wakeup(struct rq rq, struct task_struct p, int success)		probe_wakeup(struct task_struct *p, int success)
	{		{
	struct trace_array_cpu *data;		struct trace_array_cpu *data;
	int cpu = smp_processor_id();		int cpu = smp_processor_id();