Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

signal/powerpc: Replace TRAP_FIXME with TRAP_UNK

Using an si_code of 0 that aliases with SI_USER is clearly the wrong
thing todo, and causes problems in interesting ways.

For use in unknown_exception the recently defined TRAP_UNK
semantically is a perfect fit. For use in RunModeException it looks
like something more specific than TRAP_UNK could be used. No one has
bothered to find a better fit than the broken si_code of 0 in all of
these years and I don't see an obvious better fit so TRAP_UNK is
switching RunModeException to return TRAP_UNK is clearly an
improvement.

Recent history suggests no actually cares about crazy corner
cases of the kernel behavior like this so I don't expect any
regressions from changing this. However if something does
happen this change is easy to revert.

Though I wonder if SIGKILL might not be a better fit.

Cc: Paul Mackerras <paulus@samba.org>
Cc: Kumar Gala <kumar.gala@freescale.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: linuxppc-dev@lists.ozlabs.org
Fixes: 9bad068c24d7 ("[PATCH] ppc32: support for e500 and 85xx")
Fixes: 0ed70f6105ef ("PPC32: Provide proper siginfo information on various exceptions.")
History Tree: https://git.kernel.org/pub/scm/linux/kernel/git/tglx/history.git
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>

+2 -10
-8
arch/powerpc/include/uapi/asm/siginfo.h
··· 15 15 16 16 #include <asm-generic/siginfo.h> 17 17 18 - /* 19 - * SIGTRAP si_codes 20 - */ 21 - #ifdef __KERNEL__ 22 - #define TRAP_FIXME 0 /* Broken dup of SI_USER */ 23 - #endif /* __KERNEL__ */ 24 - 25 - 26 18 #endif /* _ASM_POWERPC_SIGINFO_H */
+2 -2
arch/powerpc/kernel/traps.c
··· 969 969 printk("Bad trap at PC: %lx, SR: %lx, vector=%lx\n", 970 970 regs->nip, regs->msr, regs->trap); 971 971 972 - _exception(SIGTRAP, regs, TRAP_FIXME, 0); 972 + _exception(SIGTRAP, regs, TRAP_UNK, 0); 973 973 974 974 exception_exit(prev_state); 975 975 } ··· 991 991 992 992 void RunModeException(struct pt_regs *regs) 993 993 { 994 - _exception(SIGTRAP, regs, TRAP_FIXME, 0); 994 + _exception(SIGTRAP, regs, TRAP_UNK, 0); 995 995 } 996 996 997 997 void single_step_exception(struct pt_regs *regs)