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

Commit 5fecaa04 authored by Steven Rostedt (Red Hat)'s avatar Steven Rostedt (Red Hat) Committed by Steven Rostedt
Browse files

ftrace: Grab any ops for a rec for enabled_functions output 



When dumping the enabled_functions, use the first op that is
found with a trampoline to the record, as there should only be
one, as only one ops can be registered to a function that has
a trampoline.

Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 3296fc4e

kernel/trace/ftrace.c

+20 −1
Original line number Original line Diff line number Diff line
@@ -1900,6 +1900,25 @@ int ftrace_test_record(struct dyn_ftrace *rec, int enable) 
	return ftrace_check_record(rec, enable, 0);

	return ftrace_check_record(rec, enable, 0);

}

}





static struct ftrace_ops *

ftrace_find_tramp_ops_any(struct dyn_ftrace *rec)

{

	struct ftrace_ops *op;



	do_for_each_ftrace_op(op, ftrace_ops_list) {



		if (!op->trampoline)

			continue;



		if (ftrace_lookup_ip(op->func_hash->filter_hash, rec->ip) &&

		    (ftrace_hash_empty(op->func_hash->notrace_hash) ||

		     !ftrace_lookup_ip(op->func_hash->notrace_hash, rec->ip)))

			return op;

	} while_for_each_ftrace_op(op);



	return NULL;

}



static struct ftrace_ops *

static struct ftrace_ops *

ftrace_find_tramp_ops_curr(struct dyn_ftrace *rec)

ftrace_find_tramp_ops_curr(struct dyn_ftrace *rec)

{

{
@@ -2966,7 +2985,7 @@ static int t_show(struct seq_file *m, void *v) 
		if (rec->flags & FTRACE_FL_TRAMP_EN) {

		if (rec->flags & FTRACE_FL_TRAMP_EN) {

			struct ftrace_ops *ops;

			struct ftrace_ops *ops;





			ops = ftrace_find_tramp_ops_curr(rec);

			ops = ftrace_find_tramp_ops_any(rec);

			if (ops && ops->trampoline)

			if (ops && ops->trampoline)

				seq_printf(m, "\ttramp: %pS",

				seq_printf(m, "\ttramp: %pS",

					   (void *)ops->trampoline);

					   (void *)ops->trampoline);