Commit 2a09b5de authored by Yafang Shao's avatar Yafang Shao Committed by Steven Rostedt (VMware)
Browse files

sched/fair: do not expose some tracepoints to user if CONFIG_SCHEDSTATS is not set 

The tracepoints trace_sched_stat_{iowait, blocked, wait, sleep} should
be not exposed to user if CONFIG_SCHEDSTATS is not set.

Link: http://lkml.kernel.org/r/1553602391-11926-3-git-send-email-laoar.shao@gmail.com



Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarYafang Shao <laoar.shao@gmail.com>
Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
parent 16336345

include/trace/events/sched.h

+14 −7
Original line number Diff line number Diff line
@@ -242,7 +242,6 @@ DEFINE_EVENT(sched_process_template, sched_process_free, 
	     TP_PROTO(struct task_struct *p),

	     TP_ARGS(p));





/*

 * Tracepoint for a task exiting:

 */
@@ -336,11 +335,20 @@ TRACE_EVENT(sched_process_exec, 
		  __entry->pid, __entry->old_pid)

);





#ifdef CONFIG_SCHEDSTATS

#define DEFINE_EVENT_SCHEDSTAT DEFINE_EVENT

#define DECLARE_EVENT_CLASS_SCHEDSTAT DECLARE_EVENT_CLASS

#else

#define DEFINE_EVENT_SCHEDSTAT DEFINE_EVENT_NOP

#define DECLARE_EVENT_CLASS_SCHEDSTAT DECLARE_EVENT_CLASS_NOP

#endif



/*

 * XXX the below sched_stat tracepoints only apply to SCHED_OTHER/BATCH/IDLE

 *     adding sched_stat support to SCHED_FIFO/RR would be welcome.

 */

DECLARE_EVENT_CLASS(sched_stat_template,

DECLARE_EVENT_CLASS_SCHEDSTAT(sched_stat_template,



	TP_PROTO(struct task_struct *tsk, u64 delay),
@@ -363,12 +371,11 @@ DECLARE_EVENT_CLASS(sched_stat_template, 
			(unsigned long long)__entry->delay)

);





/*

 * Tracepoint for accounting wait time (time the task is runnable

 * but not actually running due to scheduler contention).

 */

DEFINE_EVENT(sched_stat_template, sched_stat_wait,

DEFINE_EVENT_SCHEDSTAT(sched_stat_template, sched_stat_wait,

	     TP_PROTO(struct task_struct *tsk, u64 delay),

	     TP_ARGS(tsk, delay));
@@ -376,7 +383,7 @@ DEFINE_EVENT(sched_stat_template, sched_stat_wait, 
 * Tracepoint for accounting sleep time (time the task is not runnable,

 * including iowait, see below).

 */

DEFINE_EVENT(sched_stat_template, sched_stat_sleep,

DEFINE_EVENT_SCHEDSTAT(sched_stat_template, sched_stat_sleep,

	     TP_PROTO(struct task_struct *tsk, u64 delay),

	     TP_ARGS(tsk, delay));
@@ -384,14 +391,14 @@ DEFINE_EVENT(sched_stat_template, sched_stat_sleep, 
 * Tracepoint for accounting iowait time (time the task is not runnable

 * due to waiting on IO to complete).

 */

DEFINE_EVENT(sched_stat_template, sched_stat_iowait,

DEFINE_EVENT_SCHEDSTAT(sched_stat_template, sched_stat_iowait,

	     TP_PROTO(struct task_struct *tsk, u64 delay),

	     TP_ARGS(tsk, delay));



/*

 * Tracepoint for accounting blocked time (time the task is in uninterruptible).

 */

DEFINE_EVENT(sched_stat_template, sched_stat_blocked,

DEFINE_EVENT_SCHEDSTAT(sched_stat_template, sched_stat_blocked,

	     TP_PROTO(struct task_struct *tsk, u64 delay),

	     TP_ARGS(tsk, delay));

CRA Git | Maintained and supported by SUSTech CRA and CCSE