| Message ID | 20230119074738.708301-3-bjorn@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 00b242509c8f2b9041c4c16d67d51eae3c9ab1d9 |
| Delegated to: | Palmer Dabbelt |
| Headers | show |
| Series | riscv: Dump faulting instructions in oops handler | expand |
| Context | Check | Description |
|---|---|---|
| conchuod/cover_letter | success | Series has a cover letter |
| conchuod/tree_selection | success | Guessed tree name to be for-next |
| conchuod/fixes_present | success | Fixes tag not required for -next series |
| conchuod/maintainers_pattern | success | MAINTAINERS pattern errors before the patch: 13 and now 13 |
| conchuod/verify_signedoff | success | Signed-off-by tag matches author and committer |
| conchuod/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| conchuod/module_param | success | Was 0 now: 0 |
| conchuod/build_rv64_gcc_allmodconfig | success | Errors and warnings before: 0 this patch: 0 |
| conchuod/alphanumeric_selects | success | Out of order selects before the patch: 57 and now 57 |
| conchuod/build_rv32_defconfig | success | Build OK |
| conchuod/dtb_warn_rv64 | success | Errors and warnings before: 2 this patch: 2 |
| conchuod/header_inline | success | No static functions without inline keyword in header files |
| conchuod/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 25 lines checked |
| conchuod/source_inline | success | Was 0 now: 0 |
| conchuod/build_rv64_nommu_k210_defconfig | success | Build OK |
| conchuod/verify_fixes | success | No Fixes tag |
| conchuod/build_rv64_nommu_virt_defconfig | success | Build OK |
Hi Björn, On 1/19/23 08:47, Björn Töpel wrote: > From: Björn Töpel <bjorn@rivosinc.com> > > RISC-V has some GNU disassembly quirks, e.g. it requires '-D' to > properly disassemble .2byte directives similar to Arm [1]. Further, > GNU objdump groups RISC-V instruction by 2 or 4 byte chunks, instead > doing byte-for-byte. > > Add the required switches, and translate from short/word to bytes when > ARCH is "riscv". > > An example how to invoke decodecode for RISC-V: > $ echo 'Code: bf45 f793 1007 f7d9 50ef 37af d541 b7d9 7097 00c8 (80e7) > 6140' | AFLAGS="-march=rv64imac_zicbom_zihintpause" \ > ARCH=riscv CROSS_COMPILE=riscv64-linux-gnu- ./scripts/decodecode > Code: bf45 f793 1007 f7d9 50ef 37af d541 b7d9 7097 00c8 (80e7) 6140 > All code > ======== > 0: bf45 c.j 0xffffffffffffffb0 > 2: 1007f793 andi a5,a5,256 > 6: f7d9 c.bnez a5,0xffffffffffffff94 > 8: 37af50ef jal ra,0xf5382 > c: d541 c.beqz a0,0xffffffffffffff94 > e: b7d9 c.j 0xffffffffffffffd4 > 10: 00c87097 auipc ra,0xc87 > 14:* 614080e7 jalr ra,1556(ra) # 0xc87624 <-- trapping instruction > > Code starting with the faulting instruction > =========================================== > 0: 614080e7 jalr ra,1556(ra) > > [1] https://sourceware.org/bugzilla/show_bug.cgi?id=10263 > > Signed-off-by: Björn Töpel <bjorn@rivosinc.com> > --- > scripts/decodecode | 12 +++++++++++- > 1 file changed, 11 insertions(+), 1 deletion(-) > > diff --git a/scripts/decodecode b/scripts/decodecode > index b28fd2686561..8fe71c292381 100755 > --- a/scripts/decodecode > +++ b/scripts/decodecode > @@ -93,6 +93,11 @@ disas() { > ${CROSS_COMPILE}strip $t.o > fi > > + if [ "$ARCH" = "riscv" ]; then > + OBJDUMPFLAGS="-M no-aliases --section=.text -D" > + ${CROSS_COMPILE}strip $t.o > + fi > + > if [ $pc_sub -ne 0 ]; then > if [ $PC ]; then > adj_vma=$(( $PC - $pc_sub )) > @@ -126,8 +131,13 @@ get_substr_opcode_bytes_num() > do > substr+="$opc" > > + opcode="$substr" > + if [ "$ARCH" = "riscv" ]; then > + opcode=$(echo $opcode | tr ' ' '\n' | tac | tr -d '\n') > + fi > + > # return if opcode bytes do not match @opline anymore > - if ! echo $opline | grep -q "$substr"; > + if ! echo $opline | grep -q "$opcode"; > then > break > fi Tested-by: Alexandre Ghiti <alexghiti@rivosinc.com> Thanks, that's very useful! Alex
diff --git a/scripts/decodecode b/scripts/decodecode index b28fd2686561..8fe71c292381 100755 --- a/scripts/decodecode +++ b/scripts/decodecode @@ -93,6 +93,11 @@ disas() { ${CROSS_COMPILE}strip $t.o fi + if [ "$ARCH" = "riscv" ]; then + OBJDUMPFLAGS="-M no-aliases --section=.text -D" + ${CROSS_COMPILE}strip $t.o + fi + if [ $pc_sub -ne 0 ]; then if [ $PC ]; then adj_vma=$(( $PC - $pc_sub )) @@ -126,8 +131,13 @@ get_substr_opcode_bytes_num() do substr+="$opc" + opcode="$substr" + if [ "$ARCH" = "riscv" ]; then + opcode=$(echo $opcode | tr ' ' '\n' | tac | tr -d '\n') + fi + # return if opcode bytes do not match @opline anymore - if ! echo $opline | grep -q "$substr"; + if ! echo $opline | grep -q "$opcode"; then break fi