tracing/probe: Split trace_event related data from trace_probe (60d53e2c) · Commits · e / devices / android_kernel_fairphone_FP5

kernel/trace/trace_kprobe.c

+115 −42

Original line number	Original line	Diff line number	Diff line
	@@ -180,20 +180,33 @@ unsigned long trace_kprobe_address(struct trace_kprobe *tk)
	return addr;		return addr;
	}		}

			static nokprobe_inline struct trace_kprobe *
			trace_kprobe_primary_from_call(struct trace_event_call *call)
			{
			struct trace_probe *tp;

			tp = trace_probe_primary_from_call(call);
			if (WARN_ON_ONCE(!tp))
			return NULL;

			return container_of(tp, struct trace_kprobe, tp);
			}

	bool trace_kprobe_on_func_entry(struct trace_event_call *call)		bool trace_kprobe_on_func_entry(struct trace_event_call *call)
	{		{
	struct trace_kprobe tk = (struct trace_kprobe )call->data;		struct trace_kprobe *tk = trace_kprobe_primary_from_call(call);

	return kprobe_on_func_entry(tk->rp.kp.addr,		return tk ? kprobe_on_func_entry(tk->rp.kp.addr,
	tk->rp.kp.addr ? NULL : tk->rp.kp.symbol_name,		tk->rp.kp.addr ? NULL : tk->rp.kp.symbol_name,
	tk->rp.kp.addr ? 0 : tk->rp.kp.offset);		tk->rp.kp.addr ? 0 : tk->rp.kp.offset) : false;
	}		}

	bool trace_kprobe_error_injectable(struct trace_event_call *call)		bool trace_kprobe_error_injectable(struct trace_event_call *call)
	{		{
	struct trace_kprobe tk = (struct trace_kprobe )call->data;		struct trace_kprobe *tk = trace_kprobe_primary_from_call(call);

	return within_error_injection_list(trace_kprobe_address(tk));		return tk ? within_error_injection_list(trace_kprobe_address(tk)) :
			false;
	}		}

	static int register_kprobe_event(struct trace_kprobe *tk);		static int register_kprobe_event(struct trace_kprobe *tk);
	@@ -291,32 +304,75 @@ static inline int __enable_trace_kprobe(struct trace_kprobe *tk)
	return ret;		return ret;
	}		}

			static void __disable_trace_kprobe(struct trace_probe *tp)
			{
			struct trace_probe *pos;
			struct trace_kprobe *tk;

			list_for_each_entry(pos, trace_probe_probe_list(tp), list) {
			tk = container_of(pos, struct trace_kprobe, tp);
			if (!trace_kprobe_is_registered(tk))
			continue;
			if (trace_kprobe_is_return(tk))
			disable_kretprobe(&tk->rp);
			else
			disable_kprobe(&tk->rp.kp);
			}
			}

	/*		/*
	* Enable trace_probe		* Enable trace_probe
	* if the file is NULL, enable "perf" handler, or enable "trace" handler.		* if the file is NULL, enable "perf" handler, or enable "trace" handler.
	*/		*/
	static int		static int enable_trace_kprobe(struct trace_event_call *call,
	enable_trace_kprobe(struct trace_kprobe tk, struct trace_event_file file)		struct trace_event_file *file)
	{		{
	bool enabled = trace_probe_is_enabled(&tk->tp);		struct trace_probe pos, tp;
			struct trace_kprobe *tk;
			bool enabled;
	int ret = 0;		int ret = 0;

			tp = trace_probe_primary_from_call(call);
			if (WARN_ON_ONCE(!tp))
			return -ENODEV;
			enabled = trace_probe_is_enabled(tp);

			/* This also changes "enabled" state */
	if (file) {		if (file) {
	ret = trace_probe_add_file(&tk->tp, file);		ret = trace_probe_add_file(tp, file);
	if (ret)		if (ret)
	return ret;		return ret;
	} else		} else
	trace_probe_set_flag(&tk->tp, TP_FLAG_PROFILE);		trace_probe_set_flag(tp, TP_FLAG_PROFILE);

	if (enabled)		if (enabled)
	return 0;		return 0;

			enabled = false;
			list_for_each_entry(pos, trace_probe_probe_list(tp), list) {
			tk = container_of(pos, struct trace_kprobe, tp);
			if (trace_kprobe_has_gone(tk))
			continue;
	ret = __enable_trace_kprobe(tk);		ret = __enable_trace_kprobe(tk);
	if (ret) {		if (ret) {
			if (enabled) {
			__disable_trace_kprobe(tp);
			enabled = false;
			}
			break;
			}
			enabled = true;
			}

			if (!enabled) {
			/* No probe is enabled. Roll back */
	if (file)		if (file)
	trace_probe_remove_file(&tk->tp, file);		trace_probe_remove_file(tp, file);
	else		else
	trace_probe_clear_flag(&tk->tp, TP_FLAG_PROFILE);		trace_probe_clear_flag(tp, TP_FLAG_PROFILE);
			if (!ret)
			/* Since all probes are gone, this is not available */
			ret = -EADDRNOTAVAIL;
	}		}

	return ret;		return ret;
	@@ -326,11 +382,14 @@ enable_trace_kprobe(struct trace_kprobe tk, struct trace_event_file file)
	* Disable trace_probe		* Disable trace_probe
	* if the file is NULL, disable "perf" handler, or disable "trace" handler.		* if the file is NULL, disable "perf" handler, or disable "trace" handler.
	*/		*/
	static int		static int disable_trace_kprobe(struct trace_event_call *call,
	disable_trace_kprobe(struct trace_kprobe tk, struct trace_event_file file)		struct trace_event_file *file)
	{		{
	struct trace_probe *tp = &tk->tp;		struct trace_probe *tp;
	int ret = 0;
			tp = trace_probe_primary_from_call(call);
			if (WARN_ON_ONCE(!tp))
			return -ENODEV;

	if (file) {		if (file) {
	if (!trace_probe_get_file_link(tp, file))		if (!trace_probe_get_file_link(tp, file))
	@@ -341,12 +400,8 @@ disable_trace_kprobe(struct trace_kprobe tk, struct trace_event_file file)
	} else		} else
	trace_probe_clear_flag(tp, TP_FLAG_PROFILE);		trace_probe_clear_flag(tp, TP_FLAG_PROFILE);

	if (!trace_probe_is_enabled(tp) && trace_kprobe_is_registered(tk)) {		if (!trace_probe_is_enabled(tp))
	if (trace_kprobe_is_return(tk))		__disable_trace_kprobe(tp);
	disable_kretprobe(&tk->rp);
	else
	disable_kprobe(&tk->rp.kp);
	}

	out:		out:
	if (file)		if (file)
	@@ -358,7 +413,7 @@ disable_trace_kprobe(struct trace_kprobe tk, struct trace_event_file file)
	*/		*/
	trace_probe_remove_file(tp, file);		trace_probe_remove_file(tp, file);

	return ret;		return 0;
	}		}

	#if defined(CONFIG_KPROBES_ON_FTRACE) && \		#if defined(CONFIG_KPROBES_ON_FTRACE) && \
	@@ -1089,7 +1144,10 @@ print_kprobe_event(struct trace_iterator *iter, int flags,
	struct trace_probe *tp;		struct trace_probe *tp;

	field = (struct kprobe_trace_entry_head *)iter->ent;		field = (struct kprobe_trace_entry_head *)iter->ent;
	tp = container_of(event, struct trace_probe, call.event);		tp = trace_probe_primary_from_call(
			container_of(event, struct trace_event_call, event));
			if (WARN_ON_ONCE(!tp))
			goto out;

	trace_seq_printf(s, "%s: (", trace_probe_name(tp));		trace_seq_printf(s, "%s: (", trace_probe_name(tp));

	@@ -1116,7 +1174,10 @@ print_kretprobe_event(struct trace_iterator *iter, int flags,
	struct trace_probe *tp;		struct trace_probe *tp;

	field = (struct kretprobe_trace_entry_head *)iter->ent;		field = (struct kretprobe_trace_entry_head *)iter->ent;
	tp = container_of(event, struct trace_probe, call.event);		tp = trace_probe_primary_from_call(
			container_of(event, struct trace_event_call, event));
			if (WARN_ON_ONCE(!tp))
			goto out;

	trace_seq_printf(s, "%s: (", trace_probe_name(tp));		trace_seq_printf(s, "%s: (", trace_probe_name(tp));

	@@ -1145,23 +1206,31 @@ static int kprobe_event_define_fields(struct trace_event_call *event_call)
	{		{
	int ret;		int ret;
	struct kprobe_trace_entry_head field;		struct kprobe_trace_entry_head field;
	struct trace_kprobe tk = (struct trace_kprobe )event_call->data;		struct trace_probe *tp;

			tp = trace_probe_primary_from_call(event_call);
			if (WARN_ON_ONCE(!tp))
			return -ENOENT;

	DEFINE_FIELD(unsigned long, ip, FIELD_STRING_IP, 0);		DEFINE_FIELD(unsigned long, ip, FIELD_STRING_IP, 0);

	return traceprobe_define_arg_fields(event_call, sizeof(field), &tk->tp);		return traceprobe_define_arg_fields(event_call, sizeof(field), tp);
	}		}

	static int kretprobe_event_define_fields(struct trace_event_call *event_call)		static int kretprobe_event_define_fields(struct trace_event_call *event_call)
	{		{
	int ret;		int ret;
	struct kretprobe_trace_entry_head field;		struct kretprobe_trace_entry_head field;
	struct trace_kprobe tk = (struct trace_kprobe )event_call->data;		struct trace_probe *tp;

			tp = trace_probe_primary_from_call(event_call);
			if (WARN_ON_ONCE(!tp))
			return -ENOENT;

	DEFINE_FIELD(unsigned long, func, FIELD_STRING_FUNC, 0);		DEFINE_FIELD(unsigned long, func, FIELD_STRING_FUNC, 0);
	DEFINE_FIELD(unsigned long, ret_ip, FIELD_STRING_RETIP, 0);		DEFINE_FIELD(unsigned long, ret_ip, FIELD_STRING_RETIP, 0);

	return traceprobe_define_arg_fields(event_call, sizeof(field), &tk->tp);		return traceprobe_define_arg_fields(event_call, sizeof(field), tp);
	}		}

	#ifdef CONFIG_PERF_EVENTS		#ifdef CONFIG_PERF_EVENTS
	@@ -1289,20 +1358,19 @@ int bpf_get_kprobe_info(const struct perf_event event, u32 fd_type,
	static int kprobe_register(struct trace_event_call *event,		static int kprobe_register(struct trace_event_call *event,
	enum trace_reg type, void *data)		enum trace_reg type, void *data)
	{		{
	struct trace_kprobe tk = (struct trace_kprobe )event->data;
	struct trace_event_file *file = data;		struct trace_event_file *file = data;

	switch (type) {		switch (type) {
	case TRACE_REG_REGISTER:		case TRACE_REG_REGISTER:
	return enable_trace_kprobe(tk, file);		return enable_trace_kprobe(event, file);
	case TRACE_REG_UNREGISTER:		case TRACE_REG_UNREGISTER:
	return disable_trace_kprobe(tk, file);		return disable_trace_kprobe(event, file);

	#ifdef CONFIG_PERF_EVENTS		#ifdef CONFIG_PERF_EVENTS
	case TRACE_REG_PERF_REGISTER:		case TRACE_REG_PERF_REGISTER:
	return enable_trace_kprobe(tk, NULL);		return enable_trace_kprobe(event, NULL);
	case TRACE_REG_PERF_UNREGISTER:		case TRACE_REG_PERF_UNREGISTER:
	return disable_trace_kprobe(tk, NULL);		return disable_trace_kprobe(event, NULL);
	case TRACE_REG_PERF_OPEN:		case TRACE_REG_PERF_OPEN:
	case TRACE_REG_PERF_CLOSE:		case TRACE_REG_PERF_CLOSE:
	case TRACE_REG_PERF_ADD:		case TRACE_REG_PERF_ADD:
	@@ -1369,7 +1437,6 @@ static inline void init_trace_event_call(struct trace_kprobe *tk)

	call->flags = TRACE_EVENT_FL_KPROBE;		call->flags = TRACE_EVENT_FL_KPROBE;
	call->class->reg = kprobe_register;		call->class->reg = kprobe_register;
	call->data = tk;
	}		}

	static int register_kprobe_event(struct trace_kprobe *tk)		static int register_kprobe_event(struct trace_kprobe *tk)
	@@ -1432,7 +1499,9 @@ void destroy_local_trace_kprobe(struct trace_event_call *event_call)
	{		{
	struct trace_kprobe *tk;		struct trace_kprobe *tk;

	tk = container_of(event_call, struct trace_kprobe, tp.call);		tk = trace_kprobe_primary_from_call(event_call);
			if (unlikely(!tk))
			return;

	if (trace_probe_is_enabled(&tk->tp)) {		if (trace_probe_is_enabled(&tk->tp)) {
	WARN_ON(1);		WARN_ON(1);
	@@ -1577,7 +1646,8 @@ static __init int kprobe_trace_self_tests_init(void)
	pr_warn("error on getting probe file.\n");		pr_warn("error on getting probe file.\n");
	warn++;		warn++;
	} else		} else
	enable_trace_kprobe(tk, file);		enable_trace_kprobe(
			trace_probe_event_call(&tk->tp), file);
	}		}
	}		}

	@@ -1598,7 +1668,8 @@ static __init int kprobe_trace_self_tests_init(void)
	pr_warn("error on getting probe file.\n");		pr_warn("error on getting probe file.\n");
	warn++;		warn++;
	} else		} else
	enable_trace_kprobe(tk, file);		enable_trace_kprobe(
			trace_probe_event_call(&tk->tp), file);
	}		}
	}		}

	@@ -1631,7 +1702,8 @@ static __init int kprobe_trace_self_tests_init(void)
	pr_warn("error on getting probe file.\n");		pr_warn("error on getting probe file.\n");
	warn++;		warn++;
	} else		} else
	disable_trace_kprobe(tk, file);		disable_trace_kprobe(
			trace_probe_event_call(&tk->tp), file);
	}		}

	tk = find_trace_kprobe("testprobe2", KPROBE_EVENT_SYSTEM);		tk = find_trace_kprobe("testprobe2", KPROBE_EVENT_SYSTEM);
	@@ -1649,7 +1721,8 @@ static __init int kprobe_trace_self_tests_init(void)
	pr_warn("error on getting probe file.\n");		pr_warn("error on getting probe file.\n");
	warn++;		warn++;
	} else		} else
	disable_trace_kprobe(tk, file);		disable_trace_kprobe(
			trace_probe_event_call(&tk->tp), file);
	}		}

	ret = trace_run_command("-:testprobe", create_or_delete_trace_kprobe);		ret = trace_run_command("-:testprobe", create_or_delete_trace_kprobe);

kernel/trace/trace_probe.c

+36 −18

Original line number	Original line	Diff line number	Diff line
	@@ -889,41 +889,59 @@ int traceprobe_define_arg_fields(struct trace_event_call *event_call,

	void trace_probe_cleanup(struct trace_probe *tp)		void trace_probe_cleanup(struct trace_probe *tp)
	{		{
	struct trace_event_call *call = trace_probe_event_call(tp);
	int i;		int i;

	for (i = 0; i < tp->nr_args; i++)		for (i = 0; i < tp->nr_args; i++)
	traceprobe_free_probe_arg(&tp->args[i]);		traceprobe_free_probe_arg(&tp->args[i]);

	if (call->class)		if (tp->event) {
	kfree(call->class->system);		struct trace_event_call *call = trace_probe_event_call(tp);

			kfree(tp->event->class.system);
	kfree(call->name);		kfree(call->name);
	kfree(call->print_fmt);		kfree(call->print_fmt);
			kfree(tp->event);
			tp->event = NULL;
			}
	}		}

	int trace_probe_init(struct trace_probe tp, const char event,		int trace_probe_init(struct trace_probe tp, const char event,
	const char *group)		const char *group)
	{		{
	struct trace_event_call *call = trace_probe_event_call(tp);		struct trace_event_call *call;
			int ret = 0;

	if (!event \|\| !group)		if (!event \|\| !group)
	return -EINVAL;		return -EINVAL;

	call->class = &tp->class;		tp->event = kzalloc(sizeof(struct trace_probe_event), GFP_KERNEL);
	call->name = kstrdup(event, GFP_KERNEL);		if (!tp->event)
	if (!call->name)
	return -ENOMEM;		return -ENOMEM;

	tp->class.system = kstrdup(group, GFP_KERNEL);		call = trace_probe_event_call(tp);
	if (!tp->class.system) {		call->class = &tp->event->class;
	kfree(call->name);		call->name = kstrdup(event, GFP_KERNEL);
	call->name = NULL;		if (!call->name) {
	return -ENOMEM;		ret = -ENOMEM;
			goto error;
			}

			tp->event->class.system = kstrdup(group, GFP_KERNEL);
			if (!tp->event->class.system) {
			ret = -ENOMEM;
			goto error;
	}		}
	INIT_LIST_HEAD(&tp->files);		INIT_LIST_HEAD(&tp->event->files);
	INIT_LIST_HEAD(&tp->class.fields);		INIT_LIST_HEAD(&tp->event->class.fields);
			INIT_LIST_HEAD(&tp->event->probes);
			INIT_LIST_HEAD(&tp->list);
			list_add(&tp->event->probes, &tp->list);

	return 0;		return 0;

			error:
			trace_probe_cleanup(tp);
			return ret;
	}		}

	int trace_probe_register_event_call(struct trace_probe *tp)		int trace_probe_register_event_call(struct trace_probe *tp)
	@@ -952,7 +970,7 @@ int trace_probe_add_file(struct trace_probe tp, struct trace_event_file file)

	link->file = file;		link->file = file;
	INIT_LIST_HEAD(&link->list);		INIT_LIST_HEAD(&link->list);
	list_add_tail_rcu(&link->list, &tp->files);		list_add_tail_rcu(&link->list, &tp->event->files);
	trace_probe_set_flag(tp, TP_FLAG_TRACE);		trace_probe_set_flag(tp, TP_FLAG_TRACE);
	return 0;		return 0;
	}		}
	@@ -983,7 +1001,7 @@ int trace_probe_remove_file(struct trace_probe *tp,
	synchronize_rcu();		synchronize_rcu();
	kfree(link);		kfree(link);

	if (list_empty(&tp->files))		if (list_empty(&tp->event->files))
	trace_probe_clear_flag(tp, TP_FLAG_TRACE);		trace_probe_clear_flag(tp, TP_FLAG_TRACE);

	return 0;		return 0;

kernel/trace/trace_probe.h

+37 −11

Original line number	Original line	Diff line number	Diff line
	@@ -222,11 +222,18 @@ struct probe_arg {
	const struct fetch_type type; / Type of this argument */		const struct fetch_type type; / Type of this argument */
	};		};

	struct trace_probe {		/* Event call and class holder */
			struct trace_probe_event {
	unsigned int flags; /* For TP_FLAG_* */		unsigned int flags; /* For TP_FLAG_* */
	struct trace_event_class class;		struct trace_event_class class;
	struct trace_event_call call;		struct trace_event_call call;
	struct list_head files;		struct list_head files;
			struct list_head probes;
			};

			struct trace_probe {
			struct list_head list;
			struct trace_probe_event *event;
	ssize_t size; /* trace entry size */		ssize_t size; /* trace entry size */
	unsigned int nr_args;		unsigned int nr_args;
	struct probe_arg args[];		struct probe_arg args[];
	@@ -240,19 +247,19 @@ struct event_file_link {
	static inline bool trace_probe_test_flag(struct trace_probe *tp,		static inline bool trace_probe_test_flag(struct trace_probe *tp,
	unsigned int flag)		unsigned int flag)
	{		{
	return !!(tp->flags & flag);		return !!(tp->event->flags & flag);
	}		}

	static inline void trace_probe_set_flag(struct trace_probe *tp,		static inline void trace_probe_set_flag(struct trace_probe *tp,
	unsigned int flag)		unsigned int flag)
	{		{
	tp->flags \|= flag;		tp->event->flags \|= flag;
	}		}

	static inline void trace_probe_clear_flag(struct trace_probe *tp,		static inline void trace_probe_clear_flag(struct trace_probe *tp,
	unsigned int flag)		unsigned int flag)
	{		{
	tp->flags &= ~flag;		tp->event->flags &= ~flag;
	}		}

	static inline bool trace_probe_is_enabled(struct trace_probe *tp)		static inline bool trace_probe_is_enabled(struct trace_probe *tp)
	@@ -262,29 +269,48 @@ static inline bool trace_probe_is_enabled(struct trace_probe *tp)

	static inline const char trace_probe_name(struct trace_probe tp)		static inline const char trace_probe_name(struct trace_probe tp)
	{		{
	return trace_event_name(&tp->call);		return trace_event_name(&tp->event->call);
	}		}

	static inline const char trace_probe_group_name(struct trace_probe tp)		static inline const char trace_probe_group_name(struct trace_probe tp)
	{		{
	return tp->call.class->system;		return tp->event->call.class->system;
	}		}

	static inline struct trace_event_call *		static inline struct trace_event_call *
	trace_probe_event_call(struct trace_probe *tp)		trace_probe_event_call(struct trace_probe *tp)
	{		{
	return &tp->call;		return &tp->event->call;
			}

			static inline struct trace_probe_event *
			trace_probe_event_from_call(struct trace_event_call *event_call)
			{
			return container_of(event_call, struct trace_probe_event, call);
			}

			static inline struct trace_probe *
			trace_probe_primary_from_call(struct trace_event_call *call)
			{
			struct trace_probe_event *tpe = trace_probe_event_from_call(call);

			return list_first_entry(&tpe->probes, struct trace_probe, list);
			}

			static inline struct list_head trace_probe_probe_list(struct trace_probe tp)
			{
			return &tp->event->probes;
	}		}

	static inline int trace_probe_unregister_event_call(struct trace_probe *tp)		static inline int trace_probe_unregister_event_call(struct trace_probe *tp)
	{		{
	/* tp->event is unregistered in trace_remove_event_call() */		/* tp->event is unregistered in trace_remove_event_call() */
	return trace_remove_event_call(&tp->call);		return trace_remove_event_call(&tp->event->call);
	}		}

	static inline bool trace_probe_has_single_file(struct trace_probe *tp)		static inline bool trace_probe_has_single_file(struct trace_probe *tp)
	{		{
	return !!list_is_singular(&tp->files);		return !!list_is_singular(&tp->event->files);
	}		}

	int trace_probe_init(struct trace_probe tp, const char event,		int trace_probe_init(struct trace_probe tp, const char event,
	@@ -298,9 +324,9 @@ struct event_file_link trace_probe_get_file_link(struct trace_probe tp,
	struct trace_event_file *file);		struct trace_event_file *file);

	#define trace_probe_for_each_link(pos, tp) \		#define trace_probe_for_each_link(pos, tp) \
	list_for_each_entry(pos, &(tp)->files, list)		list_for_each_entry(pos, &(tp)->event->files, list)
	#define trace_probe_for_each_link_rcu(pos, tp) \		#define trace_probe_for_each_link_rcu(pos, tp) \
	list_for_each_entry_rcu(pos, &(tp)->files, list)		list_for_each_entry_rcu(pos, &(tp)->event->files, list)

	/* Check the name is good for event/group/fields */		/* Check the name is good for event/group/fields */
	static inline bool is_good_name(const char *name)		static inline bool is_good_name(const char *name)

kernel/trace/trace_uprobe.c

+123 −42

Original line number	Original line	Diff line number	Diff line
	@@ -293,6 +293,18 @@ static bool trace_uprobe_match(const char system, const char event,
	(!system \|\| strcmp(trace_probe_group_name(&tu->tp), system) == 0);		(!system \|\| strcmp(trace_probe_group_name(&tu->tp), system) == 0);
	}		}

			static nokprobe_inline struct trace_uprobe *
			trace_uprobe_primary_from_call(struct trace_event_call *call)
			{
			struct trace_probe *tp;

			tp = trace_probe_primary_from_call(call);
			if (WARN_ON_ONCE(!tp))
			return NULL;

			return container_of(tp, struct trace_uprobe, tp);
			}

	/*		/*
	* Allocate new trace_uprobe and initialize it (including uprobes).		* Allocate new trace_uprobe and initialize it (including uprobes).
	*/		*/
	@@ -897,7 +909,10 @@ print_uprobe_event(struct trace_iterator iter, int flags, struct trace_event e
	u8 *data;		u8 *data;

	entry = (struct uprobe_trace_entry_head *)iter->ent;		entry = (struct uprobe_trace_entry_head *)iter->ent;
	tu = container_of(event, struct trace_uprobe, tp.call.event);		tu = trace_uprobe_primary_from_call(
			container_of(event, struct trace_event_call, event));
			if (unlikely(!tu))
			goto out;

	if (is_ret_probe(tu)) {		if (is_ret_probe(tu)) {
	trace_seq_printf(s, "%s: (0x%lx <- 0x%lx)",		trace_seq_printf(s, "%s: (0x%lx <- 0x%lx)",
	@@ -924,27 +939,71 @@ typedef bool (filter_func_t)(struct uprobe_consumer self,
	enum uprobe_filter_ctx ctx,		enum uprobe_filter_ctx ctx,
	struct mm_struct *mm);		struct mm_struct *mm);

	static int		static int trace_uprobe_enable(struct trace_uprobe *tu, filter_func_t filter)
	probe_event_enable(struct trace_uprobe tu, struct trace_event_file file,		{
	filter_func_t filter)		int ret;

			tu->consumer.filter = filter;
			tu->inode = d_real_inode(tu->path.dentry);

			if (tu->ref_ctr_offset)
			ret = uprobe_register_refctr(tu->inode, tu->offset,
			tu->ref_ctr_offset, &tu->consumer);
			else
			ret = uprobe_register(tu->inode, tu->offset, &tu->consumer);

			if (ret)
			tu->inode = NULL;

			return ret;
			}

			static void __probe_event_disable(struct trace_probe *tp)
			{
			struct trace_probe *pos;
			struct trace_uprobe *tu;

			list_for_each_entry(pos, trace_probe_probe_list(tp), list) {
			tu = container_of(pos, struct trace_uprobe, tp);
			if (!tu->inode)
			continue;

			WARN_ON(!uprobe_filter_is_empty(&tu->filter));

			uprobe_unregister(tu->inode, tu->offset, &tu->consumer);
			tu->inode = NULL;
			}
			}

			static int probe_event_enable(struct trace_event_call *call,
			struct trace_event_file *file, filter_func_t filter)
	{		{
	bool enabled = trace_probe_is_enabled(&tu->tp);		struct trace_probe pos, tp;
			struct trace_uprobe *tu;
			bool enabled;
	int ret;		int ret;

			tp = trace_probe_primary_from_call(call);
			if (WARN_ON_ONCE(!tp))
			return -ENODEV;
			enabled = trace_probe_is_enabled(tp);

			/* This may also change "enabled" state */
	if (file) {		if (file) {
	if (trace_probe_test_flag(&tu->tp, TP_FLAG_PROFILE))		if (trace_probe_test_flag(tp, TP_FLAG_PROFILE))
	return -EINTR;		return -EINTR;

	ret = trace_probe_add_file(&tu->tp, file);		ret = trace_probe_add_file(tp, file);
	if (ret < 0)		if (ret < 0)
	return ret;		return ret;
	} else {		} else {
	if (trace_probe_test_flag(&tu->tp, TP_FLAG_TRACE))		if (trace_probe_test_flag(tp, TP_FLAG_TRACE))
	return -EINTR;		return -EINTR;

	trace_probe_set_flag(&tu->tp, TP_FLAG_PROFILE);		trace_probe_set_flag(tp, TP_FLAG_PROFILE);
	}		}

			tu = container_of(tp, struct trace_uprobe, tp);
	WARN_ON(!uprobe_filter_is_empty(&tu->filter));		WARN_ON(!uprobe_filter_is_empty(&tu->filter));

	if (enabled)		if (enabled)
	@@ -954,17 +1013,14 @@ probe_event_enable(struct trace_uprobe tu, struct trace_event_file file,
	if (ret)		if (ret)
	goto err_flags;		goto err_flags;

	tu->consumer.filter = filter;		list_for_each_entry(pos, trace_probe_probe_list(tp), list) {
	tu->inode = d_real_inode(tu->path.dentry);		tu = container_of(pos, struct trace_uprobe, tp);
	if (tu->ref_ctr_offset) {		ret = trace_uprobe_enable(tu, filter);
	ret = uprobe_register_refctr(tu->inode, tu->offset,		if (ret) {
	tu->ref_ctr_offset, &tu->consumer);		__probe_event_disable(tp);
	} else {
	ret = uprobe_register(tu->inode, tu->offset, &tu->consumer);
	}

	if (ret)
	goto err_buffer;		goto err_buffer;
			}
			}

	return 0;		return 0;

	@@ -973,33 +1029,35 @@ probe_event_enable(struct trace_uprobe tu, struct trace_event_file file,

	err_flags:		err_flags:
	if (file)		if (file)
	trace_probe_remove_file(&tu->tp, file);		trace_probe_remove_file(tp, file);
	else		else
	trace_probe_clear_flag(&tu->tp, TP_FLAG_PROFILE);		trace_probe_clear_flag(tp, TP_FLAG_PROFILE);

	return ret;		return ret;
	}		}

	static void		static void probe_event_disable(struct trace_event_call *call,
	probe_event_disable(struct trace_uprobe tu, struct trace_event_file file)		struct trace_event_file *file)
	{		{
	if (!trace_probe_is_enabled(&tu->tp))		struct trace_probe *tp;

			tp = trace_probe_primary_from_call(call);
			if (WARN_ON_ONCE(!tp))
			return;

			if (!trace_probe_is_enabled(tp))
	return;		return;

	if (file) {		if (file) {
	if (trace_probe_remove_file(&tu->tp, file) < 0)		if (trace_probe_remove_file(tp, file) < 0)
	return;		return;

	if (trace_probe_is_enabled(&tu->tp))		if (trace_probe_is_enabled(tp))
	return;		return;
	} else		} else
	trace_probe_clear_flag(&tu->tp, TP_FLAG_PROFILE);		trace_probe_clear_flag(tp, TP_FLAG_PROFILE);

	WARN_ON(!uprobe_filter_is_empty(&tu->filter));

	uprobe_unregister(tu->inode, tu->offset, &tu->consumer);
	tu->inode = NULL;

			__probe_event_disable(tp);
	uprobe_buffer_disable();		uprobe_buffer_disable();
	}		}

	@@ -1007,7 +1065,11 @@ static int uprobe_event_define_fields(struct trace_event_call *event_call)
	{		{
	int ret, size;		int ret, size;
	struct uprobe_trace_entry_head field;		struct uprobe_trace_entry_head field;
	struct trace_uprobe *tu = event_call->data;		struct trace_uprobe *tu;

			tu = trace_uprobe_primary_from_call(event_call);
			if (unlikely(!tu))
			return -ENODEV;

	if (is_ret_probe(tu)) {		if (is_ret_probe(tu)) {
	DEFINE_FIELD(unsigned long, vaddr[0], FIELD_STRING_FUNC, 0);		DEFINE_FIELD(unsigned long, vaddr[0], FIELD_STRING_FUNC, 0);
	@@ -1100,6 +1162,27 @@ static int uprobe_perf_open(struct trace_uprobe tu, struct perf_event event)
	return err;		return err;
	}		}

			static int uprobe_perf_multi_call(struct trace_event_call *call,
			struct perf_event *event,
			int (op)(struct trace_uprobe tu, struct perf_event *event))
			{
			struct trace_probe pos, tp;
			struct trace_uprobe *tu;
			int ret = 0;

			tp = trace_probe_primary_from_call(call);
			if (WARN_ON_ONCE(!tp))
			return -ENODEV;

			list_for_each_entry(pos, trace_probe_probe_list(tp), list) {
			tu = container_of(pos, struct trace_uprobe, tp);
			ret = op(tu, event);
			if (ret)
			break;
			}

			return ret;
			}
	static bool uprobe_perf_filter(struct uprobe_consumer *uc,		static bool uprobe_perf_filter(struct uprobe_consumer *uc,
	enum uprobe_filter_ctx ctx, struct mm_struct *mm)		enum uprobe_filter_ctx ctx, struct mm_struct *mm)
	{		{
	@@ -1213,30 +1296,29 @@ static int
	trace_uprobe_register(struct trace_event_call *event, enum trace_reg type,		trace_uprobe_register(struct trace_event_call *event, enum trace_reg type,
	void *data)		void *data)
	{		{
	struct trace_uprobe *tu = event->data;
	struct trace_event_file *file = data;		struct trace_event_file *file = data;

	switch (type) {		switch (type) {
	case TRACE_REG_REGISTER:		case TRACE_REG_REGISTER:
	return probe_event_enable(tu, file, NULL);		return probe_event_enable(event, file, NULL);

	case TRACE_REG_UNREGISTER:		case TRACE_REG_UNREGISTER:
	probe_event_disable(tu, file);		probe_event_disable(event, file);
	return 0;		return 0;

	#ifdef CONFIG_PERF_EVENTS		#ifdef CONFIG_PERF_EVENTS
	case TRACE_REG_PERF_REGISTER:		case TRACE_REG_PERF_REGISTER:
	return probe_event_enable(tu, NULL, uprobe_perf_filter);		return probe_event_enable(event, NULL, uprobe_perf_filter);

	case TRACE_REG_PERF_UNREGISTER:		case TRACE_REG_PERF_UNREGISTER:
	probe_event_disable(tu, NULL);		probe_event_disable(event, NULL);
	return 0;		return 0;

	case TRACE_REG_PERF_OPEN:		case TRACE_REG_PERF_OPEN:
	return uprobe_perf_open(tu, data);		return uprobe_perf_multi_call(event, data, uprobe_perf_open);

	case TRACE_REG_PERF_CLOSE:		case TRACE_REG_PERF_CLOSE:
	return uprobe_perf_close(tu, data);		return uprobe_perf_multi_call(event, data, uprobe_perf_close);

	#endif		#endif
	default:		default:
	@@ -1330,7 +1412,6 @@ static inline void init_trace_event_call(struct trace_uprobe *tu)

	call->flags = TRACE_EVENT_FL_UPROBE \| TRACE_EVENT_FL_CAP_ANY;		call->flags = TRACE_EVENT_FL_UPROBE \| TRACE_EVENT_FL_CAP_ANY;
	call->class->reg = trace_uprobe_register;		call->class->reg = trace_uprobe_register;
	call->data = tu;
	}		}

	static int register_uprobe_event(struct trace_uprobe *tu)		static int register_uprobe_event(struct trace_uprobe *tu)
	@@ -1399,7 +1480,7 @@ void destroy_local_trace_uprobe(struct trace_event_call *event_call)
	{		{
	struct trace_uprobe *tu;		struct trace_uprobe *tu;

	tu = container_of(event_call, struct trace_uprobe, tp.call);		tu = trace_uprobe_primary_from_call(event_call);

	free_trace_uprobe(tu);		free_trace_uprobe(tu);
	}		}