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

Commit eb7beb5c authored by Frederic Weisbecker's avatar Frederic Weisbecker
Browse files

tracing: Remove special traces 



Special traces type was only used by sysprof. Lets remove it now
that sysprof ftrace plugin has been dropped.

Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Acked-by: default avatarSoeren Sandmann <sandmann@daimi.au.dk>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Li Zefan <lizf@cn.fujitsu.com>
parent f376bf5f

include/linux/kernel.h

+0 −5
Original line number Diff line number Diff line
@@ -508,9 +508,6 @@ extern void tracing_start(void); 
extern void tracing_stop(void);

extern void ftrace_off_permanent(void);



extern void

ftrace_special(unsigned long arg1, unsigned long arg2, unsigned long arg3);



static inline void __attribute__ ((format (printf, 1, 2)))

____trace_printk_check_format(const char *fmt, ...)

{
@@ -586,8 +583,6 @@ __ftrace_vprintk(unsigned long ip, const char *fmt, va_list ap); 


extern void ftrace_dump(enum ftrace_dump_mode oops_dump_mode);

#else

static inline void

ftrace_special(unsigned long arg1, unsigned long arg2, unsigned long arg3) { }

static inline int

trace_printk(const char *fmt, ...) __attribute__ ((format (printf, 1, 2)));

include/linux/sched.h

+0 −12
Original line number Diff line number Diff line
@@ -2434,18 +2434,6 @@ static inline void set_task_cpu(struct task_struct *p, unsigned int cpu) 


#endif /* CONFIG_SMP */



#ifdef CONFIG_TRACING

extern void

__trace_special(void *__tr, void *__data,

		unsigned long arg1, unsigned long arg2, unsigned long arg3);

#else

static inline void

__trace_special(void *__tr, void *__data,

		unsigned long arg1, unsigned long arg2, unsigned long arg3)

{

}

#endif



extern long sched_setaffinity(pid_t pid, const struct cpumask *new_mask);

extern long sched_getaffinity(pid_t pid, struct cpumask *mask);

kernel/trace/trace.c

+0 −55
Original line number Diff line number Diff line
@@ -1331,61 +1331,6 @@ static void __trace_userstack(struct trace_array *tr, unsigned long flags) 


#endif /* CONFIG_STACKTRACE */



static void

ftrace_trace_special(void *__tr,

		     unsigned long arg1, unsigned long arg2, unsigned long arg3,

		     int pc)

{

	struct ftrace_event_call *call = &event_special;

	struct ring_buffer_event *event;

	struct trace_array *tr = __tr;

	struct ring_buffer *buffer = tr->buffer;

	struct special_entry *entry;



	event = trace_buffer_lock_reserve(buffer, TRACE_SPECIAL,

					  sizeof(*entry), 0, pc);

	if (!event)

		return;

	entry	= ring_buffer_event_data(event);

	entry->arg1			= arg1;

	entry->arg2			= arg2;

	entry->arg3			= arg3;



	if (!filter_check_discard(call, entry, buffer, event))

		trace_buffer_unlock_commit(buffer, event, 0, pc);

}



void

__trace_special(void *__tr, void *__data,

		unsigned long arg1, unsigned long arg2, unsigned long arg3)

{

	ftrace_trace_special(__tr, arg1, arg2, arg3, preempt_count());

}



void

ftrace_special(unsigned long arg1, unsigned long arg2, unsigned long arg3)

{

	struct trace_array *tr = &global_trace;

	struct trace_array_cpu *data;

	unsigned long flags;

	int cpu;

	int pc;



	if (tracing_disabled)

		return;



	pc = preempt_count();

	local_irq_save(flags);

	cpu = raw_smp_processor_id();

	data = tr->data[cpu];



	if (likely(atomic_inc_return(&data->disabled) == 1))

		ftrace_trace_special(tr, arg1, arg2, arg3, pc);



	atomic_dec(&data->disabled);

	local_irq_restore(flags);

}



/**

 * trace_vbprintk - write binary msg to tracing buffer

 *

kernel/trace/trace.h

+0 −7
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ enum trace_type { 
	TRACE_STACK,

	TRACE_PRINT,

	TRACE_BPRINT,

	TRACE_SPECIAL,

	TRACE_MMIO_RW,

	TRACE_MMIO_MAP,

	TRACE_BRANCH,
@@ -189,7 +188,6 @@ extern void __ftrace_bad_type(void); 
		IF_ASSIGN(var, ent, struct userstack_entry, TRACE_USER_STACK);\

		IF_ASSIGN(var, ent, struct print_entry, TRACE_PRINT);	\

		IF_ASSIGN(var, ent, struct bprint_entry, TRACE_BPRINT);	\

		IF_ASSIGN(var, ent, struct special_entry, 0);		\

		IF_ASSIGN(var, ent, struct trace_mmiotrace_rw,		\

			  TRACE_MMIO_RW);				\

		IF_ASSIGN(var, ent, struct trace_mmiotrace_map,		\
@@ -332,11 +330,6 @@ void tracing_sched_wakeup_trace(struct trace_array *tr, 
				struct task_struct *wakee,

				struct task_struct *cur,

				unsigned long flags, int pc);

void trace_special(struct trace_array *tr,

		   struct trace_array_cpu *data,

		   unsigned long arg1,

		   unsigned long arg2,

		   unsigned long arg3, int pc);

void trace_function(struct trace_array *tr,

		    unsigned long ip,

		    unsigned long parent_ip,

kernel/trace/trace_entries.h

+0 −17
Original line number Diff line number Diff line
@@ -150,23 +150,6 @@ FTRACE_ENTRY_DUP(wakeup, ctx_switch_entry, 
		)

);



/*

 * Special (free-form) trace entry:

 */

FTRACE_ENTRY(special, special_entry,



	TRACE_SPECIAL,



	F_STRUCT(

		__field(	unsigned long,	arg1	)

		__field(	unsigned long,	arg2	)

		__field(	unsigned long,	arg3	)

	),



	F_printk("(%08lx) (%08lx) (%08lx)",

		 __entry->arg1, __entry->arg2, __entry->arg3)

);



/*

 * Stack-trace entry:

 */