The patch titled
i386: entry.s::error_code is not safe for kprobes
has been removed from the -mm tree. Its filename is
i386-entryserror_code-is-not-safe-for-kprobes.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: i386: entry.s::error_code is not safe for kprobes
From: Chuck Ebbert <76306.1226@xxxxxxxxxxxxxx>
Because code marked unsafe for kprobes jumps directly to
entry.S::error_code, that must be marked unsafe as well. The easiest way
to do that is to move the page fault entry point to just before error_code
and let it inherit the same section.
Also moved all the ".previous" asm directives for kprobes sections to
column 1 and removed ".text" from them.
Signed-off-by: Chuck Ebbert <76306.1226@xxxxxxxxxxxxxx>
Cc: Prasanna S Panchamukhi <prasanna@xxxxxxxxxx>
Cc: Ananth N Mavinakayanahalli <ananth@xxxxxxxxxx>
Cc: Anil S Keshavamurthy <anil.s.keshavamurthy@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/i386/kernel/entry.S | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
diff -puN arch/i386/kernel/entry.S~i386-entryserror_code-is-not-safe-for-kprobes arch/i386/kernel/entry.S
--- a/arch/i386/kernel/entry.S~i386-entryserror_code-is-not-safe-for-kprobes
+++ a/arch/i386/kernel/entry.S
@@ -594,11 +594,9 @@ ENTRY(name) \
/* The include is where all of the SMP etc. interrupts come from */
#include "entry_arch.h"
-ENTRY(divide_error)
- RING0_INT_FRAME
- pushl $0 # no error code
- CFI_ADJUST_CFA_OFFSET 4
- pushl $do_divide_error
+KPROBE_ENTRY(page_fault)
+ RING0_EC_FRAME
+ pushl $do_page_fault
CFI_ADJUST_CFA_OFFSET 4
ALIGN
error_code:
@@ -648,6 +646,7 @@ error_code:
call *%edi
jmp ret_from_exception
CFI_ENDPROC
+.previous
ENTRY(coprocessor_error)
RING0_INT_FRAME
@@ -723,7 +722,8 @@ debug_stack_correct:
call do_debug
jmp ret_from_exception
CFI_ENDPROC
- .previous .text
+.previous
+
/*
* NMI is doubly nasty. It can happen _while_ we're handling
* a debug fault, and the debug fault hasn't yet been able to
@@ -819,7 +819,7 @@ KPROBE_ENTRY(int3)
call do_int3
jmp ret_from_exception
CFI_ENDPROC
- .previous .text
+.previous
ENTRY(overflow)
RING0_INT_FRAME
@@ -884,7 +884,7 @@ KPROBE_ENTRY(general_protection)
CFI_ADJUST_CFA_OFFSET 4
jmp error_code
CFI_ENDPROC
- .previous .text
+.previous
ENTRY(alignment_check)
RING0_EC_FRAME
@@ -893,13 +893,14 @@ ENTRY(alignment_check)
jmp error_code
CFI_ENDPROC
-KPROBE_ENTRY(page_fault)
- RING0_EC_FRAME
- pushl $do_page_fault
+ENTRY(divide_error)
+ RING0_INT_FRAME
+ pushl $0 # no error code
+ CFI_ADJUST_CFA_OFFSET 4
+ pushl $do_divide_error
CFI_ADJUST_CFA_OFFSET 4
jmp error_code
CFI_ENDPROC
- .previous .text
#ifdef CONFIG_X86_MCE
ENTRY(machine_check)
_
Patches currently in -mm which might be from 76306.1226@xxxxxxxxxxxxxx are
ptrace-make-pid-of-child-process-available-for.patch
i386-print-stack-size-in-oops-messages.patch
sleazy-fpu-feature-i386-support.patch
i386-early-fault-handler.patch
i386-fix-recursive-faults-during-oops-when-current.patch
i386-show_registers-try-harder-to-print-failing.patch
i386-fix-one-case-of-stuck-dwarf2-unwinder.patch
spinlock_debug-dont-recompute-jiffies_per_loop.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
