| Message ID | abc56ad177f370ec423edcfc538d35b418c1808e.1561634177.git.naveen.n.rao@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | powerpc/ftrace: Patch out -mprofile-kernel instructions | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch next (c7d64b560ce80d8c44f082eee8352f0778a73195) |
| snowpatch_ozlabs/checkpatch | fail | total: 1 errors, 0 warnings, 0 checks, 10 lines checked |
Naveen N. Rao wrote: > In commit a0572f687fb3c ("ftrace: Allow ftrace_replace_code() to be > schedulable), the generic ftrace_replace_code() function was modified to > accept a flags argument in place of a single 'enable' flag. However, the > x86 version of this function was not updated. Fix the same. > > Fixes: a0572f687fb3c ("ftrace: Allow ftrace_replace_code() to be schedulable") > Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com> > --- > arch/x86/kernel/ftrace.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) If the rest of this series is ok, and if Ingo and Steven are ok to have this series go through the powerpc tree, then I can re-post this particular patch for x86 after -rc1. Thanks, Naveen
On Thu, 27 Jun 2019 16:53:50 +0530 "Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com> wrote: > In commit a0572f687fb3c ("ftrace: Allow ftrace_replace_code() to be > schedulable), the generic ftrace_replace_code() function was modified to > accept a flags argument in place of a single 'enable' flag. However, the > x86 version of this function was not updated. Fix the same. > > Fixes: a0572f687fb3c ("ftrace: Allow ftrace_replace_code() to be schedulable") I don't mind this change, but it's not a bug, and I'm not sure it should have the fixes tag. The reason being, the FTRACE_MODIFY_ENABLE_FL is only set when ftrace is called by with the command flag FTRACE_MAY_SLEEP, which is never done on x86. That said, I'm fine with the change as it makes it more robust, but by adding the fixes tag, you're going to get this into all the stable code, and I'm not sure that's really necessary. -- Steve > Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com> > --- > arch/x86/kernel/ftrace.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c > index 0927bb158ffc..f34005a17051 100644 > --- a/arch/x86/kernel/ftrace.c > +++ b/arch/x86/kernel/ftrace.c > @@ -573,8 +573,9 @@ static void run_sync(void) > local_irq_disable(); > } > > -void ftrace_replace_code(int enable) > +void ftrace_replace_code(int mod_flags) > { > + int enable = mod_flags & FTRACE_MODIFY_ENABLE_FL; > struct ftrace_rec_iter *iter; > struct dyn_ftrace *rec; > const char *report = "adding breakpoints";
Steven Rostedt wrote: > On Thu, 27 Jun 2019 16:53:50 +0530 > "Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com> wrote: > >> In commit a0572f687fb3c ("ftrace: Allow ftrace_replace_code() to be >> schedulable), the generic ftrace_replace_code() function was modified to >> accept a flags argument in place of a single 'enable' flag. However, the >> x86 version of this function was not updated. Fix the same. >> >> Fixes: a0572f687fb3c ("ftrace: Allow ftrace_replace_code() to be schedulable") > > I don't mind this change, but it's not a bug, and I'm not sure it > should have the fixes tag. The reason being, the > FTRACE_MODIFY_ENABLE_FL is only set when ftrace is called by with the > command flag FTRACE_MAY_SLEEP, which is never done on x86. I guess you meant to say that *FTRACE_MODIFY_MAY_SLEEP_FL* is only set with FTRACE_MAY_SLEEP. > > That said, I'm fine with the change as it makes it more robust, but by > adding the fixes tag, you're going to get this into all the stable > code, and I'm not sure that's really necessary. Agreed. Thanks for pointing this out. We can drop this patch from this series and I will re-post this as a simpler cleanup later on. Thanks, Naveen
diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c index 0927bb158ffc..f34005a17051 100644 --- a/arch/x86/kernel/ftrace.c +++ b/arch/x86/kernel/ftrace.c @@ -573,8 +573,9 @@ static void run_sync(void) local_irq_disable(); } -void ftrace_replace_code(int enable) +void ftrace_replace_code(int mod_flags) { + int enable = mod_flags & FTRACE_MODIFY_ENABLE_FL; struct ftrace_rec_iter *iter; struct dyn_ftrace *rec; const char *report = "adding breakpoints";
In commit a0572f687fb3c ("ftrace: Allow ftrace_replace_code() to be schedulable), the generic ftrace_replace_code() function was modified to accept a flags argument in place of a single 'enable' flag. However, the x86 version of this function was not updated. Fix the same. Fixes: a0572f687fb3c ("ftrace: Allow ftrace_replace_code() to be schedulable") Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com> --- arch/x86/kernel/ftrace.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)