traps: i386: make do_trap more like x86_64

This patch hardcodes which traps should be forwarded to
handle_vm86_trap in do_trap. This allows to remove the
vm86 parameter from the i386-version of do_trap, which
makes the DO_VM86_ERROR and DO_VM86_ERROR_INFO macros
unnecessary.

x86_64 part is whitespace only.

Signed-off-by: Alexander van Heukelum <heukelum@fastmail.fm>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/x86/kernel/traps_32.c b/arch/x86/kernel/traps_32.c
index ab55936508993779990ec27e455b74701a539d21..bf4d71231d401955d273d4287f1afb318b56a936 100644 (file)
--- a/arch/x86/kernel/traps_32.c
+++ b/arch/x86/kernel/traps_32.c
@@ -482,13 +482,17 @@ die_if_kernel(const char *str, struct pt_regs *regs, long err)
 }
 
 static void __kprobes
-do_trap(int trapnr, int signr, char *str, int vm86, struct pt_regs *regs,
+do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
        long error_code, siginfo_t *info)
 {
        struct task_struct *tsk = current;
 
        if (regs->flags & X86_VM_MASK) {
-               if (vm86)
+               /*
+                * traps 0, 1, 3, 4, and 5 should be forwarded to vm86.
+                * On nmi (interrupt 2), do_trap should not be called.
+                */
+               if (trapnr < 6)
                        goto vm86_trap;
                goto trap_signal;
        }
@@ -537,37 +541,10 @@ void do_##name(struct pt_regs *regs, long error_code)                     \
                                                        == NOTIFY_STOP) \
                return;                                                 \
        conditional_sti(regs);                                          \
-       do_trap(trapnr, signr, str, 0, regs, error_code, NULL);         \
-}
-
-#define DO_ERROR_INFO(trapnr, signr, str, name, sicode, siaddr, irq)   \
-void do_##name(struct pt_regs *regs, long error_code)                  \
-{                                                                      \
-       siginfo_t info;                                                 \
-       if (irq)                                                        \
-               local_irq_enable();                                     \
-       info.si_signo = signr;                                          \
-       info.si_errno = 0;                                              \
-       info.si_code = sicode;                                          \
-       info.si_addr = (void __user *)siaddr;                           \
-       if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr)  \
-                                                       == NOTIFY_STOP) \
-               return;                                                 \
-       conditional_sti(regs);                                          \
-       do_trap(trapnr, signr, str, 0, regs, error_code, &info);        \
-}
-
-#define DO_VM86_ERROR(trapnr, signr, str, name)                                \
-void do_##name(struct pt_regs *regs, long error_code)                  \
-{                                                                      \
-       if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr)  \
-                                                       == NOTIFY_STOP) \
-               return;                                                 \
-       conditional_sti(regs);                                          \
-       do_trap(trapnr, signr, str, 1, regs, error_code, NULL);         \
+       do_trap(trapnr, signr, str, regs, error_code, NULL);            \
 }
 
-#define DO_VM86_ERROR_INFO(trapnr, signr, str, name, sicode, siaddr)   \
+#define DO_ERROR_INFO(trapnr, signr, str, name, sicode, siaddr)                \
 void do_##name(struct pt_regs *regs, long error_code)                  \
 {                                                                      \
        siginfo_t info;                                                 \
@@ -579,18 +556,18 @@ void do_##name(struct pt_regs *regs, long error_code)                     \
                                                        == NOTIFY_STOP) \
                return;                                                 \
        conditional_sti(regs);                                          \
-       do_trap(trapnr, signr, str, 1, regs, error_code, &info);        \
+       do_trap(trapnr, signr, str, regs, error_code, &info);           \
 }
 
-DO_VM86_ERROR_INFO(0, SIGFPE, "divide error", divide_error, FPE_INTDIV, regs->ip)
-DO_VM86_ERROR(4, SIGSEGV, "overflow", overflow)
-DO_VM86_ERROR(5, SIGSEGV, "bounds", bounds)
-DO_ERROR_INFO(6, SIGILL, "invalid opcode", invalid_op, ILL_ILLOPN, regs->ip, 0)
+DO_ERROR_INFO(0, SIGFPE, "divide error", divide_error, FPE_INTDIV, regs->ip)
+DO_ERROR(4, SIGSEGV, "overflow", overflow)
+DO_ERROR(5, SIGSEGV, "bounds", bounds)
+DO_ERROR_INFO(6, SIGILL, "invalid opcode", invalid_op, ILL_ILLOPN, regs->ip)
 DO_ERROR(9, SIGFPE, "coprocessor segment overrun", coprocessor_segment_overrun)
 DO_ERROR(10, SIGSEGV, "invalid TSS", invalid_TSS)
 DO_ERROR(11, SIGBUS, "segment not present", segment_not_present)
 DO_ERROR(12, SIGBUS, "stack segment", stack_segment)
-DO_ERROR_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0, 0)
+DO_ERROR_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0)
 
 void __kprobes
 do_general_protection(struct pt_regs *regs, long error_code)
@@ -868,7 +845,7 @@ void __kprobes do_int3(struct pt_regs *regs, long error_code)
                return;
 #endif
 
-       do_trap(3, SIGTRAP, "int3", 1, regs, error_code, NULL);
+       do_trap(3, SIGTRAP, "int3", regs, error_code, NULL);
 }
 
 /*
@@ -1214,7 +1191,7 @@ void do_iret_error(struct pt_regs *regs, long error_code)
        if (notify_die(DIE_TRAP, "iret exception",
                        regs, error_code, 32, SIGILL) == NOTIFY_STOP)
                return;
-       do_trap(32, SIGILL, "iret exception", 0, regs, error_code, &info);
+       do_trap(32, SIGILL, "iret exception", regs, error_code, &info);
 }
 
 void __init trap_init(void)

diff --git a/arch/x86/kernel/traps_64.c b/arch/x86/kernel/traps_64.c
index 7d59559c2dff87a9bbafabdf9d9585ae05542357..1efd1ea6466350f9e24b8767857f641719fdae17 100644 (file)
--- a/arch/x86/kernel/traps_64.c
+++ b/arch/x86/kernel/traps_64.c
@@ -640,7 +640,7 @@ kernel_trap:
        return;
 }
 
-#define DO_ERROR(trapnr, signr, str, name) \
+#define DO_ERROR(trapnr, signr, str, name)                             \
 asmlinkage void do_##name(struct pt_regs *regs, long error_code)       \
 {                                                                      \
        if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr)  \