From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 70414373C1E for ; Wed, 8 Jul 2026 03:36:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.53 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783481787; cv=none; b=n9bAfdNjpI5Hdra5YUOaRfuZLued1jnZpsw1oiiSpTcPnEJw7txnxDMQg3VdCzaM0t7zfmVusPjkPwdK3jVL14LkcLgjtcc81JWDvDA9iZEoV+h+g0TL/V6CqAzcfxbAsn4I09OmKMMacxKj95VtTr9lCbVQJoUIFG8oOyRALQs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783481787; c=relaxed/simple; bh=IjVaLmAyDsdmOm3A507KtKDP292jEnsVxwzZ/J7AzEQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=X8kVV+RxD7c18jvD//aHPq/ynGSfmajCoToVFYfBqCQQtsA9jrYHDRHxVlebwU7oz1V4WHS1Ifdp7F6gq+dhQ58eehtjTdbMAyeX6J/JbffXabY+O2+StS81QvWMjUVXe8sfxWBvM5nVDJDCkC0h1PEF2Z7NGJDP+f9OoYVknFI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=nxD9yx4X; arc=none smtp.client-ip=209.85.216.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="nxD9yx4X" Received: by mail-pj1-f53.google.com with SMTP id 98e67ed59e1d1-3811f512167so269737a91.3 for ; Tue, 07 Jul 2026 20:36:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783481784; x=1784086584; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=BvffsWlG6NIDI4wpXBTvJiGnizG3fIiSLad7tqLqNo8=; b=nxD9yx4XGIORG9UGZ0bg3/yBPKqOATKU57FZZKU9q4NUocEQQMwdbTKnCTuY6dQw2j 8fwWHfdBoiPguYMx1xAVFG6rZXGoFEOGwCMH/oqWgPbSp5Pc/O2bkXFPLbomUZfh6Mf3 YvR04uoTaK/p0c3faUKqr4kBQ+WYefiQd+r3wcbR2rcOvsmhpW1lXxsI/KK02VbueFnV x07QzQpxKL/jMBsHU9/csNmMsUTBQvwG4h7+JplK4sqswgJm2iESstR3IzJS/P3hggXQ fch9LHrWz9GuZg9BNEUmRZrbNeU9Xpx49ScTyiTV28vGNyl4P/ggd9CVBh+FG1nAsKWa xLwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783481784; x=1784086584; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=BvffsWlG6NIDI4wpXBTvJiGnizG3fIiSLad7tqLqNo8=; b=FtaTEUw9SfSPCMA+1rPMEUgcwndD3sgffWKt/UOnYtmoRe9r+ZAgUDjdIRdbQPoLEm B4vRoxsudpTmwUtywI2PK3wCnb1kIokh4j6x/E7dPGpPJVMg7xS3qr5d+grif5t3sXPj A2j1HiPGCzIzM/jg/gylN5nzi8ypQr0g7XI27ohMNFOFEkHmqHbRvK4HIVIcAZtcIp3o VWnZHHZ1KEL2exA1mXEFjVe4bbYJJ6+jqxHg/vjL7Y55OPQMBqrMcnJEjMSIf/Frr+Ga BPIKJYEX9suRwnPq3677br7OOsdOGPCkP4pD3dxNHt3YNHPheS9LsNdoaqbe3EbtktwR bBCA== X-Forwarded-Encrypted: i=1; AHgh+RoqwAsJAR/o1ulXeIk5eYyxz/p5F5XZVabWHD+GFLjtle/Ieg9t/YszTAcB8HvB2tdh6J15iLo8NQ81f8c=@vger.kernel.org X-Gm-Message-State: AOJu0YzFt/+UmNPtEpNIE0af/HGl68flBFEMhRObPLm0fI3TjzdI3Zdj pJyAy2DBcFq0+T2Yn/bFee+d6q0rt4zzu4e6AiASGVm7H+oghi9EE66M X-Gm-Gg: AfdE7cleY5rrOvaQ+MSERYI+9oZECAs61YVTK5dRGkqteCz6J9Tmy64InmHjGYBaxZg DsPv6oCS/NsP8+i5T4i4K24Q9QNiSPr7PdmPKjJ1vRarxf3FklnSxUkT+fzAXmQbbPWptG8uQHj z8owyXcHOoTsKCXFz9X+ivU3G1Z75Ar0LS/0kCDt4bUX8h3PWsAG22w+Y+CPpRDnUE6BhMKyRd0 4CUoKhbXyt1xuxS//6wrz2x942SHN01Qr5AOjDo7QsVa4IQ2sG/SsRwtk/Jtc9bX5qLEoUblPya rsId5ppVVlfyOTAJfpRkeRdGkacJrirE3r/d004bDhoZoK19xIyOjGsgsSp0g5GXhGEG+HbhENu 6TDkymyqMd245XGIaD2T4VgtKFOops/1UkmACarUAY2u8CpryQTtQ57pbmh4dUJZeB3XINxG5Id 3iRvTwkEauGyUbovSLvUtMv2gGcGVCIKUXFhxdl2c= X-Received: by 2002:a05:6a20:428b:b0:3c0:9c19:658f with SMTP id adf61e73a8af0-3c0bd00234cmr649122637.73.1783481784340; Tue, 07 Jul 2026 20:36:24 -0700 (PDT) Received: from [10.0.0.65] ([2601:647:6700:64d0::94ac]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-31174accae5sm21092850eec.29.2026.07.07.20.36.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jul 2026 20:36:23 -0700 (PDT) From: Charlie Jenkins Date: Tue, 07 Jul 2026 20:34:26 -0700 Subject: [PATCH v3 03/17] riscv: kgdb: Use generated instruction headers Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260707-riscv_insn_table-v3-3-3f8e5f75ba97@gmail.com> References: <20260707-riscv_insn_table-v3-0-3f8e5f75ba97@gmail.com> In-Reply-To: <20260707-riscv_insn_table-v3-0-3f8e5f75ba97@gmail.com> To: Paul Walmsley , Palmer Dabbelt , Nam Cao , Alexandre Ghiti , Anup Patel , Atish Patra , Conor Dooley , Paolo Bonzini , Andrew Morton , Shuah Khan , =?utf-8?q?Radim_Kr=C4=8Dm=C3=A1=C5=99?= , Jesse Taube Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, linux-kselftest@vger.kernel.org, Charlie Jenkins X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1783481777; l=7745; i=thecharlesjenkins@gmail.com; s=20260605; h=from:subject:message-id; bh=IjVaLmAyDsdmOm3A507KtKDP292jEnsVxwzZ/J7AzEQ=; b=mBC0UXZEz49zdrNmAX+X8iCdHwZI8pY0Y8/OGEoAve1HO2d2ZHbPUA3ECdGF8IjqpPMzn/c/h vQ+Yx+OV20OCyC33LTSB7DIlSCICWxDFemHYeAoWep7czBEeu1Y3L8R X-Developer-Key: i=thecharlesjenkins@gmail.com; a=ed25519; pk=ajnnRQ98PIdwKp4HeMkq9U32okYbnh6Zb4G3o5XXvkg= Migrate the code that is decoding instructions for the use of kgdb single stepping to use the generated instruction headers instead of the hand-written instruction functions. Signed-off-by: Charlie Jenkins --- I tested this again by comparing the original get_step_address() function with this new version and input all possible 32 bit numbers and checked that the next_addr was the same in every case. This is the code I used: void check_step() { for (unsigned long opcode = 0; opcode < ((1ULL << 32) - 1); opcode++) { unsigned long next_addr, next_addr2; get_step_address(opcode, &next_addr); get_step_address2(opcode, &next_addr2); if (next_addr != next_addr2) { printf("opcode: %lu -> %lu != %lu\n", opcode, next_addr, next_addr2); } } } --- arch/riscv/include/asm/insn.h | 21 +++++++++ arch/riscv/kernel/kgdb.c | 102 ++++++++++++++++-------------------------- 2 files changed, 60 insertions(+), 63 deletions(-) diff --git a/arch/riscv/include/asm/insn.h b/arch/riscv/include/asm/insn.h index d0e137f9bcd7..b92c71896c00 100644 --- a/arch/riscv/include/asm/insn.h +++ b/arch/riscv/include/asm/insn.h @@ -514,4 +514,25 @@ static __always_inline bool riscv_insn_is_branch(u32 code) #define RVV_EXTRACT_VL_VS_WIDTH(x) RVFDQ_EXTRACT_FL_FS_WIDTH(x) +static inline unsigned long riscv_insn_reg_get_val(unsigned long *regs, u32 index) +{ + /* register 0 is always 0 and not stored in the register struct */ + return index ? *(regs + index) : 0; +} + +#define riscv_insn_branch(_insn, regs_ptr, _opcode, _pc, _comparison, type) \ + ({ \ + unsigned long _ret; \ + if ((type)riscv_insn_reg_get_val( \ + regs_ptr, \ + riscv_insn_##_insn##_extract_xs1(_opcode)) \ + _comparison(type) riscv_insn_reg_get_val( \ + regs_ptr, \ + riscv_insn_##_insn##_extract_xs2(_opcode))) \ + _ret = _pc + riscv_insn_##_insn##_extract_imm(_opcode); \ + else \ + _ret = _pc + 4; \ + _ret; \ + }) + #endif /* _ASM_RISCV_INSN_H */ diff --git a/arch/riscv/kernel/kgdb.c b/arch/riscv/kernel/kgdb.c index 0bf629204c76..fcf7cda3cc33 100644 --- a/arch/riscv/kernel/kgdb.c +++ b/arch/riscv/kernel/kgdb.c @@ -23,97 +23,73 @@ enum { static unsigned long stepped_address; static unsigned int stepped_opcode; -static int decode_register_index(unsigned long opcode, int offset) -{ - return (opcode >> offset) & 0x1F; -} - -static int decode_register_index_short(unsigned long opcode, int offset) -{ - return ((opcode >> offset) & 0x7) + 8; -} - -/* Calculate the new address for after a step */ static int get_step_address(struct pt_regs *regs, unsigned long *next_addr) { unsigned long pc = regs->epc; unsigned long *regs_ptr = (unsigned long *)regs; - unsigned int rs1_num, rs2_num; + unsigned int rs1_num; int op_code; if (get_kernel_nofault(op_code, (void *)pc)) return -EINVAL; + if ((op_code & __INSN_LENGTH_MASK) != __INSN_LENGTH_GE_32) { - if (riscv_insn_is_c_jalr(op_code) || - riscv_insn_is_c_jr(op_code)) { - rs1_num = decode_register_index(op_code, RVC_C2_RS1_OPOFF); - *next_addr = regs_ptr[rs1_num]; - } else if (riscv_insn_is_c_j(op_code) || - riscv_insn_is_c_jal(op_code)) { - *next_addr = RVC_EXTRACT_JTYPE_IMM(op_code) + pc; + if (riscv_insn_is_c_jalr(op_code)) { + *next_addr = regs_ptr[riscv_insn_c_jalr_extract_xs1(op_code)]; + } else if (riscv_insn_is_c_jr(op_code)) { + *next_addr = regs_ptr[riscv_insn_c_jr_extract_xs1(op_code)]; + } else if (riscv_insn_is_c_j(op_code)) { + *next_addr = riscv_insn_c_j_extract_imm(op_code) + pc; + } else if (riscv_insn_is_c_jal(op_code)) { + *next_addr = riscv_insn_c_jal_extract_imm(op_code) + pc; } else if (riscv_insn_is_c_beqz(op_code)) { - rs1_num = decode_register_index_short(op_code, - RVC_C1_RS1_OPOFF); - if (!rs1_num || regs_ptr[rs1_num] == 0) - *next_addr = RVC_EXTRACT_BTYPE_IMM(op_code) + pc; + rs1_num = riscv_insn_c_beqz_extract_xs1(op_code); + if (regs_ptr[8 + rs1_num] == 0) + *next_addr = riscv_insn_c_beqz_extract_imm(op_code) + pc; else *next_addr = pc + 2; } else if (riscv_insn_is_c_bnez(op_code)) { - rs1_num = - decode_register_index_short(op_code, RVC_C1_RS1_OPOFF); - if (rs1_num && regs_ptr[rs1_num] != 0) - *next_addr = RVC_EXTRACT_BTYPE_IMM(op_code) + pc; + rs1_num = riscv_insn_c_bnez_extract_xs1(op_code); + if (regs_ptr[8 + rs1_num] != 0) + *next_addr = riscv_insn_c_bnez_extract_imm(op_code) + pc; else *next_addr = pc + 2; } else { *next_addr = pc + 2; } } else { - if ((op_code & __INSN_OPCODE_MASK) == __INSN_BRANCH_OPCODE) { - bool result = false; - long imm = RV_EXTRACT_BTYPE_IMM(op_code); - unsigned long rs1_val = 0, rs2_val = 0; - - rs1_num = decode_register_index(op_code, RVG_RS1_OPOFF); - rs2_num = decode_register_index(op_code, RVG_RS2_OPOFF); - if (rs1_num) - rs1_val = regs_ptr[rs1_num]; - if (rs2_num) - rs2_val = regs_ptr[rs2_num]; - - if (riscv_insn_is_beq(op_code)) - result = (rs1_val == rs2_val) ? true : false; - else if (riscv_insn_is_bne(op_code)) - result = (rs1_val != rs2_val) ? true : false; - else if (riscv_insn_is_blt(op_code)) - result = - ((long)rs1_val < - (long)rs2_val) ? true : false; - else if (riscv_insn_is_bge(op_code)) - result = - ((long)rs1_val >= - (long)rs2_val) ? true : false; - else if (riscv_insn_is_bltu(op_code)) - result = (rs1_val < rs2_val) ? true : false; - else if (riscv_insn_is_bgeu(op_code)) - result = (rs1_val >= rs2_val) ? true : false; - if (result) - *next_addr = imm + pc; - else - *next_addr = pc + 4; + if (riscv_insn_is_beq(op_code)) { + *next_addr = riscv_insn_branch(beq, regs_ptr, op_code, + pc, ==, unsigned long); + } else if (riscv_insn_is_bne(op_code)) { + *next_addr = riscv_insn_branch(bne, regs_ptr, op_code, + pc, !=, unsigned long); + } else if (riscv_insn_is_blt(op_code)) { + *next_addr = riscv_insn_branch(blt, regs_ptr, op_code, + pc, <, long); + } else if (riscv_insn_is_bge(op_code)) { + *next_addr = riscv_insn_branch(bge, regs_ptr, op_code, + pc, >=, long); + } else if (riscv_insn_is_bltu(op_code)) { + *next_addr = riscv_insn_branch(bltu, regs_ptr, op_code, + pc, <, unsigned long); + } else if (riscv_insn_is_bgeu(op_code)) { + *next_addr = riscv_insn_branch(bgeu, regs_ptr, op_code, + pc, >=, unsigned long); } else if (riscv_insn_is_jal(op_code)) { - *next_addr = RV_EXTRACT_JTYPE_IMM(op_code) + pc; + *next_addr = riscv_insn_jal_extract_imm(op_code) + pc; } else if (riscv_insn_is_jalr(op_code)) { - rs1_num = decode_register_index(op_code, RVG_RS1_OPOFF); + rs1_num = riscv_insn_jalr_extract_xs1(op_code); if (rs1_num) - *next_addr = ((unsigned long *)regs)[rs1_num]; - *next_addr += RV_EXTRACT_ITYPE_IMM(op_code); + *next_addr = regs_ptr[rs1_num]; + *next_addr += riscv_insn_jalr_extract_imm(op_code); } else if (riscv_insn_is_sret(op_code)) { *next_addr = pc; } else { *next_addr = pc + 4; } } + return 0; } -- 2.54.0