From: Ingo Molnar <mingo@kernel.org>
To: Jiri Kosina <jkosina@suse.cz>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>,
Ingo Molnar <mingo@redhat.com>,
linux-kernel@vger.kernel.org,
"H. Peter Anvin" <hpa@linux.intel.com>,
Steven Rostedt <rostedt@goodmis.org>,
Jason Baron <jbaron@akamai.com>,
yrl.pp-manager.tt@hitachi.com, Borislav Petkov <bpetkov@suse.de>
Subject: Re: [PATCH -tip 3/3] x86: Remove unused text_poke_smp and text_poke_smp_batch
Date: Tue, 23 Jul 2013 10:10:46 +0200 [thread overview]
Message-ID: <20130723081046.GA16088@gmail.com> (raw)
In-Reply-To: <alpine.LNX.2.00.1307221545080.23128@pobox.suse.cz>
* 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
next prev parent reply other threads:[~2013-07-23 8:11 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-18 11:47 [PATCH -tip 0/3] kprobes, x86: Move optprobe on top of int3-based instruction patching Masami Hiramatsu
2013-07-18 11:47 ` [PATCH -tip 1/3] [CLEANUP] kprobes/x86: Remove an incorrect comment about int3 in NMI/MCE Masami Hiramatsu
2013-07-21 13:43 ` [tip:perf/core] " tip-bot for Masami Hiramatsu
2013-07-18 11:47 ` [PATCH -tip 2/3] kprobes/x86: Use text_poke_bp() instead of text_poke_smp*() Masami Hiramatsu
2013-07-21 13:43 ` [tip:perf/core] " tip-bot for Masami Hiramatsu
2013-07-18 11:47 ` [PATCH -tip 3/3] x86: Remove unused text_poke_smp and text_poke_smp_batch Masami Hiramatsu
2013-07-21 13:43 ` [tip:perf/core] kprobes/x86: Remove unused text_poke_smp() and text_poke_smp_batch() functions tip-bot for Masami Hiramatsu
2013-07-22 7:18 ` [tip:x86/jumplabel] " tip-bot for Masami Hiramatsu
2013-07-22 7:43 ` [PATCH -tip 3/3] x86: Remove unused text_poke_smp and text_poke_smp_batch Ingo Molnar
2013-07-22 8:04 ` Masami Hiramatsu
2013-07-22 8:21 ` Ingo Molnar
2013-07-22 8:38 ` Masami Hiramatsu
2013-07-22 10:01 ` Ingo Molnar
2013-07-22 10:11 ` Masami Hiramatsu
2013-07-22 10:21 ` Ingo Molnar
2013-07-22 13:53 ` Jiri Kosina
2013-07-23 8:10 ` Ingo Molnar [this message]
2013-07-18 22:24 ` [PATCH -tip 0/3] kprobes, x86: Move optprobe on top of int3-based instruction patching Jiri Kosina
2013-07-20 1:35 ` Steven Rostedt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130723081046.GA16088@gmail.com \
--to=mingo@kernel.org \
--cc=bpetkov@suse.de \
--cc=hpa@linux.intel.com \
--cc=jbaron@akamai.com \
--cc=jkosina@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=masami.hiramatsu.pt@hitachi.com \
--cc=mingo@redhat.com \
--cc=rostedt@goodmis.org \
--cc=yrl.pp-manager.tt@hitachi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).