From: Masami Hiramatsu <mhiramat@kernel.org>
To: Peter Zijlstra <peterz@infradead.org>
Cc: Andy Lutomirski <luto@kernel.org>, Ingo Molnar <mingo@kernel.org>,
Oleg Nesterov <oleg@redhat.com>,
LKML <linux-kernel@vger.kernel.org>,
Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>,
"David S . Miller" <davem@davemloft.net>, X86 ML <x86@kernel.org>,
Andrew Cooper <andrew.cooper3@citrix.com>,
Steven Rostedt <rostedt@goodmis.org>
Subject: Re: [RFC PATCH 1/1] x86/kprobes: Use int3 instead of debug trap for single-step
Date: Tue, 2 Mar 2021 21:51:24 +0900 [thread overview]
Message-ID: <20210302215124.2614a36fdf084d514dabfc4d@kernel.org> (raw)
In-Reply-To: <YD39U0sz+IjV60VE@hirez.programming.kicks-ass.net>
On Tue, 2 Mar 2021 09:54:43 +0100
Peter Zijlstra <peterz@infradead.org> wrote:
> On Tue, Mar 02, 2021 at 09:41:32AM +0100, Peter Zijlstra wrote:
>
> > Aside of a few nits:
>
> something like so..
Thanks Peter,
I completely agree with that change!
Let me update the patch.
>
> --- a/arch/x86/kernel/kprobes/core.c
> +++ b/arch/x86/kernel/kprobes/core.c
> @@ -457,13 +457,20 @@ static void kprobe_emulate_call(struct k
> }
> NOKPROBE_SYMBOL(kprobe_emulate_call);
>
> -static void kprobe_emulate_jmp(struct kprobe *p, struct pt_regs *regs)
> +static __always_inline
> +void __kprobe_emulate_jmp(struct kprobe *p, struct pt_regs *regs, bool cond)
> {
> unsigned long ip = regs->ip - INT3_INSN_SIZE + p->ainsn.size;
>
> - ip += p->ainsn.rel32;
> + if (cond)
> + ip += p->ainsn.rel32;
> int3_emulate_jmp(regs, ip);
> }
> +
> +static void kprobe_emulate_jmp(struct kprobe *p, struct pt_regs *regs)
> +{
> + __kprobe_emulate_jmp(p, regs, true);
> +}
> NOKPROBE_SYMBOL(kprobe_emulate_jmp);
>
> static const unsigned long jcc_mask[6] = {
> @@ -488,10 +495,7 @@ static void kprobe_emulate_jcc(struct kp
> if (p->ainsn.jcc.type >= 0xe)
> match = match && (regs->flags & X86_EFLAGS_ZF);
> }
> - if ((match && !invert) || (!match && invert))
> - kprobe_emulate_jmp(p, regs);
> - else
> - regs->ip = regs->ip - INT3_INSN_SIZE + p->ainsn.size;
> + __kprobe_emulate_jmp(p, regs, (match && !invert) || (!match && invert));
> }
> NOKPROBE_SYMBOL(kprobe_emulate_jcc);
>
> @@ -524,10 +528,7 @@ static void kprobe_emulate_loop(struct k
> else if (p->ainsn.loop.type == 1) /* LOOPE */
> match = match && (regs->flags & X86_EFLAGS_ZF);
>
> - if (match)
> - kprobe_emulate_jmp(p, regs);
> - else
> - regs->ip = regs->ip - INT3_INSN_SIZE + p->ainsn.size;
> + __kprobe_emulate_jmp(p, regs, match);
> }
> NOKPROBE_SYMBOL(kprobe_emulate_loop);
>
> @@ -613,6 +614,12 @@ static int prepare_emulation(struct kpro
> else
> p->ainsn.rel32 = *(s32 *)&insn->immediate.value;
> break;
> + case 0x70 ... 0x7f:
> + /* 1 byte conditional jump */
> + p->ainsn.emulate_op = kprobe_emulate_jcc;
> + p->ainsn.jcc.type = opcode & 0xf;
> + p->ainsn.rel32 = *(char *)insn->immediate.bytes;
> + break;
> case 0x0f:
> opcode = insn->opcode.bytes[1];
> if ((opcode & 0xf0) == 0x80) {
> @@ -667,12 +674,7 @@ static int prepare_emulation(struct kpro
> #endif
> break;
> default:
> - if ((opcode & 0xf0) == 0x70) {
> - /* 1 byte conditional jump */
> - p->ainsn.emulate_op = kprobe_emulate_jcc;
> - p->ainsn.jcc.type = opcode & 0xf;
> - p->ainsn.rel32 = *(char *)insn->immediate.bytes;
> - }
> + break;
> }
> p->ainsn.size = insn->length;
>
--
Masami Hiramatsu <mhiramat@kernel.org>
next prev parent reply other threads:[~2021-03-02 15:16 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-23 23:24 Why do kprobes and uprobes singlestep? Andy Lutomirski
2021-02-24 1:17 ` Masami Hiramatsu
2021-02-24 19:45 ` Andy Lutomirski
2021-02-25 2:22 ` Masami Hiramatsu
2021-02-25 6:03 ` Andy Lutomirski
2021-02-25 9:11 ` Masami Hiramatsu
2021-03-01 14:08 ` [RFC PATCH 0/1] x86/kprobes: Remoev single-step trap from x86 kprobes Masami Hiramatsu
2021-03-01 14:08 ` [RFC PATCH 1/1] x86/kprobes: Use int3 instead of debug trap for single-step Masami Hiramatsu
2021-03-02 8:06 ` Peter Zijlstra
2021-03-02 8:38 ` Peter Zijlstra
2021-03-02 8:41 ` Peter Zijlstra
2021-03-02 8:54 ` Peter Zijlstra
2021-03-02 12:51 ` Masami Hiramatsu [this message]
2021-03-02 13:58 ` Peter Zijlstra
2021-03-02 15:25 ` [PATCH -tip 0/3] x86/kprobes: Remoev single-step trap from x86 kprobes Masami Hiramatsu
2021-03-02 15:25 ` [PATCH -tip 1/3] x86/kprobes: Retrieve correct opcode for group instruction Masami Hiramatsu
2021-03-23 15:15 ` [tip: x86/core] " tip-bot2 for Masami Hiramatsu
2021-03-02 15:25 ` [PATCH -tip 2/3] x86/kprobes: Identify far indirect JMP correctly Masami Hiramatsu
2021-03-23 15:15 ` [tip: x86/core] " tip-bot2 for Masami Hiramatsu
2021-03-02 15:25 ` [PATCH -tip 3/3] x86/kprobes: Use int3 instead of debug trap for single-step Masami Hiramatsu
2021-03-23 15:15 ` [tip: x86/core] " tip-bot2 for Masami Hiramatsu
2021-03-17 14:55 ` [PATCH -tip 0/3] x86/kprobes: Remoev single-step trap from x86 kprobes Masami Hiramatsu
2021-03-17 16:26 ` Peter Zijlstra
2021-03-17 17:45 ` Andy Lutomirski
2021-02-25 9:59 ` Why do kprobes and uprobes singlestep? Peter Zijlstra
2021-03-01 16:51 ` Oleg Nesterov
2021-03-02 1:36 ` Andy Lutomirski
2021-03-02 20:24 ` Alexei Starovoitov
2021-03-02 21:02 ` Andy Lutomirski
2021-03-03 1:22 ` Alexei Starovoitov
2021-03-03 1:46 ` Andy Lutomirski
2021-03-03 2:18 ` Alexei Starovoitov
2021-03-03 13:27 ` Oleg Nesterov
2021-03-03 18:11 ` Daniel Xu
2021-03-03 19:14 ` Andy Lutomirski
2021-03-02 20:25 ` Oleg Nesterov
2021-03-02 20:35 ` Andy Lutomirski
2021-03-02 20:28 ` Oleg Nesterov
2021-03-02 2:22 ` Masami Hiramatsu
2021-03-02 2:48 ` Andy Lutomirski
2021-03-02 20:31 ` Oleg Nesterov
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=20210302215124.2614a36fdf084d514dabfc4d@kernel.org \
--to=mhiramat@kernel.org \
--cc=andrew.cooper3@citrix.com \
--cc=anil.s.keshavamurthy@intel.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mingo@kernel.org \
--cc=oleg@redhat.com \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=x86@kernel.org \
/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
Powered by JetHome