riscv: Support trap-based WARN() and fix bug in do_trap_break
v2 cover riscv: Support trap-based WARN() and fix bug in do_trap_break
Changes in v2:
- Remove unnecessary non-functional diff
- Rearrange the order of the patches
- Edit the commit description
The trap-based WARN() will help developers to analyze the cause of WARN() because if the debugger is connected, the control flow will be transferred to debugging environment.
BUG() is currently not working properly. When the C extension is supported, the assembler translates the "ebreak" to "c.ebreak" opcode. Hence the trap is possibly triggered by "c.ebreak" instead of expected the "ebreak". This will cause the check mechanism in is_valid_bugaddr(bugaddr) to think that the trap triggered by "c.ebreak" occurs in an invalidate bug address. This patch set will add "c.ebreak" into the check mechanism. In addition, BUG() is also unable to work in the kernel module due to an inappropriate condition in is_valid_bugaddr().
Vincent Chen (3):
riscv: support trap-based WARN()
riscv: Add the support for c.ebreak check in is_valid_bugaddr()
riscv: Support BUG() in kernel module
arch/riscv/include/asm/bug.h | 34 ++++++++++++++++++++++++---------- arch/riscv/kernel/traps.c | 22 ++++++++++++++++++---- 2 files changed, 42 insertions(+), 14 deletions(-)
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH v2 1/3 riscv: support trap-based WARN()
The WARN() related function will trigger a debug exception. This can help developers to analyze the cause of WARN() because if the debugger is connected, the control flow will be transferred to debugging environment.
--- arch/riscv/include/asm/bug.h | 28 ++++++++++++++++++---------- 1 files changed, 18 insertions(+), 10 deletions(-)
arch/riscv/include/asm/bug.h +18 -10
@@ -38,38 +38,46 @@#define __BUG_ENTRY \ __BUG_ENTRY_ADDR "\n\t" \ __BUG_ENTRY_FILE "\n\t" \ - RISCV_SHORT " %1" + RISCV_SHORT " %1\n\t" \ + RISCV_SHORT " %2"#else #define __BUG_ENTRY \ - __BUG_ENTRY_ADDR + __BUG_ENTRY_ADDR "\n\t" \ + RISCV_SHORT " %2"#endif -#define BUG () \ +#define __BUG_FLAGS (flags) \ do { \ __asm__ __volatile__ ( \ "1:\n\t" \ "ebreak\n" \ - ".pushsection __bug_table,\"a\"\n\t" \ + ".pushsection __bug_table,\"aw\"\n\t" \ "2:\n\t" \ __BUG_ENTRY "\n\t" \ - ".org 2b + %2\n\t" \ + ".org 2b + %3\n\t" \ ".popsection" \ : \ : "i" (__FILE__), "i" (__LINE__), \ - "i" (sizeof(struct bug_entry))); \ - unreachable(); \ + "i" (flags), \ + "i" (sizeof(struct bug_entry))); \ } while (0) +#endif /* !__ASSEMBLY__ */ #else /* CONFIG_GENERIC_BUG */ #ifndef __ASSEMBLY__ -#define BUG () \ -do { \ +#define __BUG_FLAGS (flags) do { \ __asm__ __volatile__ ("ebreak\n"); \ - unreachable(); \ } while (0)#endif /* !__ASSEMBLY__ */ #endif /* CONFIG_GENERIC_BUG */ +#define BUG () do { \ + __BUG_FLAGS(0); \ + unreachable(); \ +} while (0) + +#define __WARN_FLAGS (flags) __BUG_FLAGS(BUGFLAG_WARNING|(flags)) +#define HAVE_ARCH_BUG #include <asm-generic/bug.h>
Signature · 7 lines
1.7.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH v2 2/3 riscv: Add the support for c.ebreak check in is_valid_bugaddr()
In reply to Vincent ChenThe macro __BUG_INSN currently is defined as the "ebreak" opcode. 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. However, this check flow is possibly erroneous because if C extension is supported, the expected trap instruction "ebreak" is possibly translated to "c.ebreak" by the assembler. Therefore, it requires a mechanism to distinguish the length of the instruction in $spec and compare it to the correct trap instruction.
--- arch/riscv/include/asm/bug.h | 7 ++++++- arch/riscv/kernel/traps.c | 20 +++++++++++++++++--- 2 files changed, 23 insertions(+), 4 deletions(-)
arch/riscv/include/asm/bug.h +6 -1
@@ -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 ;
arch/riscv/kernel/traps.c +17 -3
@@ -118,6 +118,17 @@ asmlinkage void name(struct pt_regs *regs) \DO_ERROR_INFO (do_trap_ecall_m,SIGILL ,ILL_ILLTRP ,"environment call from M-mode" ); +#ifdef CONFIG_GENERIC_BUG +static inline unsigned long get_break_insn_length (unsigned long pc) +{ +bug_insn_t insn; + +if (probe_kernel_address ((bug_insn_t *)pc, insn)) +return 0 ; +return (((insn & __INSN_LENGTH_MASK) == __INSN_LENGTH_32) ?4UL :2UL ); +} +#endif /* CONFIG_GENERIC_BUG */ + asmlinkage void do_trap_break(struct pt_regs *regs) {#ifdef CONFIG_GENERIC_BUG
@@ -129,8 +140,8 @@ 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 ; + regs->sepc +=get_break_insn_length (regs->sepc); +break ;case BUG_TRAP_TYPE_BUG :die (regs,"Kernel BUG" ); }
@@ -149,7 +160,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 */
Signature · 7 lines
1.7.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH v2 3/3 riscv: Support BUG() in kernel module
In reply to Vincent ChenThe kernel module is loaded into vmalloc region which is located below to the PAGE_OFFSET. Hence the condition, pc < PAGE_OFFSET, in the is_valid_bugaddr() will filter out all trap exceptions triggered by kernel module. To support BUG() in kernel module, the condition is changed to pc < VMALLOC_START.
--- arch/riscv/kernel/traps.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/riscv/kernel/traps.c +1 -1
@@ -156,7 +156,7 @@ int is_valid_bugaddr(unsigned long pc) {bug_insn_t insn; -if (pc <PAGE_OFFSET ) +if (pc <VMALLOC_START )return 0 ;if (probe_kernel_address ((bug_insn_t *)pc, insn))return 0 ;
Signature · 7 lines
1.7.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv