Merge branch 'perf/core' of... (23c28757) · Commits · jan.koester / Linux

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/Kconfig

+0 −9

Original line number	Diff line number	Diff line
		@@ -194,15 +194,6 @@ config PREEMPT_TRACER
		enabled. This option and the irqs-off timing option can be
		used together or separately.)

		config SYSPROF_TRACER
		bool "Sysprof Tracer"
		depends on X86
		select GENERIC_TRACER
		select CONTEXT_SWITCH_TRACER
		help
		This tracer provides the trace needed by the 'Sysprof' userspace
		tool.

		config SCHED_TRACER
		bool "Scheduling Latency Tracer"
		select GENERIC_TRACER

kernel/trace/Makefile

+0 −1

Original line number	Diff line number	Diff line
		@@ -30,7 +30,6 @@ obj-$(CONFIG_TRACING) += trace_output.o
		obj-$(CONFIG_TRACING) += trace_stat.o
		obj-$(CONFIG_TRACING) += trace_printk.o
		obj-$(CONFIG_CONTEXT_SWITCH_TRACER) += trace_sched_switch.o
		obj-$(CONFIG_SYSPROF_TRACER) += trace_sysprof.o
		obj-$(CONFIG_FUNCTION_TRACER) += trace_functions.o
		obj-$(CONFIG_IRQSOFF_TRACER) += trace_irqsoff.o
		obj-$(CONFIG_PREEMPT_TRACER) += trace_irqsoff.o

kernel/trace/trace.c

+15 −58

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
		*
		@@ -2393,6 +2338,7 @@ static const struct file_operations show_traces_fops = {
		.open = show_traces_open,
		.read = seq_read,
		.release = seq_release,
		.llseek = seq_lseek,
		};

		/*
		@@ -2486,6 +2432,7 @@ static const struct file_operations tracing_cpumask_fops = {
		.open = tracing_open_generic,
		.read = tracing_cpumask_read,
		.write = tracing_cpumask_write,
		.llseek = generic_file_llseek,
		};

		static int tracing_trace_options_show(struct seq_file m, void v)
		@@ -2652,6 +2599,7 @@ tracing_readme_read(struct file filp, char __user ubuf,
		static const struct file_operations tracing_readme_fops = {
		.open = tracing_open_generic,
		.read = tracing_readme_read,
		.llseek = generic_file_llseek,
		};

		static ssize_t
		@@ -2702,6 +2650,7 @@ tracing_saved_cmdlines_read(struct file file, char __user ubuf,
		static const struct file_operations tracing_saved_cmdlines_fops = {
		.open = tracing_open_generic,
		.read = tracing_saved_cmdlines_read,
		.llseek = generic_file_llseek,
		};

		static ssize_t
		@@ -3031,6 +2980,7 @@ static int tracing_open_pipe(struct inode inode, struct file filp)
		if (iter->trace->pipe_open)
		iter->trace->pipe_open(iter);

		nonseekable_open(inode, filp);
		out:
		mutex_unlock(&trace_types_lock);
		return ret;
		@@ -3589,18 +3539,21 @@ static const struct file_operations tracing_max_lat_fops = {
		.open = tracing_open_generic,
		.read = tracing_max_lat_read,
		.write = tracing_max_lat_write,
		.llseek = generic_file_llseek,
		};

		static const struct file_operations tracing_ctrl_fops = {
		.open = tracing_open_generic,
		.read = tracing_ctrl_read,
		.write = tracing_ctrl_write,
		.llseek = generic_file_llseek,
		};

		static const struct file_operations set_tracer_fops = {
		.open = tracing_open_generic,
		.read = tracing_set_trace_read,
		.write = tracing_set_trace_write,
		.llseek = generic_file_llseek,
		};

		static const struct file_operations tracing_pipe_fops = {
		@@ -3609,17 +3562,20 @@ static const struct file_operations tracing_pipe_fops = {
		.read = tracing_read_pipe,
		.splice_read = tracing_splice_read_pipe,
		.release = tracing_release_pipe,
		.llseek = no_llseek,
		};

		static const struct file_operations tracing_entries_fops = {
		.open = tracing_open_generic,
		.read = tracing_entries_read,
		.write = tracing_entries_write,
		.llseek = generic_file_llseek,
		};

		static const struct file_operations tracing_mark_fops = {
		.open = tracing_open_generic,
		.write = tracing_mark_write,
		.llseek = generic_file_llseek,
		};

		static const struct file_operations trace_clock_fops = {
		@@ -3925,6 +3881,7 @@ tracing_stats_read(struct file filp, char __user ubuf,
		static const struct file_operations tracing_stats_fops = {
		.open = tracing_open_generic,
		.read = tracing_stats_read,
		.llseek = generic_file_llseek,
		};

		#ifdef CONFIG_DYNAMIC_FTRACE
		@@ -3961,6 +3918,7 @@ tracing_read_dyn_info(struct file filp, char __user ubuf,
		static const struct file_operations tracing_dyn_info_fops = {
		.open = tracing_open_generic,
		.read = tracing_read_dyn_info,
		.llseek = generic_file_llseek,
		};
		#endif

		@@ -4114,6 +4072,7 @@ static const struct file_operations trace_options_fops = {
		.open = tracing_open_generic,
		.read = trace_options_read,
		.write = trace_options_write,
		.llseek = generic_file_llseek,
		};

		static ssize_t
		@@ -4165,6 +4124,7 @@ static const struct file_operations trace_options_core_fops = {
		.open = tracing_open_generic,
		.read = trace_options_core_read,
		.write = trace_options_core_write,
		.llseek = generic_file_llseek,
		};

		struct dentry trace_create_file(const char name,
		@@ -4354,9 +4314,6 @@ static __init int tracer_init_debugfs(void)
		trace_create_file("dyn_ftrace_total_info", 0444, d_tracer,
		&ftrace_update_tot_cnt, &tracing_dyn_info_fops);
		#endif
		#ifdef CONFIG_SYSPROF_TRACER
		init_tracer_sysprof_debugfs(d_tracer);
		#endif

		create_trace_options_dir();