Re: [PATCH -tip 3/3] x86: Remove unused text_poke_smp andtext_poke_smp_batch

[Ingo Molnar]

* Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx> wrote:

> (2013/07/22 19:01), Ingo Molnar wrote:
> > 
> > * Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx> wrote:
> > 
> >> (2013/07/22 17:21), Ingo Molnar wrote:
> >>>
> >>> * Ingo Molnar <mingo@xxxxxxxxxx> wrote:
> >>>
> >>>>
> >>>> * Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx> wrote:
> >>>>
> >>>>> Since introducing the text_poke_bp for all text_poke_smp*
> >>>>> callers, text_poke_smp* are now unused. This basically
> >>>>> reverts 3d55cc8a, 7deb18dc and related commits.
> >>>>>
> >>>>> This also fixes a Kconfig dependency issue on STOP_MACHINE
> >>>>> in the case of CONFIG_SMP && !CONFIG_MODULE_UNLOAD.
> >>>>>
> >>>>> Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
> >>>>> ---
> >>>>>  arch/x86/Kconfig                   |    5 --
> >>>>>  arch/x86/include/asm/alternative.h |   11 ----
> >>>>>  arch/x86/kernel/alternative.c      |   98 +-----------------------------------
> >>>>>  3 files changed, 2 insertions(+), 112 deletions(-)
> >>>>
> >>>> Hm, it does not build with the attached config:
> >>>>
> >>>> arch/x86/kernel/kprobes/opt.c: In function 'setup_optimize_kprobe':
> >>>> arch/x86/kernel/kprobes/opt.c:394:6: error: dereferencing pointer to incomplete type
> >>>> arch/x86/kernel/kprobes/opt.c:395:6: error: dereferencing pointer to incomplete type
> >>>> arch/x86/kernel/kprobes/opt.c:396:6: error: dereferencing pointer to incomplete type
> >>>
> >>> 32-bit appears to be the key pattern.
> >>
> >> Ingo, please make sure your x86/jumplabel tree picked all of my patches.
> >> This 3/3 strongly depends on the previous 1/3 and 2/3.
> >> Without it, kprobes/opt.c can not be build because it still uses the
> >> text_poke_params data structure which 3/3 removes.
> > 
> > Yes I know, and it was on top of -tip which already had these included:
> > 
> >  51b2c07b2226 x86: Make jump_label use int3-based patching
> >  fd4363fff3d9 x86: Introduce int3 (breakpoint)-based instruction patching
> > 
> > without these the third patch wouldn't even apply I think.
> 
> No, I meant below two patches:
>  kprobes/x86: Remove an incorrect comment about int3 in NMI/MCE
>  kprobes/x86: Use text_poke_bp() instead of text_poke_smp*()
> 
> Since the "setup_optimize_kprobe" in the error message is completely
> *removed* by the second one, the above error should not happen.

Oh, indeed - I correctly applied them but then messed up the 
cherry-picking, that's all.

So never mind, it's all fine.

Thanks,

	Ingo
--
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/