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

Commit 2bccfffd authored by Steven Rostedt's avatar Steven Rostedt Committed by Steven Rostedt
Browse files

tracing: Do not reset *pos in set_ftrace_filter 



After the filtered functions are read, the probed functions are read
from the hash in set_ftrace_filter. When the hashed probed functions
are read, the *pos passed in is reset. Instead of modifying the pos
given to the read function, just record the pos where the filtered
functions ended and subtract from that.

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

kernel/trace/ftrace.c

+6 −2
Original line number Diff line number Diff line
@@ -1368,6 +1368,7 @@ enum { 
#define FTRACE_BUFF_MAX (KSYM_SYMBOL_LEN+4) /* room for wildcards */



struct ftrace_iterator {

	loff_t			func_pos;

	struct ftrace_page	*pg;

	int			hidx;

	int			idx;
@@ -1418,12 +1419,15 @@ static void *t_hash_start(struct seq_file *m, loff_t *pos) 
	loff_t l;



	if (!(iter->flags & FTRACE_ITER_HASH))

		*pos = 0;

		iter->func_pos = *pos;



	if (iter->func_pos > *pos)

		return NULL;



	iter->flags |= FTRACE_ITER_HASH;



	iter->hidx = 0;

	for (l = 0; l <= *pos; ) {

	for (l = 0; l <= (*pos - iter->func_pos); ) {

		p = t_hash_next(m, p, &l);

		if (!p)

			break;