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

[Ingo Molnar <mingo@kernel.org>]

* Jiri Kosina <jkosina@suse.cz> wrote:

> On Mon, 22 Jul 2013, Ingo Molnar wrote:
> 
> > > >>>> 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.
> 
> Hi Ingo,
> 
> x86/jumplabel branch still seems to contain only Masami's "kprobes/x86: 
> Remove unused text_poke_smp() and text_poke_smp_batch() functions", with 
> the the prerequisity patches missing, which effectively means it's 
> broken ... are you planning to fix that up, please?

That must be a Git server push-out delay - it should contain two patches:

 51b2c07b2226 x86: Make jump_label use int3-based patching
 fd4363fff3d9 x86: Introduce int3 (breakpoint)-based instruction patching

The kprobes patches are in perf/core, with x86/jumplabel merged in:

 ea8596bb2d8d kprobes/x86: Remove unused text_poke_smp() and text_poke_smp_batch() functions
 a7b0133ea94e kprobes/x86: Use text_poke_bp() instead of text_poke_smp*()
 c7e85c42be68 kprobes/x86: Remove an incorrect comment about int3 in NMI/MCE
 9bb15425c3bc Merge branch 'x86/jumplabel' into perf/core

Thanks,

	Ingo