Merge branch 'tip/perf/core' of... (ac2ba2b3) · Commits · e / devices / android_kernel_fairphone_FP5

kernel/trace/trace.c

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -328,7 +328,7 @@ static DECLARE_WAIT_QUEUE_HEAD(trace_wait);
	unsigned long trace_flags = TRACE_ITER_PRINT_PARENT \| TRACE_ITER_PRINTK \|		unsigned long trace_flags = TRACE_ITER_PRINT_PARENT \| TRACE_ITER_PRINTK \|
	TRACE_ITER_ANNOTATE \| TRACE_ITER_CONTEXT_INFO \| TRACE_ITER_SLEEP_TIME \|		TRACE_ITER_ANNOTATE \| TRACE_ITER_CONTEXT_INFO \| TRACE_ITER_SLEEP_TIME \|
	TRACE_ITER_GRAPH_TIME \| TRACE_ITER_RECORD_CMD \| TRACE_ITER_OVERWRITE \|		TRACE_ITER_GRAPH_TIME \| TRACE_ITER_RECORD_CMD \| TRACE_ITER_OVERWRITE \|
	TRACE_ITER_IRQ_INFO;		TRACE_ITER_IRQ_INFO \| TRACE_ITER_MARKERS;

	static int trace_stop_count;		static int trace_stop_count;
	static DEFINE_RAW_SPINLOCK(tracing_start_lock);		static DEFINE_RAW_SPINLOCK(tracing_start_lock);
	@@ -470,6 +470,7 @@ static const char *trace_options[] = {
	"overwrite",		"overwrite",
	"disable_on_free",		"disable_on_free",
	"irq-info",		"irq-info",
			"markers",
	NULL		NULL
	};		};

	@@ -3886,6 +3887,9 @@ tracing_mark_write(struct file filp, const char __user ubuf,
	if (tracing_disabled)		if (tracing_disabled)
	return -EINVAL;		return -EINVAL;

			if (!(trace_flags & TRACE_ITER_MARKERS))
			return -EINVAL;

	if (cnt > TRACE_BUF_SIZE)		if (cnt > TRACE_BUF_SIZE)
	cnt = TRACE_BUF_SIZE;		cnt = TRACE_BUF_SIZE;

kernel/trace/trace.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -680,6 +680,7 @@ enum trace_iterator_flags {
	TRACE_ITER_OVERWRITE = 0x200000,		TRACE_ITER_OVERWRITE = 0x200000,
	TRACE_ITER_STOP_ON_FREE = 0x400000,		TRACE_ITER_STOP_ON_FREE = 0x400000,
	TRACE_ITER_IRQ_INFO = 0x800000,		TRACE_ITER_IRQ_INFO = 0x800000,
			TRACE_ITER_MARKERS = 0x1000000,
	};		};

	/*		/*

kernel/trace/trace_events.c

+72 −36

Original line number	Original line	Diff line number	Diff line
	@@ -1199,6 +1199,31 @@ event_create_dir(struct ftrace_event_call call, struct dentry d_events,
	return 0;		return 0;
	}		}

			static void event_remove(struct ftrace_event_call *call)
			{
			ftrace_event_enable_disable(call, 0);
			if (call->event.funcs)
			__unregister_ftrace_event(&call->event);
			list_del(&call->list);
			}

			static int event_init(struct ftrace_event_call *call)
			{
			int ret = 0;

			if (WARN_ON(!call->name))
			return -EINVAL;

			if (call->class->raw_init) {
			ret = call->class->raw_init(call);
			if (ret < 0 && ret != -ENOSYS)
			pr_warn("Could not initialize trace events/%s\n",
			call->name);
			}

			return ret;
			}

	static int		static int
	__trace_add_event_call(struct ftrace_event_call call, struct module mod,		__trace_add_event_call(struct ftrace_event_call call, struct module mod,
	const struct file_operations *id,		const struct file_operations *id,
	@@ -1209,19 +1234,9 @@ __trace_add_event_call(struct ftrace_event_call call, struct module mod,
	struct dentry *d_events;		struct dentry *d_events;
	int ret;		int ret;

	/* The linker may leave blanks */		ret = event_init(call);
	if (!call->name)		if (ret < 0)
	return -EINVAL;

	if (call->class->raw_init) {
	ret = call->class->raw_init(call);
	if (ret < 0) {
	if (ret != -ENOSYS)
	pr_warning("Could not initialize trace events/%s\n",
	call->name);
	return ret;		return ret;
	}
	}

	d_events = event_trace_events_dir();		d_events = event_trace_events_dir();
	if (!d_events)		if (!d_events)
	@@ -1272,13 +1287,10 @@ static void remove_subsystem_dir(const char *name)
	*/		*/
	static void __trace_remove_event_call(struct ftrace_event_call *call)		static void __trace_remove_event_call(struct ftrace_event_call *call)
	{		{
	ftrace_event_enable_disable(call, 0);		event_remove(call);
	if (call->event.funcs)
	__unregister_ftrace_event(&call->event);
	debugfs_remove_recursive(call->dir);
	list_del(&call->list);
	trace_destroy_fields(call);		trace_destroy_fields(call);
	destroy_preds(call);		destroy_preds(call);
			debugfs_remove_recursive(call->dir);
	remove_subsystem_dir(call->class->system);		remove_subsystem_dir(call->class->system);
	}		}

	@@ -1450,15 +1462,43 @@ static __init int setup_trace_event(char *str)
	}		}
	__setup("trace_event=", setup_trace_event);		__setup("trace_event=", setup_trace_event);

			static __init int event_trace_enable(void)
			{
			struct ftrace_event_call *iter, call;
			char *buf = bootup_event_buf;
			char *token;
			int ret;

			for_each_event(iter, __start_ftrace_events, __stop_ftrace_events) {

			call = *iter;
			ret = event_init(call);
			if (!ret)
			list_add(&call->list, &ftrace_events);
			}

			while (true) {
			token = strsep(&buf, ",");

			if (!token)
			break;
			if (!*token)
			continue;

			ret = ftrace_set_clr_event(token, 1);
			if (ret)
			pr_warn("Failed to enable trace event: %s\n", token);
			}
			return 0;
			}

	static __init int event_trace_init(void)		static __init int event_trace_init(void)
	{		{
	struct ftrace_event_call **call;		struct ftrace_event_call *call;
	struct dentry *d_tracer;		struct dentry *d_tracer;
	struct dentry *entry;		struct dentry *entry;
	struct dentry *d_events;		struct dentry *d_events;
	int ret;		int ret;
	char *buf = bootup_event_buf;
	char *token;

	d_tracer = tracing_init_dentry();		d_tracer = tracing_init_dentry();
	if (!d_tracer)		if (!d_tracer)
	@@ -1497,24 +1537,19 @@ static __init int event_trace_init(void)
	if (trace_define_common_fields())		if (trace_define_common_fields())
	pr_warning("tracing: Failed to allocate common fields");		pr_warning("tracing: Failed to allocate common fields");

	for_each_event(call, __start_ftrace_events, __stop_ftrace_events) {		/*
	__trace_add_event_call(*call, NULL, &ftrace_event_id_fops,		* Early initialization already enabled ftrace event.
			* Now it's only necessary to create the event directory.
			*/
			list_for_each_entry(call, &ftrace_events, list) {

			ret = event_create_dir(call, d_events,
			&ftrace_event_id_fops,
	&ftrace_enable_fops,		&ftrace_enable_fops,
	&ftrace_event_filter_fops,		&ftrace_event_filter_fops,
	&ftrace_event_format_fops);		&ftrace_event_format_fops);
	}		if (ret < 0)
			event_remove(call);
	while (true) {
	token = strsep(&buf, ",");

	if (!token)
	break;
	if (!*token)
	continue;

	ret = ftrace_set_clr_event(token, 1);
	if (ret)
	pr_warning("Failed to enable trace event: %s\n", token);
	}		}

	ret = register_module_notifier(&trace_module_nb);		ret = register_module_notifier(&trace_module_nb);
	@@ -1523,6 +1558,7 @@ static __init int event_trace_init(void)

	return 0;		return 0;
	}		}
			core_initcall(event_trace_enable);
	fs_initcall(event_trace_init);		fs_initcall(event_trace_init);

	#ifdef CONFIG_FTRACE_STARTUP_TEST		#ifdef CONFIG_FTRACE_STARTUP_TEST

kernel/trace/trace_syscalls.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -487,7 +487,7 @@ int __init init_ftrace_syscalls(void)

	return 0;		return 0;
	}		}
	core_initcall(init_ftrace_syscalls);		early_initcall(init_ftrace_syscalls);

	#ifdef CONFIG_PERF_EVENTS		#ifdef CONFIG_PERF_EVENTS