mbox series

[-tip,v4,0/2] x86/kprobes: Fix to check not-kprobe's int3 correctly

Message ID 167146050052.1374301.10407562178447545337.stgit@devnote3
Headers
Series x86/kprobes: Fix to check not-kprobe's int3 correctly |

Message

Masami Hiramatsu (Google) Dec. 19, 2022, 2:35 p.m. UTC 
  Hi,

Here is 4th version of the patches to fix kprobes and optprobe with
CONFIG_RETHUNK and CONFIG_SLS.
Previous version is here;

https://lore.kernel.org/all/166264927154.775585.16570756675363838701.stgit@devnote2/

I just ported the v3 on the latest -tip tree.

With CONFIG_RETHUNK/CONFIG_SLS and after many efforts, the kernel
functions may includes INT3 for stopping speculative execution in the
function code block (body) in addition to the gaps between functions.

Since kprobes on x86 has to ensure the probe address is an instruction
bondary, it decodes the instructions in the function until the address.
If it finds an INT3 which is not embedded by kprobe, it stops decoding
because usually the INT3 is used for debugging as a software breakpoint
and such INT3 will replace the first byte of an original instruction.
Thus the kprobes returns -EILSEQ as below.

 # echo 'p:probe/resched_curr_L21 resched_curr+98' >> dynamic_events 
 sh: write error: Invalid or incomplete multibyte or wide character

Actually, such INT3 can be ignored except the INT3 installed dynamically
by kgdb.
To avoid this issue, just check whether the INT3 is owned by kgdb
or not and if so, it just stopped and return failure.

With thses fixes, kprobe and optprobe can probe the kernel again with
CONFIG_RETHUNK=y.

Thank you,


---

Masami Hiramatsu (Google) (2):
      x86/kprobes: Fix kprobes instruction boudary check with CONFIG_RETHUNK
      x86/kprobes: Fix optprobe optimization check with CONFIG_RETHUNK


 arch/x86/kernel/kprobes/core.c |   10 +++++++---
 arch/x86/kernel/kprobes/opt.c  |   28 ++++++++--------------------
 2 files changed, 15 insertions(+), 23 deletions(-)

Comments

Peter Zijlstra Dec. 19, 2022, 3:23 p.m. UTC | #1 
On Mon, Dec 19, 2022 at 11:35:00PM +0900, Masami Hiramatsu (Google) wrote:
> Masami Hiramatsu (Google) (2):
>       x86/kprobes: Fix kprobes instruction boudary check with CONFIG_RETHUNK
>       x86/kprobes: Fix optprobe optimization check with CONFIG_RETHUNK
> 

Thanks, I'll go queue these in x86/urgent after -rc1 happens.