ftrace: Don't try to __ftrace_replace_code on !FTRACE_FL_CONVERTED rec
PATCH 1/1 ftrace: Don't try to __ftrace_replace_code on !FTRACE_FL_CONVERTED rec
Do __ftrace_replace_code for !FTRACE_FL_CONVERTED rec will always fail, we should ignore this rec.
--- kernel/trace/ftrace.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-)
kernel/trace/ftrace.c +5 -4
@@ -532,11 +532,12 @@ static void ftrace_replace_code(int enable)do_for_each_ftrace_rec (pg, rec) {/* -* Skip over free records and records that have -* failed. +* Skip over free records, records that have +* failed and not converted. */ if (rec->flags &FTRACE_FL_FREE || - rec->flags &FTRACE_FL_FAILED ) + rec->flags &FTRACE_FL_FAILED || + rec->flags &FTRACE_FL_CONVERTED )continue ;/* ignore updates to this record's mcount site */
@@ -548,7 +549,7 @@ static void ftrace_replace_code(int enable) } failed =__ftrace_replace_code (rec, enable); -if (failed && (rec->flags &FTRACE_FL_CONVERTED )) { +if (failed) { rec->flags |=FTRACE_FL_FAILED ;if ((system_state ==SYSTEM_BOOTING ) || !core_kernel_text (rec->ip)) {
Signature · 1 line
1.5.5.3
[tip:tracing/ftrace] ftrace: don't try to __ftrace_replace_code on !FTRACE_FL_CONVERTED rec
Commit-ID: fa9d13cf135efbd454453a53b6299976bea245a9 Gitweb: http://git.kernel.org/tip/fa9d13cf135efbd454453a53b6299976bea245a9 Author: Zhaolei <[email protected]> AuthorDate: Fri, 13 Mar 2009 17:16:34 +0800 Commit: Ingo Molnar <[email protected]> CommitDate: Fri, 13 Mar 2009 10:25:06 +0100
ftrace: don't try to __ftrace_replace_code on !FTRACE_FL_CONVERTED rec
Do __ftrace_replace_code for !FTRACE_FL_CONVERTED rec will always fail, we should ignore this rec.
LKML-Reference: <[email protected]>
--- kernel/trace/ftrace.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-)
kernel/trace/ftrace.c +5 -4
@@ -532,11 +532,12 @@ static void ftrace_replace_code(int enable)do_for_each_ftrace_rec (pg, rec) {/* -* Skip over free records and records that have -* failed. +* Skip over free records, records that have +* failed and not converted. */ if (rec->flags &FTRACE_FL_FREE || - rec->flags &FTRACE_FL_FAILED ) + rec->flags &FTRACE_FL_FAILED || + rec->flags &FTRACE_FL_CONVERTED )continue ;/* ignore updates to this record's mcount site */
@@ -548,7 +549,7 @@ static void ftrace_replace_code(int enable) } failed =__ftrace_replace_code (rec, enable); -if (failed && (rec->flags &FTRACE_FL_CONVERTED )) { +if (failed) { rec->flags |=FTRACE_FL_FAILED ;if ((system_state ==SYSTEM_BOOTING ) || !core_kernel_text (rec->ip)) {
Steven Rostedt
maintainerRe: [tip:tracing/ftrace] ftrace: don't try to __ftrace_replace_code on !FTRACE_FL_CONVERTED rec
Quoted 11 lines · Zhaolei
Commit-ID: fa9d13cf135efbd454453a53b6299976bea245a9 Gitweb: http://git.kernel.org/tip/fa9d13cf135efbd454453a53b6299976bea245a9 Author: Zhaolei <[email protected]> AuthorDate: Fri, 13 Mar 2009 17:16:34 +0800 Commit: Ingo Molnar <[email protected]> CommitDate: Fri, 13 Mar 2009 10:25:06 +0100ftrace: don't try to
__ftrace_replace_codeon !FTRACE_FL_CONVERTED recDo
__ftrace_replace_codefor !FTRACE_FL_CONVERTED rec will always fail, we should ignore this rec.
Is this also by code review or did you actually hit it?
This code is very sensitive, and changing must be done extremely carefully.
Quoted 32 lines
Signed-off-by Zhao Lei <[email protected]>Cc "Steven Rostedt ;" <[email protected]>LKML-Reference: <[email protected]>
Signed-off-by Ingo Molnar <[email protected]>--- kernel/trace/ftrace.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-)kernel/trace/ftrace.c +4
-3@@ -532,11 +532,12 @@ static void ftrace_replace_code(int enable)do_for_each_ftrace_rec (pg, rec) {/* -* Skip over free records and records that have -* failed. +* Skip over free records, records that have +* failed and not converted. */ if (rec->flags &FTRACE_FL_FREE || - rec->flags &FTRACE_FL_FAILED ) + rec->flags &FTRACE_FL_FAILED || + rec->flags &FTRACE_FL_CONVERTED )continue ;/* ignore updates to this record's mcount site */
kernel/trace/ftrace.c static void ftrace_replace_code(int enable) · line 552
Quoted 5 lines
kernel/trace/ftrace.c +1
-1@@ -548,7 +549,7 @@ static void ftrace_replace_code(int enable) } failed =__ftrace_replace_code (rec, enable); -if (failed && (rec->flags &FTRACE_FL_CONVERTED )) { +if (failed) {
Note, if we get here when a record does not have FL_CONVERTED set, then something already went wrong and tracing should have been disabled. The check here was simply to prevent mulitple errors from being printed out.
I'm just getting ready to travel, but maybe I'll look into this code a bit more, and see what reasons we can get here without that CONVERTED flag being set. Perhaps the best thing to do is exit the loop?
-- Steve
Quoted 4 lines
kernel/trace/ftrace.c +0
-0rec->flags |=FTRACE_FL_FAILED ;if ((system_state ==SYSTEM_BOOTING ) || !core_kernel_text (rec->ip)) {