lkml.org 
[lkml]   [2011]   [Apr]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 5/8] ftrace: Remove FTRACE_FL_CONVERTED flag
    From: Steven Rostedt <srostedt@redhat.com>

    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>
    ---
    include/linux/ftrace.h | 1 -
    kernel/trace/ftrace.c | 12 ++++--------
    2 files changed, 4 insertions(+), 9 deletions(-)

    diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
    index 2a195ff..3204744 100644
    --- a/include/linux/ftrace.h
    +++ b/include/linux/ftrace.h
    @@ -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 {
    diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
    index eb19fae..9abaaf4 100644
    --- a/kernel/trace/ftrace.c
    +++ b/kernel/trace/ftrace.c
    @@ -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);
    @@ -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++;

    /*
    --
    1.7.2.3



    \
     
     \ /
      Last update: 2011-04-30 17:35    [W:0.020 / U:32.720 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site