@@ -21,7 +21,12 @@
#include <asm/asm.h>
#ifdef CONFIG_GENERIC_BUG
-#define __BUG_INSN _AC(0x00100073, UL) /* ebreak */
+#define __INSN_LENGTH_MASK _UL(0x3)
+#define __INSN_LENGTH_32 _UL(0x3)
+#define __COMPRESSED_INSN_MASK _UL(0xffff)
+
+#define __BUG_INSN_32 _UL(0x00100073) /* ebreak */
+#define __BUG_INSN_16 _UL(0x9002) /* c.ebreak */
#ifndef __ASSEMBLY__
typedef u32 bug_insn_t;
@@ -129,8 +129,7 @@ asmlinkage void do_trap_break(struct pt_regs *regs)
case BUG_TRAP_TYPE_NONE:
break;
case BUG_TRAP_TYPE_WARN:
- regs->sepc += sizeof(bug_insn_t);
- return;
+ die(regs, "Kernel BUG. Kernel got an unexpected WARN trapped by ebreak");
case BUG_TRAP_TYPE_BUG:
die(regs, "Kernel BUG");
}
@@ -149,7 +148,10 @@ int is_valid_bugaddr(unsigned long pc)
return 0;
if (probe_kernel_address((bug_insn_t *)pc, insn))
return 0;
- return (insn == __BUG_INSN);
+ if ((insn & __INSN_LENGTH_MASK) == __INSN_LENGTH_32)
+ return insn == __BUG_INSN_32;
+ else
+ return (insn & __COMPRESSED_INSN_MASK) == __BUG_INSN_16;
}
#endif /* CONFIG_GENERIC_BUG */
The is_valid_bugaddr() function compares the instruction pointed to by $sepc with macro __BUG_INSN to check whether the current trap exception is caused by an "ebreak" instruction. Hence the macro __BUG_INSN is defined as "ebreak". However, this check flow is possibly erroneous because the expected trap instruction possibly be translated to "c.ebreak" by assembler if C extension is supported. Therefore, it requires a mechanism to distinguish the length of the instruction in $spec and compare it to the correct __BUG_INSN. By the way, I make the kernel go to die() like BUG() when the trap type is BUG_TRAP_TYPE_WARN because currently the WARN() does not trigger any trap exception. Signed-off-by: Vincent Chen <vincentc@andestech.com> --- arch/riscv/include/asm/bug.h | 7 ++++++- arch/riscv/kernel/traps.c | 8 +++++--- 2 files changed, 11 insertions(+), 4 deletions(-)