Skip to content

L
linux
Commit b5964405 authored by Ingo Molnar's avatar Ingo Molnar
Browse files
Options

x86: clean up traps_32.c 

Before:
   total: 86 errors, 29 warnings, 1248 lines checked
After:
   total: 0 errors, 17 warnings, 1281 lines checked

No code changed:

arch/x86/kernel/traps_32.o:

   text	   data	    bss	    dec	    hex	filename
   8711	   2168	     72	  10951	   2ac7	traps_32.o.before
   8711	   2168	     72	  10951	   2ac7	traps_32.o.after

(md5 sums differ because some stack offset positions changed.)
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 10cd5a1e
Show whitespace changes
Inline Side-by-side
Showing with 318 additions and 286 deletions
arch/x86/kernel/traps_32.c
View file @ b5964405
...@@ -9,26 +9,28 @@ ...@@ -9,26 +9,28 @@
* 'Traps.c' handles hardware traps and faults after we have saved some * 'Traps.c' handles hardware traps and faults after we have saved some
* state in 'asm.s'. * state in 'asm.s'.
*/ */
#include <linux/sched.h> #include <linux/interrupt.h>
#include <linux/kallsyms.h>
#include <linux/spinlock.h>
#include <linux/highmem.h>
#include <linux/kprobes.h>
#include <linux/uaccess.h>
#include <linux/utsname.h>
#include <linux/kdebug.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h>
#include <linux/ptrace.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/unwind.h>
#include <linux/delay.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/kexec.h>
#include <linux/sched.h>
#include <linux/timer.h> #include <linux/timer.h>
#include <linux/mm.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/delay.h>
#include <linux/spinlock.h>
#include <linux/interrupt.h>
#include <linux/highmem.h>
#include <linux/kallsyms.h>
#include <linux/ptrace.h>
#include <linux/utsname.h>
#include <linux/kprobes.h>
#include <linux/kexec.h>
#include <linux/unwind.h>
#include <linux/uaccess.h>
#include <linux/nmi.h>
#include <linux/bug.h> #include <linux/bug.h>
#include <linux/nmi.h>
#include <linux/mm.h>
#ifdef CONFIG_EISA #ifdef CONFIG_EISA
#include <linux/ioport.h> #include <linux/ioport.h>
...@@ -43,21 +45,18 @@ ...@@ -43,21 +45,18 @@
#include <linux/edac.h> #include <linux/edac.h>
#endif #endif
#include <asm/arch_hooks.h>
#include <asm/stacktrace.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/system.h>
#include <asm/io.h>
#include <asm/atomic.h>
#include <asm/debugreg.h> #include <asm/debugreg.h>
#include <asm/atomic.h>
#include <asm/system.h>
#include <asm/unwind.h>
#include <asm/desc.h> #include <asm/desc.h>
#include <asm/i387.h> #include <asm/i387.h>
#include <asm/nmi.h> #include <asm/nmi.h>
#include <asm/unwind.h>
#include <asm/smp.h> #include <asm/smp.h>
#include <asm/arch_hooks.h> #include <asm/io.h>
#include <linux/kdebug.h>
#include <asm/stacktrace.h>
#include <linux/module.h>
#include "mach_traps.h" #include "mach_traps.h"
...@@ -69,7 +68,7 @@ EXPORT_SYMBOL_GPL(used_vectors); ...@@ -69,7 +68,7 @@ EXPORT_SYMBOL_GPL(used_vectors);
asmlinkage int system_call(void); asmlinkage int system_call(void);
/* Do we ignore FPU interrupts ? */ /* Do we ignore FPU interrupts ? */
char ignore_fpu_irq = 0; char ignore_fpu_irq;
/* /*
* The IDT has to be page-aligned to simplify the Pentium * The IDT has to be page-aligned to simplify the Pentium
...@@ -105,12 +104,13 @@ static unsigned int code_bytes = 64; ...@@ -105,12 +104,13 @@ static unsigned int code_bytes = 64;
void printk_address(unsigned long address, int reliable) void printk_address(unsigned long address, int reliable)
{ {
#ifdef CONFIG_KALLSYMS #ifdef CONFIG_KALLSYMS
unsigned long offset = 0, symsize; char namebuf[KSYM_NAME_LEN];
unsigned long offset = 0;
unsigned long symsize;
const char *symname; const char *symname;
char *modname;
char *delim = ":";
char namebuf[128];
char reliab[4] = ""; char reliab[4] = "";
char *delim = ":";
char *modname;
symname = kallsyms_lookup(address, &symsize, &offset, symname = kallsyms_lookup(address, &symsize, &offset,
&modname, namebuf); &modname, namebuf);
...@@ -142,7 +142,8 @@ struct stack_frame { ...@@ -142,7 +142,8 @@ struct stack_frame {
unsigned long return_address; unsigned long return_address;
}; };
static inline unsigned long print_context_stack(struct thread_info *tinfo, static inline unsigned long
print_context_stack(struct thread_info *tinfo,
unsigned long *stack, unsigned long bp, unsigned long *stack, unsigned long bp,
const struct stacktrace_ops *ops, void *data) const struct stacktrace_ops *ops, void *data)
{ {
...@@ -177,6 +178,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs, ...@@ -177,6 +178,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
if (!stack) { if (!stack) {
unsigned long dummy; unsigned long dummy;
stack = &dummy; stack = &dummy;
if (task != current) if (task != current)
stack = (unsigned long *)task->thread.sp; stack = (unsigned long *)task->thread.sp;
...@@ -186,7 +188,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs, ...@@ -186,7 +188,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
if (!bp) { if (!bp) {
if (task == current) { if (task == current) {
/* Grab bp right from our regs */ /* Grab bp right from our regs */
asm ("movl %%ebp, %0" : "=r" (bp) : ); asm("movl %%ebp, %0" : "=r" (bp) :);
} else { } else {
/* bp is the last reg pushed by switch_to */ /* bp is the last reg pushed by switch_to */
bp = *(unsigned long *) task->thread.sp; bp = *(unsigned long *) task->thread.sp;
...@@ -196,15 +198,18 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs, ...@@ -196,15 +198,18 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
while (1) { while (1) {
struct thread_info *context; struct thread_info *context;
context = (struct thread_info *) context = (struct thread_info *)
((unsigned long)stack & (~(THREAD_SIZE - 1))); ((unsigned long)stack & (~(THREAD_SIZE - 1)));
bp = print_context_stack(context, stack, bp, ops, data); bp = print_context_stack(context, stack, bp, ops, data);
/* Should be after the line below, but somewhere /*
in early boot context comes out corrupted and we * Should be after the line below, but somewhere
can't reference it -AK */ * in early boot context comes out corrupted and we
* can't reference it:
*/
if (ops->stack(data, "IRQ") < 0) if (ops->stack(data, "IRQ") < 0)
break; break;
stack = (unsigned long*)context->previous_esp; stack = (unsigned long *)context->previous_esp;
if (!stack) if (!stack)
break; break;
touch_nmi_watchdog(); touch_nmi_watchdog();
...@@ -263,7 +268,8 @@ void show_trace(struct task_struct *task, struct pt_regs *regs, ...@@ -263,7 +268,8 @@ void show_trace(struct task_struct *task, struct pt_regs *regs,
show_trace_log_lvl(task, regs, stack, bp, ""); show_trace_log_lvl(task, regs, stack, bp, "");
} }
static void show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs, static void
show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs,
unsigned long *sp, unsigned long bp, char *log_lvl) unsigned long *sp, unsigned long bp, char *log_lvl)
{ {
unsigned long *stack; unsigned long *stack;
...@@ -271,13 +277,13 @@ static void show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs, ...@@ -271,13 +277,13 @@ static void show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs,
if (sp == NULL) { if (sp == NULL) {
if (task) if (task)
sp = (unsigned long*)task->thread.sp; sp = (unsigned long *)task->thread.sp;
else else
sp = (unsigned long *)&sp; sp = (unsigned long *)&sp;
} }
stack = sp; stack = sp;
for(i = 0; i < kstack_depth_to_print; i++) { for (i = 0; i < kstack_depth_to_print; i++) {
if (kstack_end(stack)) if (kstack_end(stack))
break; break;
if (i && ((i % 8) == 0)) if (i && ((i % 8) == 0))
...@@ -285,6 +291,7 @@ static void show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs, ...@@ -285,6 +291,7 @@ static void show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs,
printk("%08lx ", *stack++); printk("%08lx ", *stack++);
} }
printk("\n%sCall Trace:\n", log_lvl); printk("\n%sCall Trace:\n", log_lvl);
show_trace_log_lvl(task, regs, sp, bp, log_lvl); show_trace_log_lvl(task, regs, sp, bp, log_lvl);
} }
...@@ -299,8 +306,8 @@ void show_stack(struct task_struct *task, unsigned long *sp) ...@@ -299,8 +306,8 @@ void show_stack(struct task_struct *task, unsigned long *sp)
*/ */
void dump_stack(void) void dump_stack(void)
{ {
unsigned long stack;
unsigned long bp = 0; unsigned long bp = 0;
unsigned long stack;
#ifdef CONFIG_FRAME_POINTER #ifdef CONFIG_FRAME_POINTER
if (!bp) if (!bp)
...@@ -312,6 +319,7 @@ void dump_stack(void) ...@@ -312,6 +319,7 @@ void dump_stack(void)
init_utsname()->release, init_utsname()->release,
(int)strcspn(init_utsname()->version, " "), (int)strcspn(init_utsname()->version, " "),
init_utsname()->version); init_utsname()->version);
show_trace(current, NULL, &stack, bp); show_trace(current, NULL, &stack, bp);
} }
...@@ -323,6 +331,7 @@ void show_registers(struct pt_regs *regs) ...@@ -323,6 +331,7 @@ void show_registers(struct pt_regs *regs)
print_modules(); print_modules();
__show_registers(regs, 0); __show_registers(regs, 0);
printk(KERN_EMERG "Process %.*s (pid: %d, ti=%p task=%p task.ti=%p)", printk(KERN_EMERG "Process %.*s (pid: %d, ti=%p task=%p task.ti=%p)",
TASK_COMM_LEN, current->comm, task_pid_nr(current), TASK_COMM_LEN, current->comm, task_pid_nr(current),
current_thread_info(), current, task_thread_info(current)); current_thread_info(), current, task_thread_info(current));
...@@ -331,10 +340,10 @@ void show_registers(struct pt_regs *regs) ...@@ -331,10 +340,10 @@ void show_registers(struct pt_regs *regs)
* time of the fault.. * time of the fault..
*/ */
if (!user_mode_vm(regs)) { if (!user_mode_vm(regs)) {
u8 *ip;
unsigned int code_prologue = code_bytes * 43 / 64; unsigned int code_prologue = code_bytes * 43 / 64;
unsigned int code_len = code_bytes; unsigned int code_len = code_bytes;
unsigned char c; unsigned char c;
u8 *ip;
printk("\n" KERN_EMERG "Stack: "); printk("\n" KERN_EMERG "Stack: ");
show_stack_log_lvl(NULL, regs, &regs->sp, 0, KERN_EMERG); show_stack_log_lvl(NULL, regs, &regs->sp, 0, KERN_EMERG);
...@@ -377,10 +386,10 @@ int is_valid_bugaddr(unsigned long ip) ...@@ -377,10 +386,10 @@ int is_valid_bugaddr(unsigned long ip)
static int die_counter; static int die_counter;
int __kprobes __die(const char * str, struct pt_regs * regs, long err) int __kprobes __die(const char *str, struct pt_regs *regs, long err)
{ {
unsigned long sp;
unsigned short ss; unsigned short ss;
unsigned long sp;
printk(KERN_EMERG "%s: %04lx [#%d] ", str, err & 0xffff, ++die_counter); printk(KERN_EMERG "%s: %04lx [#%d] ", str, err & 0xffff, ++die_counter);
#ifdef CONFIG_PREEMPT #ifdef CONFIG_PREEMPT
...@@ -395,8 +404,8 @@ int __kprobes __die(const char * str, struct pt_regs * regs, long err) ...@@ -395,8 +404,8 @@ int __kprobes __die(const char * str, struct pt_regs * regs, long err)
printk("\n"); printk("\n");
if (notify_die(DIE_OOPS, str, regs, err, if (notify_die(DIE_OOPS, str, regs, err,
current->thread.trap_no, SIGSEGV) != current->thread.trap_no, SIGSEGV) != NOTIFY_STOP) {
NOTIFY_STOP) {
show_registers(regs); show_registers(regs);
/* Executive summary in case the oops scrolled away */ /* Executive summary in case the oops scrolled away */
sp = (unsigned long) (&regs->sp); sp = (unsigned long) (&regs->sp);
...@@ -408,17 +417,18 @@ int __kprobes __die(const char * str, struct pt_regs * regs, long err) ...@@ -408,17 +417,18 @@ int __kprobes __die(const char * str, struct pt_regs * regs, long err)
printk(KERN_EMERG "EIP: [<%08lx>] ", regs->ip); printk(KERN_EMERG "EIP: [<%08lx>] ", regs->ip);
print_symbol("%s", regs->ip); print_symbol("%s", regs->ip);
printk(" SS:ESP %04x:%08lx\n", ss, sp); printk(" SS:ESP %04x:%08lx\n", ss, sp);
return 0; return 0;
} else {
return 1;
} }
return 1;
} }
/* /*
* This is gone through when something in the kernel has done something bad and * This is gone through when something in the kernel has done something bad
* is about to be terminated. * and is about to be terminated:
*/ */
void die(const char * str, struct pt_regs * regs, long err) void die(const char *str, struct pt_regs *regs, long err)
{ {
static struct { static struct {
raw_spinlock_t lock; raw_spinlock_t lock;
...@@ -440,8 +450,9 @@ void die(const char * str, struct pt_regs * regs, long err) ...@@ -440,8 +450,9 @@ void die(const char * str, struct pt_regs * regs, long err)
die.lock_owner = smp_processor_id(); die.lock_owner = smp_processor_id();
die.lock_owner_depth = 0; die.lock_owner_depth = 0;
bust_spinlocks(1); bust_spinlocks(1);
} else } else {
raw_local_irq_save(flags); raw_local_irq_save(flags);
}
if (++die.lock_owner_depth < 3) { if (++die.lock_owner_depth < 3) {
report_bug(regs->ip, regs); report_bug(regs->ip, regs);
...@@ -474,15 +485,16 @@ void die(const char * str, struct pt_regs * regs, long err) ...@@ -474,15 +485,16 @@ void die(const char * str, struct pt_regs * regs, long err)
do_exit(SIGSEGV); do_exit(SIGSEGV);
} }
static inline void die_if_kernel(const char * str, struct pt_regs * regs, long err) static inline void
die_if_kernel(const char *str, struct pt_regs *regs, long err)
{ {
if (!user_mode_vm(regs)) if (!user_mode_vm(regs))
die(str, regs, err); die(str, regs, err);
} }
static void __kprobes do_trap(int trapnr, int signr, char *str, int vm86, static void __kprobes
struct pt_regs * regs, long error_code, do_trap(int trapnr, int signr, char *str, int vm86, struct pt_regs *regs,
siginfo_t *info) long error_code, siginfo_t *info)
{ {
struct task_struct *tsk = current; struct task_struct *tsk = current;
...@@ -495,7 +507,7 @@ static void __kprobes do_trap(int trapnr, int signr, char *str, int vm86, ...@@ -495,7 +507,7 @@ static void __kprobes do_trap(int trapnr, int signr, char *str, int vm86,
if (!user_mode(regs)) if (!user_mode(regs))
goto kernel_trap; goto kernel_trap;
trap_signal: { trap_signal:
/* /*
* We want error_code and trap_no set for userspace faults and * We want error_code and trap_no set for userspace faults and
* kernelspace faults which result in die(), but not * kernelspace faults which result in die(), but not
...@@ -513,26 +525,24 @@ static void __kprobes do_trap(int trapnr, int signr, char *str, int vm86, ...@@ -513,26 +525,24 @@ static void __kprobes do_trap(int trapnr, int signr, char *str, int vm86,
else else
force_sig(signr, tsk); force_sig(signr, tsk);
return; return;
}
kernel_trap: { kernel_trap:
if (!fixup_exception(regs)) { if (!fixup_exception(regs)) {
tsk->thread.error_code = error_code; tsk->thread.error_code = error_code;
tsk->thread.trap_no = trapnr; tsk->thread.trap_no = trapnr;
die(str, regs, error_code); die(str, regs, error_code);
} }
return; return;
}
vm86_trap: { vm86_trap:
int ret = handle_vm86_trap((struct kernel_vm86_regs *) regs, error_code, trapnr); if (handle_vm86_trap((struct kernel_vm86_regs *) regs,
if (ret) goto trap_signal; error_code, trapnr))
goto trap_signal;
return; return;
}
} }
#define DO_ERROR(trapnr, signr, str, name) \ #define DO_ERROR(trapnr, signr, str, name) \
void do_##name(struct pt_regs * regs, long error_code) \ void do_##name(struct pt_regs *regs, long error_code) \
{ \ { \
if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr) \ if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr) \
== NOTIFY_STOP) \ == NOTIFY_STOP) \
...@@ -541,7 +551,7 @@ void do_##name(struct pt_regs * regs, long error_code) \ ...@@ -541,7 +551,7 @@ void do_##name(struct pt_regs * regs, long error_code) \
} }
#define DO_ERROR_INFO(trapnr, signr, str, name, sicode, siaddr, irq) \ #define DO_ERROR_INFO(trapnr, signr, str, name, sicode, siaddr, irq) \
void do_##name(struct pt_regs * regs, long error_code) \ void do_##name(struct pt_regs *regs, long error_code) \
{ \ { \
siginfo_t info; \ siginfo_t info; \
if (irq) \ if (irq) \
...@@ -557,7 +567,7 @@ void do_##name(struct pt_regs * regs, long error_code) \ ...@@ -557,7 +567,7 @@ void do_##name(struct pt_regs * regs, long error_code) \
} }
#define DO_VM86_ERROR(trapnr, signr, str, name) \ #define DO_VM86_ERROR(trapnr, signr, str, name) \
void do_##name(struct pt_regs * regs, long error_code) \ void do_##name(struct pt_regs *regs, long error_code) \
{ \ { \
if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr) \ if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr) \
== NOTIFY_STOP) \ == NOTIFY_STOP) \
...@@ -566,7 +576,7 @@ void do_##name(struct pt_regs * regs, long error_code) \ ...@@ -566,7 +576,7 @@ void do_##name(struct pt_regs * regs, long error_code) \
} }
#define DO_VM86_ERROR_INFO(trapnr, signr, str, name, sicode, siaddr) \ #define DO_VM86_ERROR_INFO(trapnr, signr, str, name, sicode, siaddr) \
void do_##name(struct pt_regs * regs, long error_code) \ void do_##name(struct pt_regs *regs, long error_code) \
{ \ { \
siginfo_t info; \ siginfo_t info; \
info.si_signo = signr; \ info.si_signo = signr; \
...@@ -580,26 +590,29 @@ void do_##name(struct pt_regs * regs, long error_code) \ ...@@ -580,26 +590,29 @@ void do_##name(struct pt_regs * regs, long error_code) \
do_trap(trapnr, signr, str, 1, regs, error_code, &info); \ do_trap(trapnr, signr, str, 1, regs, error_code, &info); \
} }
DO_VM86_ERROR_INFO( 0, SIGFPE, "divide error", divide_error, FPE_INTDIV, regs->ip) DO_VM86_ERROR_INFO(0, SIGFPE, "divide error", divide_error, FPE_INTDIV, regs->ip)
#ifndef CONFIG_KPROBES #ifndef CONFIG_KPROBES
DO_VM86_ERROR( 3, SIGTRAP, "int3", int3) DO_VM86_ERROR(3, SIGTRAP, "int3", int3)
#endif #endif
DO_VM86_ERROR( 4, SIGSEGV, "overflow", overflow) DO_VM86_ERROR(4, SIGSEGV, "overflow", overflow)
DO_VM86_ERROR( 5, SIGSEGV, "bounds", bounds) DO_VM86_ERROR(5, SIGSEGV, "bounds", bounds)
DO_ERROR_INFO( 6, SIGILL, "invalid opcode", invalid_op, ILL_ILLOPN, regs->ip, 0) DO_ERROR_INFO(6, SIGILL, "invalid opcode", invalid_op, ILL_ILLOPN, regs->ip, 0)
DO_ERROR( 9, SIGFPE, "coprocessor segment overrun", coprocessor_segment_overrun) DO_ERROR(9, SIGFPE, "coprocessor segment overrun", coprocessor_segment_overrun)
DO_ERROR(10, SIGSEGV, "invalid TSS", invalid_TSS) DO_ERROR(10, SIGSEGV, "invalid TSS", invalid_TSS)
DO_ERROR(11, SIGBUS, "segment not present", segment_not_present) DO_ERROR(11, SIGBUS, "segment not present", segment_not_present)
DO_ERROR(12, SIGBUS, "stack segment", stack_segment) 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, 0)
DO_ERROR_INFO(32, SIGSEGV, "iret exception", iret_error, ILL_BADSTK, 0, 1) DO_ERROR_INFO(32, SIGSEGV, "iret exception", iret_error, ILL_BADSTK, 0, 1)
void __kprobes do_general_protection(struct pt_regs * regs, void __kprobes do_general_protection(struct pt_regs *regs, long error_code)
long error_code)
{ {
int cpu = get_cpu(); struct thread_struct *thread;
struct tss_struct *tss = &per_cpu(init_tss, cpu); struct tss_struct *tss;
struct thread_struct *thread = &current->thread; int cpu;
cpu = get_cpu();
tss = &per_cpu(init_tss, cpu);
thread = &current->thread;
/* /*
* Perform the lazy TSS's I/O bitmap copy. If the TSS has an * Perform the lazy TSS's I/O bitmap copy. If the TSS has an
...@@ -616,14 +629,16 @@ void __kprobes do_general_protection(struct pt_regs * regs, ...@@ -616,14 +629,16 @@ void __kprobes do_general_protection(struct pt_regs * regs,
* If the previously set map was extending to higher ports * If the previously set map was extending to higher ports
* than the current one, pad extra space with 0xff (no access). * than the current one, pad extra space with 0xff (no access).
*/ */
if (thread->io_bitmap_max < tss->io_bitmap_max) if (thread->io_bitmap_max < tss->io_bitmap_max) {
memset((char *) tss->io_bitmap + memset((char *) tss->io_bitmap +
thread->io_bitmap_max, 0xff, thread->io_bitmap_max, 0xff,
tss->io_bitmap_max - thread->io_bitmap_max); tss->io_bitmap_max - thread->io_bitmap_max);
}
tss->io_bitmap_max = thread->io_bitmap_max; tss->io_bitmap_max = thread->io_bitmap_max;
tss->x86_tss.io_bitmap_base = IO_BITMAP_OFFSET; tss->x86_tss.io_bitmap_base = IO_BITMAP_OFFSET;
tss->io_bitmap_owner = thread; tss->io_bitmap_owner = thread;
put_cpu(); put_cpu();
return; return;
} }
put_cpu(); put_cpu();
...@@ -636,6 +651,7 @@ void __kprobes do_general_protection(struct pt_regs * regs, ...@@ -636,6 +651,7 @@ void __kprobes do_general_protection(struct pt_regs * regs,
current->thread.error_code = error_code; current->thread.error_code = error_code;
current->thread.trap_no = 13; current->thread.trap_no = 13;
if (show_unhandled_signals && unhandled_signal(current, SIGSEGV) && if (show_unhandled_signals && unhandled_signal(current, SIGSEGV) &&
printk_ratelimit()) { printk_ratelimit()) {
printk(KERN_INFO printk(KERN_INFO
...@@ -666,14 +682,17 @@ void __kprobes do_general_protection(struct pt_regs * regs, ...@@ -666,14 +682,17 @@ void __kprobes do_general_protection(struct pt_regs * regs,
} }
static __kprobes void static __kprobes void
mem_parity_error(unsigned char reason, struct pt_regs * regs) mem_parity_error(unsigned char reason, struct pt_regs *regs)
{ {
printk(KERN_EMERG "Uhhuh. NMI received for unknown reason %02x on " printk(KERN_EMERG
"CPU %d.\n", reason, smp_processor_id()); "Uhhuh. NMI received for unknown reason %02x on CPU %d.\n",
printk(KERN_EMERG "You have some hardware problem, likely on the PCI bus.\n"); reason, smp_processor_id());
printk(KERN_EMERG
"You have some hardware problem, likely on the PCI bus.\n");
#if defined(CONFIG_EDAC) #if defined(CONFIG_EDAC)
if(edac_handler_set()) { if (edac_handler_set()) {
edac_atomic_assert_error(); edac_atomic_assert_error();
return; return;
} }
...@@ -689,7 +708,7 @@ mem_parity_error(unsigned char reason, struct pt_regs * regs) ...@@ -689,7 +708,7 @@ mem_parity_error(unsigned char reason, struct pt_regs * regs)
} }
static __kprobes void static __kprobes void
io_check_error(unsigned char reason, struct pt_regs * regs) io_check_error(unsigned char reason, struct pt_regs *regs)
{ {
unsigned long i; unsigned long i;
...@@ -699,25 +718,32 @@ io_check_error(unsigned char reason, struct pt_regs * regs) ...@@ -699,25 +718,32 @@ io_check_error(unsigned char reason, struct pt_regs * regs)
/* Re-enable the IOCK line, wait for a few seconds */ /* Re-enable the IOCK line, wait for a few seconds */
reason = (reason & 0xf) | 8; reason = (reason & 0xf) | 8;
outb(reason, 0x61); outb(reason, 0x61);
i = 2000; i = 2000;
while (--i) udelay(1000); while (--i)
udelay(1000);
reason &= ~8; reason &= ~8;
outb(reason, 0x61); outb(reason, 0x61);
} }
static __kprobes void static __kprobes void
unknown_nmi_error(unsigned char reason, struct pt_regs * regs) unknown_nmi_error(unsigned char reason, struct pt_regs *regs)
{ {
#ifdef CONFIG_MCA #ifdef CONFIG_MCA
/* Might actually be able to figure out what the guilty party /*
* is. */ * Might actually be able to figure out what the guilty party
if( MCA_bus ) { * is:
*/
if (MCA_bus) {
mca_handle_nmi(); mca_handle_nmi();
return; return;
} }
#endif #endif
printk(KERN_EMERG "Uhhuh. NMI received for unknown reason %02x on " printk(KERN_EMERG
"CPU %d.\n", reason, smp_processor_id()); "Uhhuh. NMI received for unknown reason %02x on CPU %d.\n",
reason, smp_processor_id());
printk(KERN_EMERG "Do you have a strange power saving mode enabled?\n"); printk(KERN_EMERG "Do you have a strange power saving mode enabled?\n");
if (panic_on_unrecovered_nmi) if (panic_on_unrecovered_nmi)
panic("NMI: Not continuing"); panic("NMI: Not continuing");
...@@ -729,14 +755,13 @@ static DEFINE_SPINLOCK(nmi_print_lock); ...@@ -729,14 +755,13 @@ static DEFINE_SPINLOCK(nmi_print_lock);
void __kprobes die_nmi(struct pt_regs *regs, const char *msg) void __kprobes die_nmi(struct pt_regs *regs, const char *msg)
{ {
if (notify_die(DIE_NMIWATCHDOG, msg, regs, 0, 2, SIGINT) == if (notify_die(DIE_NMIWATCHDOG, msg, regs, 0, 2, SIGINT) == NOTIFY_STOP)
NOTIFY_STOP)
return; return;
spin_lock(&nmi_print_lock); spin_lock(&nmi_print_lock);
/* /*
* We are in trouble anyway, lets at least try * We are in trouble anyway, lets at least try
* to get a message out. * to get a message out:
*/ */
bust_spinlocks(1); bust_spinlocks(1);
printk(KERN_EMERG "%s", msg); printk(KERN_EMERG "%s", msg);
...@@ -747,8 +772,9 @@ void __kprobes die_nmi(struct pt_regs *regs, const char *msg) ...@@ -747,8 +772,9 @@ void __kprobes die_nmi(struct pt_regs *regs, const char *msg)
spin_unlock(&nmi_print_lock); spin_unlock(&nmi_print_lock);
bust_spinlocks(0); bust_spinlocks(0);
/* If we are in kernel we are probably nested up pretty bad /*
* and might aswell get out now while we still can. * If we are in kernel we are probably nested up pretty bad
* and might aswell get out now while we still can:
*/ */
if (!user_mode_vm(regs)) { if (!user_mode_vm(regs)) {
current->thread.trap_no = 2; current->thread.trap_no = 2;
...@@ -758,11 +784,11 @@ void __kprobes die_nmi(struct pt_regs *regs, const char *msg) ...@@ -758,11 +784,11 @@ void __kprobes die_nmi(struct pt_regs *regs, const char *msg)
do_exit(SIGSEGV); do_exit(SIGSEGV);
} }
static __kprobes void default_do_nmi(struct pt_regs * regs) static __kprobes void default_do_nmi(struct pt_regs *regs)
{ {
unsigned char reason = 0; unsigned char reason = 0;
/* Only the BSP gets external NMIs from the system. */ /* Only the BSP gets external NMIs from the system: */
if (!smp_processor_id()) if (!smp_processor_id())
reason = get_nmi_reason(); reason = get_nmi_reason();
...@@ -778,8 +804,10 @@ static __kprobes void default_do_nmi(struct pt_regs * regs) ...@@ -778,8 +804,10 @@ static __kprobes void default_do_nmi(struct pt_regs * regs)
if (nmi_watchdog_tick(regs, reason)) if (nmi_watchdog_tick(regs, reason))
return; return;
if (!do_nmi_callback(regs, smp_processor_id())) if (!do_nmi_callback(regs, smp_processor_id()))
#endif
unknown_nmi_error(reason, regs); unknown_nmi_error(reason, regs);
#else
unknown_nmi_error(reason, regs);
#endif
return; return;
} }
...@@ -791,14 +819,14 @@ static __kprobes void default_do_nmi(struct pt_regs * regs) ...@@ -791,14 +819,14 @@ static __kprobes void default_do_nmi(struct pt_regs * regs)
io_check_error(reason, regs); io_check_error(reason, regs);
/* /*
* Reassert NMI in case it became active meanwhile * Reassert NMI in case it became active meanwhile
* as it's edge-triggered. * as it's edge-triggered:
*/ */
reassert_nmi(); reassert_nmi();
} }
static int ignore_nmis; static int ignore_nmis;
__kprobes void do_nmi(struct pt_regs * regs, long error_code) __kprobes void do_nmi(struct pt_regs *regs, long error_code)
{ {
int cpu; int cpu;
...@@ -834,9 +862,12 @@ void __kprobes do_int3(struct pt_regs *regs, long error_code) ...@@ -834,9 +862,12 @@ void __kprobes do_int3(struct pt_regs *regs, long error_code)
if (notify_die(DIE_INT3, "int3", regs, error_code, 3, SIGTRAP) if (notify_die(DIE_INT3, "int3", regs, error_code, 3, SIGTRAP)
== NOTIFY_STOP) == NOTIFY_STOP)
return; return;
/* This is an interrupt gate, because kprobes wants interrupts /*
disabled. Normal trap handlers don't. */ * This is an interrupt gate, because kprobes wants interrupts
* disabled. Normal trap handlers don't.
*/
restore_interrupts(regs); restore_interrupts(regs);
do_trap(3, SIGTRAP, "int3", 1, regs, error_code, NULL); do_trap(3, SIGTRAP, "int3", 1, regs, error_code, NULL);
} }
#endif #endif
...@@ -863,10 +894,10 @@ void __kprobes do_int3(struct pt_regs *regs, long error_code) ...@@ -863,10 +894,10 @@ void __kprobes do_int3(struct pt_regs *regs, long error_code)
* find every occurrence of the TF bit that could be saved away even * find every occurrence of the TF bit that could be saved away even
* by user code) * by user code)
*/ */
void __kprobes do_debug(struct pt_regs * regs, long error_code) void __kprobes do_debug(struct pt_regs *regs, long error_code)
{ {
unsigned int condition;
struct task_struct *tsk = current; struct task_struct *tsk = current;
unsigned int condition;
trace_hardirqs_fixup(); trace_hardirqs_fixup();
...@@ -914,7 +945,8 @@ void __kprobes do_debug(struct pt_regs * regs, long error_code) ...@@ -914,7 +945,8 @@ void __kprobes do_debug(struct pt_regs * regs, long error_code)
/* Ok, finally something we can handle */ /* Ok, finally something we can handle */
send_sigtrap(tsk, regs, error_code); send_sigtrap(tsk, regs, error_code);
/* Disable additional traps. They'll be re-enabled when /*
* Disable additional traps. They'll be re-enabled when
* the signal is delivered. * the signal is delivered.
*/ */
clear_dr7: clear_dr7:
...@@ -938,9 +970,10 @@ void __kprobes do_debug(struct pt_regs * regs, long error_code) ...@@ -938,9 +970,10 @@ void __kprobes do_debug(struct pt_regs * regs, long error_code)
*/ */
void math_error(void __user *ip) void math_error(void __user *ip)
{ {
struct task_struct * task; struct task_struct *task;
unsigned short cwd;
unsigned short swd;
siginfo_t info; siginfo_t info;
unsigned short cwd, swd;
/* /*
* Save the info for the exception handler and clear the error. * Save the info for the exception handler and clear the error.
...@@ -995,7 +1028,7 @@ void math_error(void __user *ip) ...@@ -995,7 +1028,7 @@ void math_error(void __user *ip)
force_sig_info(SIGFPE, &info, task); force_sig_info(SIGFPE, &info, task);
} }
void do_coprocessor_error(struct pt_regs * regs, long error_code) void do_coprocessor_error(struct pt_regs *regs, long error_code)
{ {
ignore_fpu_irq = 1; ignore_fpu_irq = 1;
math_error((void __user *)regs->ip); math_error((void __user *)regs->ip);
...@@ -1003,9 +1036,9 @@ void do_coprocessor_error(struct pt_regs * regs, long error_code) ...@@ -1003,9 +1036,9 @@ void do_coprocessor_error(struct pt_regs * regs, long error_code)
static void simd_math_error(void __user *ip) static void simd_math_error(void __user *ip)
{ {
struct task_struct * task; struct task_struct *task;
siginfo_t info;
unsigned short mxcsr; unsigned short mxcsr;
siginfo_t info;
/* /*
* Save the info for the exception handler and clear the error. * Save the info for the exception handler and clear the error.
...@@ -1049,47 +1082,44 @@ static void simd_math_error(void __user *ip) ...@@ -1049,47 +1082,44 @@ static void simd_math_error(void __user *ip)
force_sig_info(SIGFPE, &info, task); force_sig_info(SIGFPE, &info, task);
} }
void do_simd_coprocessor_error(struct pt_regs * regs, void do_simd_coprocessor_error(struct pt_regs *regs, long error_code)
long error_code)
{ {
if (cpu_has_xmm) { if (cpu_has_xmm) {
/* Handle SIMD FPU exceptions on PIII+ processors. */ /* Handle SIMD FPU exceptions on PIII+ processors. */
ignore_fpu_irq = 1; ignore_fpu_irq = 1;
simd_math_error((void __user *)regs->ip); simd_math_error((void __user *)regs->ip);
} else { return;
}
/* /*
* Handle strange cache flush from user space exception * Handle strange cache flush from user space exception
* in all other cases. This is undocumented behaviour. * in all other cases. This is undocumented behaviour.
*/ */
if (regs->flags & VM_MASK) { if (regs->flags & VM_MASK) {
handle_vm86_fault((struct kernel_vm86_regs *)regs, handle_vm86_fault((struct kernel_vm86_regs *)regs, error_code);
error_code);
return; return;
} }
current->thread.trap_no = 19; current->thread.trap_no = 19;
current->thread.error_code = error_code; current->thread.error_code = error_code;
die_if_kernel("cache flush denied", regs, error_code); die_if_kernel("cache flush denied", regs, error_code);
force_sig(SIGSEGV, current); force_sig(SIGSEGV, current);
}
} }
void do_spurious_interrupt_bug(struct pt_regs * regs, void do_spurious_interrupt_bug(struct pt_regs *regs, long error_code)
long error_code)
{ {
#if 0 #if 0
/* No need to warn about this any longer. */ /* No need to warn about this any longer. */
printk("Ignoring P6 Local APIC Spurious Interrupt Bug...\n"); printk(KERN_INFO "Ignoring P6 Local APIC Spurious Interrupt Bug...\n");
#endif #endif
} }
unsigned long patch_espfix_desc(unsigned long uesp, unsigned long patch_espfix_desc(unsigned long uesp, unsigned long kesp)
unsigned long kesp)
{ {
struct desc_struct *gdt = __get_cpu_var(gdt_page).gdt; struct desc_struct *gdt = __get_cpu_var(gdt_page).gdt;
unsigned long base = (kesp - uesp) & -THREAD_SIZE; unsigned long base = (kesp - uesp) & -THREAD_SIZE;
unsigned long new_kesp = kesp - base; unsigned long new_kesp = kesp - base;
unsigned long lim_pages = (new_kesp | (THREAD_SIZE - 1)) >> PAGE_SHIFT; unsigned long lim_pages = (new_kesp | (THREAD_SIZE - 1)) >> PAGE_SHIFT;
__u64 desc = *(__u64 *)&gdt[GDT_ENTRY_ESPFIX_SS]; __u64 desc = *(__u64 *)&gdt[GDT_ENTRY_ESPFIX_SS];
/* Set up base for espfix segment */ /* Set up base for espfix segment */
desc &= 0x00f0ff0000000000ULL; desc &= 0x00f0ff0000000000ULL;
desc |= ((((__u64)base) << 16) & 0x000000ffffff0000ULL) | desc |= ((((__u64)base) << 16) & 0x000000ffffff0000ULL) |
...@@ -1097,6 +1127,7 @@ unsigned long patch_espfix_desc(unsigned long uesp, ...@@ -1097,6 +1127,7 @@ unsigned long patch_espfix_desc(unsigned long uesp,
((((__u64)lim_pages) << 32) & 0x000f000000000000ULL) | ((((__u64)lim_pages) << 32) & 0x000f000000000000ULL) |
(lim_pages & 0xffff); (lim_pages & 0xffff);
*(__u64 *)&gdt[GDT_ENTRY_ESPFIX_SS] = desc; *(__u64 *)&gdt[GDT_ENTRY_ESPFIX_SS] = desc;
return new_kesp; return new_kesp;
} }
...@@ -1128,53 +1159,52 @@ EXPORT_SYMBOL_GPL(math_state_restore); ...@@ -1128,53 +1159,52 @@ EXPORT_SYMBOL_GPL(math_state_restore);
asmlinkage void math_emulate(long arg) asmlinkage void math_emulate(long arg)
{ {
printk(KERN_EMERG "math-emulation not enabled and no coprocessor found.\n"); printk(KERN_EMERG
printk(KERN_EMERG "killing %s.\n",current->comm); "math-emulation not enabled and no coprocessor found.\n");
force_sig(SIGFPE,current); printk(KERN_EMERG "killing %s.\n", current->comm);
force_sig(SIGFPE, current);
schedule(); schedule();
} }
#endif /* CONFIG_MATH_EMULATION */ #endif /* CONFIG_MATH_EMULATION */
void __init trap_init(void) void __init trap_init(void)
{ {
int i; int i;
#ifdef CONFIG_EISA #ifdef CONFIG_EISA
void __iomem *p = early_ioremap(0x0FFFD9, 4); void __iomem *p = early_ioremap(0x0FFFD9, 4);
if (readl(p) == 'E'+('I'<<8)+('S'<<16)+('A'<<24)) {
if (readl(p) == 'E' + ('I'<<8) + ('S'<<16) + ('A'<<24))
EISA_bus = 1; EISA_bus = 1;
}
early_iounmap(p, 4); early_iounmap(p, 4);
#endif #endif
#ifdef CONFIG_X86_LOCAL_APIC #ifdef CONFIG_X86_LOCAL_APIC
init_apic_mappings(); init_apic_mappings();
#endif #endif
set_trap_gate(0, &divide_error);
set_trap_gate(0,&divide_error); set_intr_gate(1, &debug);
set_intr_gate(1,&debug); set_intr_gate(2, &nmi);
set_intr_gate(2,&nmi);
set_system_intr_gate(3, &int3); /* int3/4 can be called from all */ set_system_intr_gate(3, &int3); /* int3/4 can be called from all */
set_system_gate(4,&overflow); set_system_gate(4, &overflow);
set_trap_gate(5,&bounds); set_trap_gate(5, &bounds);
set_trap_gate(6,&invalid_op); set_trap_gate(6, &invalid_op);
set_trap_gate(7,&device_not_available); set_trap_gate(7, &device_not_available);
set_task_gate(8,GDT_ENTRY_DOUBLEFAULT_TSS); set_task_gate(8, GDT_ENTRY_DOUBLEFAULT_TSS);
set_trap_gate(9,&coprocessor_segment_overrun); set_trap_gate(9, &coprocessor_segment_overrun);
set_trap_gate(10,&invalid_TSS); set_trap_gate(10, &invalid_TSS);
set_trap_gate(11,&segment_not_present); set_trap_gate(11, &segment_not_present);
set_trap_gate(12,&stack_segment); set_trap_gate(12, &stack_segment);
set_trap_gate(13,&general_protection); set_trap_gate(13, &general_protection);
set_intr_gate(14,&page_fault); set_intr_gate(14, &page_fault);
set_trap_gate(15,&spurious_interrupt_bug); set_trap_gate(15, &spurious_interrupt_bug);
set_trap_gate(16,&coprocessor_error); set_trap_gate(16, &coprocessor_error);
set_trap_gate(17,&alignment_check); set_trap_gate(17, &alignment_check);
#ifdef CONFIG_X86_MCE #ifdef CONFIG_X86_MCE
set_trap_gate(18,&machine_check); set_trap_gate(18, &machine_check);
#endif #endif
set_trap_gate(19,&simd_coprocessor_error); set_trap_gate(19, &simd_coprocessor_error);
/* /*
* Verify that the FXSAVE/FXRSTOR data will be 16-byte aligned. * Verify that the FXSAVE/FXRSTOR data will be 16-byte aligned.
...@@ -1187,21 +1217,22 @@ void __init trap_init(void) ...@@ -1187,21 +1217,22 @@ void __init trap_init(void)
printk("done.\n"); printk("done.\n");
} }
if (cpu_has_xmm) { if (cpu_has_xmm) {
printk(KERN_INFO "Enabling unmasked SIMD FPU exception " printk(KERN_INFO
"support... "); "Enabling unmasked SIMD FPU exception support... ");
set_in_cr4(X86_CR4_OSXMMEXCPT); set_in_cr4(X86_CR4_OSXMMEXCPT);
printk("done.\n"); printk("done.\n");
} }
set_system_gate(SYSCALL_VECTOR,&system_call); set_system_gate(SYSCALL_VECTOR, &system_call);
/* Reserve all the builtin and the syscall vector. */ /* Reserve all the builtin and the syscall vector: */
for (i = 0; i < FIRST_EXTERNAL_VECTOR; i++) for (i = 0; i < FIRST_EXTERNAL_VECTOR; i++)
set_bit(i, used_vectors); set_bit(i, used_vectors);
set_bit(SYSCALL_VECTOR, used_vectors); set_bit(SYSCALL_VECTOR, used_vectors);
/* /*
* Should be a barrier for any external CPU state. * Should be a barrier for any external CPU state:
*/ */
cpu_init(); cpu_init();
...@@ -1211,6 +1242,7 @@ void __init trap_init(void) ...@@ -1211,6 +1242,7 @@ void __init trap_init(void)
static int __init kstack_setup(char *s) static int __init kstack_setup(char *s)
{ {
kstack_depth_to_print = simple_strtoul(s, NULL, 0); kstack_depth_to_print = simple_strtoul(s, NULL, 0);
return 1; return 1;
} }
__setup("kstack=", kstack_setup); __setup("kstack=", kstack_setup);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7