openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Steven Rostedt <rostedt@goodmis.org>
This commit is contained in:
Steven Rostedt 2010-09-09 08:43:22 -04:00 committed by Steven Rostedt
parent bfa88ea7ee
commit 2bccfffd15
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/trace/ftrace.c
View File

@ -1368,6 +1368,7 @@ enum {
#define FTRACE_BUFF_MAX (KSYM_SYMBOL_LEN+4) /* room for wildcards */ #define FTRACE_BUFF_MAX (KSYM_SYMBOL_LEN+4) /* room for wildcards */
struct ftrace_iterator { struct ftrace_iterator {
loff_t func_pos;
struct ftrace_page *pg; struct ftrace_page *pg;
int hidx; int hidx;
int idx; int idx;
@ -1418,12 +1419,15 @@ static void *t_hash_start(struct seq_file *m, loff_t *pos)
loff_t l; loff_t l;
if (!(iter->flags & FTRACE_ITER_HASH)) 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->flags |= FTRACE_ITER_HASH;
iter->hidx = 0; iter->hidx = 0;
for (l = 0; l <= *pos; ) { for (l = 0; l <= (*pos - iter->func_pos); ) {
p = t_hash_next(m, p, &l); p = t_hash_next(m, p, &l);
if (!p) if (!p)
break; break;