From: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
To: Ingo Molnar <mingo@elte.hu>
Cc: linux-kernel@vger.kernel.org, yrl.pp-manager.tt@hitachi.com,
systemtap@sourceware.org, anderson@redhat.com,
Thomas Gleixner <tglx@linutronix.de>,
"H. Peter Anvin" <hpa@zytor.com>,
Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Subject: Re: [PATCH v3 -tip] [BUGFIX] x86/kprobes: Fix to recover instructions on optimized path
Date: Wed, 29 Feb 2012 13:21:00 -0000 [thread overview]
Message-ID: <4F4E262B.9030806@hitachi.com> (raw)
In-Reply-To: <20120228095953.GA17149@elte.hu>
(2012/02/28 18:59), Ingo Molnar wrote:
>
> * Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> wrote:
>
>> (2012/02/28 17:48), Ingo Molnar wrote:
>>>
>>> * Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> wrote:
>>>
>>>> (2012/02/27 18:34), Ingo Molnar wrote:
>>>>>
>>>>> * Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> wrote:
>>>>>
>>>>>> +
>>>>>> +#ifdef CONFIG_OPTPROBES
>>>>>> +static unsigned long __recover_optprobed_insn(struct kprobe *kp,
>>>>>> + kprobe_opcode_t *buf,
>>>>>> + unsigned long addr)
>>>>>> +{
>>>>>> + long offs = addr - (unsigned long)kp->addr - 1;
>>>>>> + struct optimized_kprobe *op = container_of(kp, struct optimized_kprobe, kp);
>>>>>> +
>>>>>> + /*
>>>>>> + * If the kprobe can be optimized, original bytes which can be
>>>>>> + * overwritten by jump destination address. In this case, original
>>>>>> + * bytes must be recovered from op->optinsn.copied_insn buffer.
>>>>>> + */
>>>>>> + memcpy(buf, (void *)addr, MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
>>>>>> + if (addr == (unsigned long)kp->addr) {
>>>>>> + buf[0] = kp->opcode;
>>>>>> + memcpy(buf + 1, op->optinsn.copied_insn, RELATIVE_ADDR_SIZE);
>>>>>> + } else
>>>>>> + memcpy(buf, op->optinsn.copied_insn + offs, RELATIVE_ADDR_SIZE - offs);
>>>>>> +
>>>>>> + return (unsigned long)buf;
>>>>>> +}
>>>>>> +#endif
>>>>>
>>>>> Why not stick this into a new kprobes-opt.c file?
>>>>
>>>> Would you mean that I should split all optprobe stuffs into
>>>> new file?
>>>
>>> Yeah, that would be sensible I think - and it might help avoid
>>> similar complications in the future.
>>>
>>> Could (and probably should) be done in a separate patch - to
>>> keep the bits that you already fixed and tested intact.
>>
>> OK, I'll make a separate patch.
>
> Could be done on top of your existing patch, to keep things
> simpler for you - a split-up patch done before your fix would
> create a lot of conflicts in the fix patch.
I see. And in the previous patch, I've just find a small
racing bug. I'll update it too.
Thank you,
--
Masami HIRAMATSU
Software Platform Research Dept. Linux Technology Center
Hitachi, Ltd., Yokohama Research Laboratory
E-mail: masami.hiramatsu.pt@hitachi.com
prev parent reply other threads:[~2012-02-29 13:21 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20120223083703.GA26781@elte.hu>
2012-02-24 9:54 ` Masami Hiramatsu
2012-02-27 9:34 ` Ingo Molnar
2012-02-28 2:53 ` Masami Hiramatsu
2012-02-28 8:49 ` Ingo Molnar
2012-02-28 9:52 ` Masami Hiramatsu
2012-02-28 10:00 ` Ingo Molnar
2012-02-29 13:21 ` Masami Hiramatsu [this message]
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=4F4E262B.9030806@hitachi.com \
--to=masami.hiramatsu.pt@hitachi.com \
--cc=ananth@in.ibm.com \
--cc=anderson@redhat.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=systemtap@sourceware.org \
--cc=tglx@linutronix.de \
--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 read-only IMAP folder(s) and NNTP newsgroup(s).