[PATCH v2 0/3] ftrace/x86: Recovery code fixes and improvements

From: Petr Mladek
Date: Mon Feb 24 2014 - 11:12:37 EST


This is folowup from the discussion (Re: [PATCH 0/4] x86: Fix ftrace recovery
when code modification failed), see https://lkml.org/lkml/2014/2/21/748

I split the fixes into three patches:

1st patch adds the missing sync call. I guess that Steven would want to
squash this into the commit f06492158f4b0cdb (ftrace/x86: Run a sync
after fixup on failure) in the ftrace/urgent branch.

2nd patch adds the missing warnigns about ftrace modification failure
into the generic code as suggested by Steven[*]. I used "err" instead
of the suggested "ret" variable. The value is handled but it is not
returned. Also I left ftrace_replace_code() calls as is. It handles
the error, prints more details, and does not return the error value.

3rd patch adds the BUG calls. Steven did not comment on it, so I rather
put this into a separate patch, so it does not block the other things.

[*] I feel shame that I was not brave enough to do modify the generic code
when I sent the patch on Friday.

Petr Mladek (3):
ftrace/x86: One more missing sync after fixup of function modification
failure
ftrace: Warn on error when modifying ftrace function
ftrace/x86: BUG when ftrace recovery fails

arch/x86/kernel/ftrace.c | 24 ++++++++++++++++--------
kernel/trace/ftrace.c | 17 ++++++++++++-----
2 files changed, 28 insertions(+), 13 deletions(-)

--
1.8.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/