Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 kprobe fix from Thomas Gleixner:
"A single fix clearing the TF bit when a fault is single stepped"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
kprobes/x86: Clear TF bit in fault on single-stepping
+12
+12
arch/x86/kernel/kprobes/core.c
+12
arch/x86/kernel/kprobes/core.c
···
961
961
* normal page fault.
962
962
*/
963
963
regs->ip = (unsigned long)cur->addr;
964
+
/*
965
+
* Trap flag (TF) has been set here because this fault
966
+
* happened where the single stepping will be done.
967
+
* So clear it by resetting the current kprobe:
968
+
*/
969
+
regs->flags &= ~X86_EFLAGS_TF;
970
+
971
+
/*
972
+
* If the TF flag was set before the kprobe hit,
973
+
* don't touch it:
974
+
*/
964
975
regs->flags |= kcb->kprobe_old_flags;
976
+
965
977
if (kcb->kprobe_status == KPROBE_REENTER)
966
978
restore_previous_kprobe(kcb);
967
979
else