Skip to content

Commit

Permalink
ftrace: Remove FTRACE_FL_CONVERTED flag
Browse files Browse the repository at this point in the history
Since we disable all function tracer processing if we detect
that a modification of a instruction had failed, we do not need
to track that the record has failed. No more ftrace processing
is allowed, and the FTRACE_FL_CONVERTED flag is pointless.

The FTRACE_FL_CONVERTED flag was used to denote records that were
successfully converted from mcount calls into nops. But if a single
record fails, all of ftrace is disabled.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
  • Loading branch information
Steven Rostedt authored and Steven Rostedt committed Apr 30, 2011
1 parent 45a4a23 commit d2c8c3e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 9 deletions.
1 change: 0 additions & 1 deletion include/linux/ftrace.h
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,6 @@ enum {
FTRACE_FL_FILTER = (1 << 1),
FTRACE_FL_ENABLED = (1 << 2),
FTRACE_FL_NOTRACE = (1 << 3),
FTRACE_FL_CONVERTED = (1 << 4),
};

struct dyn_ftrace {
Expand Down
12 changes: 4 additions & 8 deletions kernel/trace/ftrace.c
Original file line number Diff line number Diff line change
Expand Up @@ -1087,12 +1087,8 @@ static void ftrace_replace_code(int enable)
return;

do_for_each_ftrace_rec(pg, rec) {
/*
* Skip over free records, records that have
* failed and not converted.
*/
if (rec->flags & FTRACE_FL_FREE ||
!(rec->flags & FTRACE_FL_CONVERTED))
/* Skip over free records */
if (rec->flags & FTRACE_FL_FREE)
continue;

failed = __ftrace_replace_code(rec, enable);
Expand Down Expand Up @@ -1280,10 +1276,10 @@ static int ftrace_update_code(struct module *mod)
*/
if (!ftrace_code_disable(mod, p)) {
ftrace_free_rec(p);
continue;
/* Game over */
break;
}

p->flags |= FTRACE_FL_CONVERTED;
ftrace_update_cnt++;

/*
Expand Down

0 comments on commit d2c8c3e

Please sign in to comment.