--- zzzz-none-000/linux-2.6.32.61/arch/mips/kernel/unaligned.c 2013-06-10 09:43:48.000000000 +0000 +++ virian-300e-630/linux-2.6.32.61/arch/mips/kernel/unaligned.c 2013-11-08 13:57:51.000000000 +0000 @@ -82,23 +82,32 @@ #include #include #include +#include #include #include +#include +#include "unaligned.h" #define STR(x) __STR(x) #define __STR(x) #x -enum { - UNALIGNED_ACTION_QUIET, - UNALIGNED_ACTION_SIGNAL, - UNALIGNED_ACTION_SHOW, -}; +static unsigned long ai_user; +static unsigned long ai_sys; +static unsigned long ai_skipped; +static unsigned long ai_word; +static unsigned long ai_dword; + + +int ai_usermode = UNALIGNED_ACTION_FIXUP + /*--- | UNALIGNED_WARN ---*/ + ; +int ai_kernelmode = UNALIGNED_ACTION_FIXUP + /*--- | UNALIGNED_WARN ---*/ + ; #ifdef CONFIG_DEBUG_FS -static u32 unaligned_instructions; -static u32 unaligned_action; -#else -#define unaligned_action UNALIGNED_ACTION_QUIET +u32 unaligned_instructions; #endif + extern void show_registers(struct pt_regs *regs); static void emulate_load_store_insn(struct pt_regs *regs, @@ -107,13 +116,33 @@ union mips_instruction insn; unsigned long value; unsigned int res; + siginfo_t info; regs->regs[0] = 0; - /* - * This load never faults. - */ - __get_user(insn.word, pc); + /*--------------------------------------------------------------------------------------*\ + * An address error exception occurs on an instruction or data access when an attempt + * is made to execute one of the following: + * + • Fetch an instruction, load a word, or store a word that is not aligned on a word boundary + • Load or store a halfword that is not aligned on a halfword boundary + • Reference the kernel address space from user mode + + * Note that in the case of an instruction fetch that is not aligned on a word boundary, + * PC is updated before the condition is detected. Therefore, both EPC and BadVAddr point + * to the unaligned instruction address. In the case of a data access the exception is + * taken if either an unaligned address or an address that was inaccessible in the + * current processor mode was referenced by a load or store instruction. + \*--------------------------------------------------------------------------------------*/ + if (user_mode(regs) && !unlikely(access_ok(VERIFY_READ, pc, 4))) { + printk(KERN_ERR "[%s] illegal address 0x%p (sigill)\n", __FUNCTION__, pc); + goto sigill; + } + + if(__get_user(insn.word, pc)) { + printk(KERN_ERR "[%s] load from address 0x%p failed (sigbus)\n", __FUNCTION__, pc); + goto sigbus; + } switch (insn.i_format.opcode) { /* @@ -145,13 +174,175 @@ case sb_op: goto sigbus; - /* - * The remaining opcodes are the ones that are really of interest. - */ - case lh_op: - if (!access_ok(VERIFY_READ, addr, 2)) - goto sigbus; + /* + * DSP instructions + */ + case spec3_op: + /*--- printk("[%s] special opcode 3 found\n", __FUNCTION__); ---*/ + switch (insn.sp3_format.sp3_opcode) { + case lxx_op: + /*--- if(unaligned_action & UNALIGNED_WARN) { ---*/ + /*--- printk(KERN_INFO "[%s] opcode group LX found opcode=0x%x base=%d index=%d rd=%d lx_opcode=0x%x sp3_opcode=0x%x at 0x%x\n", ---*/ + /*--- __FUNCTION__, ---*/ + /*--- insn.lx_format.opcode, insn.lx_format.base, insn.lx_format.index, insn.lx_format.rd, ---*/ + /*--- insn.lx_format.lx_opcode, insn.lx_format.sp3_opcode, regs->cp0_epc); ---*/ + /*--- } ---*/ + switch (insn.lx_format.lx_opcode) { + case lwx_op: { + unsigned int dest = 0; + unsigned char *base = (unsigned char *)(regs->regs[insn.lx_format.base]); + unsigned int index = regs->regs[insn.lx_format.index]; + + if (user_mode(regs) && !access_ok(VERIFY_READ, addr, 4)) + goto sigbus; + + __asm__ __volatile__ (".set\tnoat\n" +#ifdef __BIG_ENDIAN + /*--- dest |= base[index + 0] << 24; ---*/ + /*--- dest |= base[index + 1] << 16; ---*/ + /*--- dest |= base[index + 2] << 8; ---*/ + /*--- dest |= base[index + 3] << 0; ---*/ + "1:\tlbu\t$1, 0(%2)\n" + "sll\t$1, 0x18\n\t" + "or\t%0, $1\n\t" + "2:\tlbu\t$1, 1(%2)\n\t" + "sll\t$1, 0x10\n\t" + "or\t%0, $1\n\t" + "3:\tlbu\t$1, 2(%2)\n\t" + "sll\t$1, 0x8\n\t" + "or\t%0, $1\n\t" + "4:\tlbu\t$1, 3(%2)\n\t" + "or\t%0, $1\n\t" +#endif +#ifdef __LITTLE_ENDIAN + /*--- dest |= base[index + 3] << 24; ---*/ + /*--- dest |= base[index + 2] << 16; ---*/ + /*--- dest |= base[index + 1] << 8; ---*/ + /*--- dest |= base[index + 0] << 0; ---*/ + "1:\tlbu\t$1, 3(%2)\n" + "sll\t$1, 0x18\n\t" + "or\t%0, $1\n\t" + "2:\tlbu\t$1, 2(%2)\n\t" + "sll\t$1, 0x10\n\t" + "or\t%0, $1\n\t" + "3:\tlbu\t$1, 1(%2)\n\t" + "sll\t$1, 0x8\n\t" + "or\t%0, $1\n\t" + "4:\tlbu\t$1, 0(%2)\n\t" + "or\t%0, $1\n\t" +#endif + "li\t%1, 0\n" + "5:\t.set\tat\n\t" + ".section\t.fixup,\"ax\"\n\t" + "6:\tli\t%1, %3\n\t" + "j\t5b\n\t" + ".previous\n\t" + ".section\t__ex_table,\"a\"\n\t" + STR(PTR)"\t1b, 6b\n\t" + STR(PTR)"\t2b, 6b\n\t" + STR(PTR)"\t3b, 6b\n\t" + STR(PTR)"\t4b, 6b\n\t" + ".previous" + : "+r" (dest), "=r" (res) + : "r" (&base[index]), "i" (-EFAULT)); + if (res) + goto fault; + regs->regs[insn.lx_format.rd] = dest; + if(unaligned_action & UNALIGNED_WARN) { + printk(KERN_INFO "[%s] LWX r%d, r%d ( r%d ) # 0x%lx = *(unsigned int *)(0x%lx + 0x%lx)\n", + __FUNCTION__, + insn.lx_format.rd, insn.lx_format.index, insn.lx_format.base, + regs->regs[insn.lx_format.rd], regs->regs[insn.lx_format.index], + regs->regs[insn.lx_format.base]); + } + } + compute_return_epc(regs); + break; + case lhx_op: { + unsigned int dest = 0; + unsigned char *base = (unsigned char *)(regs->regs[insn.lx_format.base]); + unsigned int index = regs->regs[insn.lx_format.index]; + + if (user_mode(regs) && !access_ok(VERIFY_READ, addr, 2)) + goto sigbus; + __asm__ __volatile__ (".set\tnoat\n" +#ifdef __BIG_ENDIAN + /*--- dest |= base[index + 0] << 8; ---*/ + /*--- dest |= base[index + 1] << 0; ---*/ + "1:\tlbu\t$1, 0(%2)\n" + "sll\t$1, 0x8\n\t" + "or\t%0, $1\n\t" + "2:\tlbu\t$1, 1(%2)\n\t" + "or\t%0, $1\n\t" +#endif +#ifdef __LITTLE_ENDIAN + /*--- dest |= base[index + 1] << 8; ---*/ + /*--- dest |= base[index + 0] << 0; ---*/ + "1:\tlbu\t$1, 1(%2)\n" + "sll\t$1, 0x8\n\t" + "or\t%0, $1\n\t" + "2:\tlbu\t$1, 0(%2)\n\t" + "or\t%0, $1\n\t" +#endif + "li\t%1, 0\n" + "3:\t.set\tat\n\t" + ".section\t.fixup,\"ax\"\n\t" + "4:\tli\t%1, %3\n\t" + "j\t3b\n\t" + ".previous\n\t" + ".section\t__ex_table,\"a\"\n\t" + STR(PTR)"\t1b, 4b\n\t" + STR(PTR)"\t2b, 4b\n\t" + ".previous" + : "+r" (dest), "=r" (res) + : "r" (&base[index]), "i" (-EFAULT)); + if (res) + goto fault; + regs->regs[insn.lx_format.rd] = dest; + if(unaligned_action & UNALIGNED_WARN) { + printk(KERN_INFO "[%s] LHX r%d, r%d ( r%d ) # 0x%lx = (unsigned int)*(unsigned short *)(0x%lx + 0x%lx)\n", + __FUNCTION__, + insn.lx_format.rd, insn.lx_format.index, insn.lx_format.base, + regs->regs[insn.lx_format.rd], regs->regs[insn.lx_format.index], + regs->regs[insn.lx_format.base]); + } + } + compute_return_epc(regs); + break; + + case lbux_op: /*--- 8 Bit zugriffe können nicht analigned sein ---*/ + default: + printk(KERN_ERR "[%s] opcode group LX found, unknown element 0x%x.\n", __FUNCTION__, insn.lx_format.lx_opcode); + goto sigbus; + } + break; + + case ext_op: + case dextm_op: + case dextu_op: + case dext_op: + case ins_op: + case dinsm_op: + case dinsu_op: + case dins_op: + case insv_op: + case adduqb_op: + case bshfl_op: + case dbshfl_op: + case extrwph_op: + case rdhwr_op: + default: + goto sigbus; + } + break; + /* + * The remaining opcodes are the ones that are really of interest. + */ + case lh_op: + if (user_mode(regs) && !access_ok(VERIFY_READ, addr, 2)) + goto sigbus; + ai_word++; __asm__ __volatile__ (".set\tnoat\n" #ifdef __BIG_ENDIAN "1:\tlb\t%0, 0(%2)\n" @@ -182,39 +373,70 @@ break; case lw_op: - if (!access_ok(VERIFY_READ, addr, 4)) + if (user_mode(regs) && !access_ok(VERIFY_READ, addr, 4)) goto sigbus; - + ai_dword++; __asm__ __volatile__ ( #ifdef __BIG_ENDIAN +#ifdef CONFIG_MACH_FUSIV_MIPS1 + "\tli\t %1, 1\n\t" + "1:\tlbu\t%0, (%2)\n" + "2:\tlbu\t$23, 1(%2)\n\t" + "5:\tlbu\t$22, 2(%2)\n\t" + "6:\tlbu\t$21, 3(%2)\n\t" +#else "1:\tlwl\t%0, (%2)\n" "2:\tlwr\t%0, 3(%2)\n\t" #endif +#endif #ifdef __LITTLE_ENDIAN "1:\tlwl\t%0, 3(%2)\n" "2:\tlwr\t%0, (%2)\n\t" #endif +#ifdef CONFIG_MACH_FUSIV_MIPS1 + "sll\t%0,0x8\n\t" + "or\t%0,$23\n\t" + "sll\t%0,0x8\n\t" + "or\t%0,$22\n\t" + "sll\t%0,0x8\n\t" + "or\t%0,$21\n\t" +#endif "li\t%1, 0\n" +#ifdef CONFIG_MACH_FUSIV_MIPS1 + "3:\t.set\tat\n\t" + "\t.section\t.fixup,\"ax\"\n\t" +#else "3:\t.section\t.fixup,\"ax\"\n\t" +#endif "4:\tli\t%1, %3\n\t" "j\t3b\n\t" ".previous\n\t" ".section\t__ex_table,\"a\"\n\t" STR(PTR)"\t1b, 4b\n\t" STR(PTR)"\t2b, 4b\n\t" +#ifdef CONFIG_MACH_FUSIV_MIPS1 + STR(PTR)"\t5b, 4b\n\t" + STR(PTR)"\t6b, 4b\n\t" +#endif ".previous" : "=&r" (value), "=r" (res) +#ifdef CONFIG_MACH_FUSIV_MIPS1 + : "r" (addr), "i" (-EFAULT) + :"$23","$22","$21"); +#else : "r" (addr), "i" (-EFAULT)); +#endif if (res) goto fault; + compute_return_epc(regs); regs->regs[insn.i_format.rt] = value; break; case lhu_op: - if (!access_ok(VERIFY_READ, addr, 2)) + if (user_mode(regs) && !access_ok(VERIFY_READ, addr, 2)) goto sigbus; - + ai_word++; __asm__ __volatile__ ( ".set\tnoat\n" #ifdef __BIG_ENDIAN @@ -254,7 +476,7 @@ * would blow up, so for now we don't handle unaligned 64-bit * instructions on 32-bit kernels. */ - if (!access_ok(VERIFY_READ, addr, 4)) + if (user_mode(regs) && !access_ok(VERIFY_READ, addr, 4)) goto sigbus; __asm__ __volatile__ ( @@ -298,7 +520,7 @@ * would blow up, so for now we don't handle unaligned 64-bit * instructions on 32-bit kernels. */ - if (!access_ok(VERIFY_READ, addr, 8)) + if (user_mode(regs) && !access_ok(VERIFY_READ, addr, 8)) goto sigbus; __asm__ __volatile__ ( @@ -332,9 +554,9 @@ goto sigill; case sh_op: - if (!access_ok(VERIFY_WRITE, addr, 2)) + if (user_mode(regs) && !access_ok(VERIFY_WRITE, addr, 2)) goto sigbus; - + ai_word++; value = regs->regs[insn.i_format.rt]; __asm__ __volatile__ ( #ifdef __BIG_ENDIAN @@ -369,15 +591,25 @@ break; case sw_op: - if (!access_ok(VERIFY_WRITE, addr, 4)) + if (user_mode(regs) && !access_ok(VERIFY_WRITE, addr, 4)) goto sigbus; - + ai_dword++; value = regs->regs[insn.i_format.rt]; __asm__ __volatile__ ( #ifdef __BIG_ENDIAN +#ifdef CONFIG_MACH_FUSIV_MIPS1 + "1:\tsb\t%1,3(%2)\n" + "srl\t$23,%1,0x8\n" + "2:\tsb\t$23, 2(%2)\n\t" + "srl\t$23,%1,0x10\n" + "5:\tsb\t$23, 1(%2)\n\t" + "srl\t$23,%1,0x18\n" + "6:\tsb\t$23, 0(%2)\n\t" +#else "1:\tswl\t%1,(%2)\n" "2:\tswr\t%1, 3(%2)\n\t" #endif +#endif #ifdef __LITTLE_ENDIAN "1:\tswl\t%1, 3(%2)\n" "2:\tswr\t%1, (%2)\n\t" @@ -391,11 +623,21 @@ ".section\t__ex_table,\"a\"\n\t" STR(PTR)"\t1b, 4b\n\t" STR(PTR)"\t2b, 4b\n\t" +#ifdef CONFIG_MACH_FUSIV_MIPS1 + STR(PTR)"\t5b, 4b\n\t" + STR(PTR)"\t6b, 4b\n\t" +#endif ".previous" : "=r" (res) +#ifdef CONFIG_MACH_FUSIV_MIPS1 + : "r" (value), "r" (addr), "i" (-EFAULT) + : "$23"); +#else : "r" (value), "r" (addr), "i" (-EFAULT)); +#endif if (res) goto fault; + compute_return_epc(regs); break; @@ -408,7 +650,7 @@ * would blow up, so for now we don't handle unaligned 64-bit * instructions on 32-bit kernels. */ - if (!access_ok(VERIFY_WRITE, addr, 8)) + if (user_mode(regs) && !access_ok(VERIFY_WRITE, addr, 8)) goto sigbus; value = regs->regs[insn.i_format.rt]; @@ -482,60 +724,239 @@ return; die_if_kernel("Unhandled kernel unaligned access", regs); - force_sig(SIGSEGV, current); + + info.si_signo = SIGSEGV; + info.si_errno = 0; + info.si_code = SEGV_MAPERR; + info.si_addr = (void __user *) addr; + force_sig_info(SIGSEGV, &info, current); return; sigbus: die_if_kernel("Unhandled kernel unaligned access", regs); - force_sig(SIGBUS, current); + info.si_signo = SIGBUS; + info.si_errno = 0; + info.si_code = BUS_ADRERR; + info.si_addr = (void __user *) addr; + force_sig_info(SIGBUS, &info, current); return; sigill: die_if_kernel("Unhandled kernel unaligned access or invalid instruction", regs); - force_sig(SIGILL, current); + info.si_signo = SIGILL; + info.si_errno = 0; + info.si_code = ILL_ILLOPC; + info.si_addr = (void __user *) addr; + force_sig_info(SIGILL, &info, current); +} +#define IS_MIPS16_EXTEND_OR_JAL(a) ((((a) >> (27 - 16)) == 30) | (((a) >> (27 - 16)) == 3)) /*--- Opcode EXTEND oder JAL ---*/ +/*--------------------------------------------------------------------------------*\ +\*--------------------------------------------------------------------------------*/ +int print_code_range(const char *prefix, unsigned int __user *pc, unsigned int mips16, unsigned int usermode, int left_offset, int right_offset, unsigned long *badaddr) { + + if(!mips16) { + signed int i; + unsigned long access_addr = (unsigned long)pc + sizeof(unsigned int) * left_offset; + printk(KERN_ERR"Code(0x%08lx):", access_addr); + for(i = left_offset; i < right_offset; i++) { + unsigned int pc_value; + + access_addr = (unsigned long)pc + sizeof(unsigned int) * i; + if(usermode && !unlikely(access_ok(VERIFY_READ, access_addr, 4))) { + printk(KERN_ERR "[%s] illegal address 0x%lx (sigill)\n", prefix, access_addr); + *badaddr = (unsigned long)access_addr; + return -1; /*--- sigill; ---*/ + } + if(__get_user(pc_value, (unsigned int __user *)access_addr)) { + printk(KERN_ERR "[%s] load from address 0x%lx failed (sigbus)\n", prefix, access_addr); + *badaddr = (unsigned long)access_addr; + return -2; /*--- sigbus; ---*/ + } + printk(" %s0x%08x%s", i == 0 ? "<" : "", pc_value, i == 0 ? ">" : ""); + } + } else { + /*--- wegen EXT-Code nur step by step vorhangeln: ---*/ + unsigned short code0, code1; + unsigned long pc_addr = (unsigned long)pc & ~0x1; + unsigned long access_addr = (unsigned long)pc & ~0x1; + unsigned long end_addr = ((unsigned long)pc & ~0x1) + sizeof(unsigned short) * right_offset; + + while(left_offset < 0) { + if(usermode && !unlikely(access_ok(VERIFY_READ, access_addr, 4))) { + printk(KERN_ERR "[%s] illegal address 0x%lx (sigill)\n", prefix, access_addr); + *badaddr = (unsigned long)access_addr; + return -1; /*--- sigill; ---*/ + } + if(__get_user(code1, (unsigned short __user *)(access_addr - sizeof(short)))) { + printk(KERN_ERR "[%s] load from 16 bit address 0x%lx failed (sigbus)\n", prefix, access_addr); + *badaddr = (unsigned long)access_addr; + return -2; /*--- sigbus; ---*/ + } + if(__get_user(code0, (unsigned short __user *)(access_addr - 2 * sizeof(short)))) { + printk(KERN_ERR "[%s] load from 16 bit address 0x%lx failed (sigbus)\n", prefix, access_addr); + *badaddr = (unsigned long)access_addr; + return -2; /*--- sigbus; ---*/ + } + if(IS_MIPS16_EXTEND_OR_JAL(code0)) { + access_addr -= 2 * sizeof(short); + } else { + access_addr -= sizeof(short); + } + left_offset++; + } + printk(KERN_ERR"Code(0x%08lx):", access_addr); + while(access_addr < end_addr) { + if(__get_user(code0, (unsigned short __user *)(access_addr))) { + printk(KERN_ERR "[%s] load from 16 bit address 0x%lx failed (sigbus)\n", prefix, access_addr); + *badaddr = (unsigned long)access_addr; + return -2; /*--- sigbus; ---*/ + } + if(access_addr == pc_addr) { + if(IS_MIPS16_EXTEND_OR_JAL(code0)) { + access_addr += sizeof(short); + if(__get_user(code1, (unsigned short __user *)(access_addr))) { + printk(KERN_ERR "[%s] load from 16 bit address 0x%lx failed (sigbus)\n", prefix, access_addr); + *badaddr = (unsigned long)access_addr; + return -2; /*--- sigbus; ---*/ + } + printk(" <0x%04x %04x>", code0, code1); + } else { + printk(" <0x%04x>", code0); + } + } else { + printk(" 0x%04x", code0); + } + access_addr += sizeof(short); + } + } + printk("\n"); + return 0; +} + +/*--------------------------------------------------------------------------------*\ +\*--------------------------------------------------------------------------------*/ +int print_mem_config(struct mm_struct *mmm, unsigned long addr) { + struct vm_area_struct *vm; + unsigned int i = 0; + if(mmm == NULL) + return 0; + vm = mmm->mmap; + while(vm) { + if((addr >= vm->vm_start) && (addr < vm->vm_end)) { + printk(KERN_ERR"Adresse-Segment(%d): 0x%lx: 0x%lx :0x%lx (offset 0x%lx)", + i, vm->vm_start, addr, vm->vm_end, addr - vm->vm_start); + if(vm->vm_file) { + printk(" Path='%s'", vm->vm_file->f_path.dentry->d_name.name); + } + printk("\n"); + return 0; + } + vm = vm->vm_next; + i++; + } + return 1; } asmlinkage void do_ade(struct pt_regs *regs) { unsigned int __user *pc; mm_segment_t seg; + siginfo_t info; + unsigned long addr = 0UL; /* * Did we catch a fault trying to load an instruction? * Or are we running in MIPS16 mode? */ - if ((regs->cp0_badvaddr == regs->cp0_epc) || (regs->cp0_epc & 0x1)) + if (regs->cp0_badvaddr == regs->cp0_epc) goto sigbus; pc = (unsigned int __user *) exception_epc(regs); - if (user_mode(regs) && !test_thread_flag(TIF_FIXADE)) - goto sigbus; - if (unaligned_action == UNALIGNED_ACTION_SIGNAL) - goto sigbus; - else if (unaligned_action == UNALIGNED_ACTION_SHOW) - show_registers(regs); - + /*--- if (user_mode(regs) && !test_thread_flag(TIF_FIXADE)) { ---*/ + /*--- goto sigbus; ---*/ + /*--- } ---*/ + if (!user_mode(regs)) { + ai_sys++; + if(ai_kernelmode & UNALIGNED_WARN) { + int ret; + printk(KERN_ERR "[kernel-unaligned %lu] pc=0x%p(%pF) addr=0x%08lx task=%s pid=%d ra=0x%08lx(%pF)\n", + ai_sys, pc, pc, regs->cp0_badvaddr, current->comm, current->pid, + regs->regs[31], (void *)regs->regs[31] + ); + ret = print_code_range("kernel-unaligned", pc, regs->cp0_epc & 0x1, user_mode(regs), -2, 3, &addr); + if(ret == -1) { + goto sigill; + } else if(ret == -2) { + goto sigbus; + } + if(print_mem_config(current->active_mm, (unsigned long)pc)) + print_mem_config(current->mm, (unsigned long)pc); + } + } else { + ai_user++; + if(unaligned_action & UNALIGNED_WARN) { + int ret; + printk(KERN_ERR"Alignment trap: %s (%d) PC=0x%p Address=0x%08lx\n", current->comm, task_pid_nr(current), pc, regs->cp0_badvaddr); + ret = print_code_range("kernel-unaligned", pc, regs->cp0_epc & 0x1, user_mode(regs), -2, 3, &addr); + if(ret == -1) { + goto sigill; + } else if(ret == -2) { + goto sigbus; + } + if(print_mem_config(current->active_mm, (unsigned long)pc)) + print_mem_config(current->mm, (unsigned long)pc); + /*--- show_registers(regs); ---*/ + } + switch(unaligned_action) { + case UNALIGNED_ACTION_IGNORED: + case UNALIGNED_ACTION_IGNORED_WARN: + ai_skipped++; + return; + case UNALIGNED_ACTION_SIGNAL: + case UNALIGNED_ACTION_SIGNAL_WARN: + goto sigbus; + case UNALIGNED_ACTION_FIXUP: + case UNALIGNED_ACTION_FIXUP_WARN: + break; + } + } /* * Do branch emulation only if we didn't forward the exception. * This is all so but ugly ... */ seg = get_fs(); - if (!user_mode(regs)) + if (!user_mode(regs)) { set_fs(KERNEL_DS); - emulate_load_store_insn(regs, (void __user *)regs->cp0_badvaddr, pc); + } + if (regs->cp0_epc & 0x1) { + emulate_load_store_insn_mips16(regs, (void __user *)regs->cp0_badvaddr, pc); + } else { + emulate_load_store_insn(regs, (void __user *)regs->cp0_badvaddr, pc); + } set_fs(seg); return; +sigill: + die_if_kernel("Unhandled kernel unaligned access or invalid instruction", regs); + info.si_signo = SIGILL; + info.si_errno = 0; + info.si_code = ILL_ILLOPC; + info.si_addr = (void __user *) addr; + force_sig_info(SIGILL, &info, current); + return; + sigbus: - die_if_kernel("Kernel unaligned instruction access", regs); - force_sig(SIGBUS, current); + die_if_kernel("Unhandled kernel unaligned access", regs); + info.si_signo = SIGBUS; + info.si_errno = 0; + info.si_code = BUS_ADRERR; + info.si_addr = (void __user *) addr; + force_sig_info(SIGBUS, &info, current); + return; - /* - * XXX On return from the signal handler we should advance the epc - */ } #ifdef CONFIG_DEBUG_FS @@ -558,3 +979,81 @@ } __initcall(debugfs_unaligned); #endif + +#ifdef CONFIG_PROC_FS +static const char *usermode_action[] = { + "ignored", + "warn", + "fixup", + "fixup+warn", + "signal", + "signal+warn" +}; + +static int +proc_alignment_read(char *page, char **start, off_t off, int count, int *eof, + void *data) +{ + char *p = page; + int len; + + p += sprintf(p, "User:\t\t%lu\n", ai_user); + p += sprintf(p, "System:\t\t%lu\n", ai_sys); + p += sprintf(p, "Skipped:\t%lu\n", ai_skipped); + p += sprintf(p, "Word:\t\t%lu\n", ai_word); + p += sprintf(p, "DWord:\t\t%lu\n", ai_dword); + p += sprintf(p, "User faults:\t%i (%s)\n", ai_usermode, usermode_action[ai_usermode]); + p += sprintf(p, "Kernel faults:\t%i (%s)\n", ai_kernelmode, usermode_action[ai_kernelmode]); + + len = (p - page) - off; + if (len < 0) + len = 0; + + *eof = (len <= count) ? 1 : 0; + *start = page + off; + + return len; +} + +static int proc_alignment_write(struct file *file, const char __user *buffer, + unsigned long count, void *data) +{ + char mode; + + if (count > 0) { + if (get_user(mode, buffer)) + return -EFAULT; + if (mode >= '0' && mode <= '5') { + ai_usermode = mode - '0'; + } else if (mode >= '6' && mode <= '7') { + ai_kernelmode = (mode - '6') == 0 ? UNALIGNED_ACTION_FIXUP : UNALIGNED_ACTION_FIXUP_WARN; + } + } + return count; +} + +/* + * This needs to be done after sysctl_init, otherwise sys/ will be + * overwritten. Actually, this shouldn't be in sys/ at all since + * it isn't a sysctl, and it doesn't contain sysctl information. + * We now locate it in /proc/cpu/alignment instead. + */ +static int __init alignment_init(void) +{ + struct proc_dir_entry *res; + + res = proc_mkdir("cpu", NULL); + if (!res) + return -ENOMEM; + + res = create_proc_entry("alignment", S_IWUSR | S_IRUGO, res); + if (!res) + return -ENOMEM; + + res->read_proc = proc_alignment_read; + res->write_proc = proc_alignment_write; + + return 0; +} +__initcall(alignment_init); +#endif /* CONFIG_PROC_FS */