Allow calls in alternatives
v5 cover Allow calls in alternatives
From: Heiko Stuebner <[email protected]>
This series is split out of my work on optimizing string functions and provides the basics to:
- actually allowing calls in alternatives
Function calls use auipc + jalr to reach those 32bit relative addresses but when they're compiled the offset will be wrong as alternatives live in a different section. So when the patch gets applied the address will point to the wrong location.
So similar to arm64 the target addresses need to be updated.
This is probably also helpful for other things needing more complex code in alternatives.
For v2 I got into some sort of cleanup spree for the general instruction parsing that already existed. A number of places do their own instruction parsing and I tried consolidating some of them.
Noteable, the kvm parts still do, but I had to stop somewhere :-)
The series is based on
commit 51094a24b85e ("Merge tag 'hardening-v6.2-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux")
from Fri Dec 23 12:00:24 2022 -0800 right now, this is the most current commit during the merge window and seems to include most or all riscv changes for the 6.2 merge-window, so the series should apply cleanly once 6.2-rc1 is out.
changes since v4:
- while people reporting nits for v4 mentioned that it wouldn't be necessary to respin for each, the number of them the series received waranted a respin I think
- split riscv_insn_insert_utype_itype_imm parameters into separate utype + itype u32 pointer (Andrew)
- use u32 instead of unsigned int in riscv_instruction_at (Jess)
- rename instruction params in riscv_alternative_fix_auipc_jalr make their content obvious (Andrew)
- standardize on insn for instruction-related variables (Conor)
- make comment about ra register check more explicit (Conor)
changes since v3:
- separate allowing calls in alternatives from string work
- move the immediate handling for auipc+jalr into the insn.h header This allows other parts of the kernel to reuse this, instead of duplicating the code in a number or areas
- adjust the riscv_alternative_fix_auipc_jalr function to be called from a central _fix_offsets function, so that other offsets can get fixed from the same loop in the future (jal, etc)
I've removed Conor's Reviewed-by: from that last patch, as it changed so much since v3.
changes since v2:
- add patch fixing the c.jalr funct4 value
- reword some commit messages
- fix position of auipc addition patch (earlier)
- fix compile errors from patch-reordering gone wrong (worked at the end of v2, but compiling individual patches caused issues) - patches are now tested individually
- limit Zbb variants for GNU as for now
(LLVM support for .option arch is still under review)
- prevent str-functions from getting optimized to builtin-variants
changes since v1:
- a number of generalizations/cleanups for instruction parsing
- use accessor function to access instructions (Emil)
- actually patch the correct location when having more than one instruction in an alternative block
- string function cleanups (comments etc) (Conor)
- move zbb extension above s* extensions in cpu.c lists
changes since rfc:
- make Zbb code actually work
- drop some unneeded patches
- a lot of cleanups
Heiko Stuebner (12):
RISC-V: fix funct4 definition for c.jalr in parse_asm.h
RISC-V: add prefix to all constants/macros in parse_asm.h
RISC-V: detach funct-values from their offset
RISC-V: add ebreak instructions to definitions
RISC-V: add auipc elements to parse_asm header
RISC-V: Move riscv_insn_is_* macros into a common header
RISC-V: rename parse_asm.h to insn.h
RISC-V: kprobes: use central defined funct3 constants
RISC-V: add U-type imm parsing to insn.h header
RISC-V: add rd reg parsing to insn.h header
RISC-V: add helpers for handling immediates in U-type and I-type pairs
RISC-V: fix auipc-jalr addresses in patched alternatives
arch/riscv/include/asm/alternative.h | 3 + arch/riscv/include/asm/insn.h | 340 +++++++++++++++++++++++ arch/riscv/include/asm/parse_asm.h | 219 --------------- arch/riscv/kernel/alternative.c | 56 ++++ arch/riscv/kernel/cpufeature.c | 5 +- arch/riscv/kernel/kgdb.c | 63 ++--- arch/riscv/kernel/probes/simulate-insn.c | 19 +- arch/riscv/kernel/probes/simulate-insn.h | 26 +- 8 files changed, 436 insertions(+), 295 deletions(-) create mode 100644 arch/riscv/include/asm/insn.h delete mode 100644 arch/riscv/include/asm/parse_asm.h
Signature · 7 lines
2.35.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH v5 1/12 RISC-V: fix funct4 definition for c.jalr in parse_asm.h
From: Heiko Stuebner <[email protected]>
The opcode definition for c.jalr is
c.jalr c_rs1_n0 1..0=2 15..13=4 12=1 6..2=0
This means funct4 consisting of bit [15:12] is 1001b, so the value is 0x9.
--- arch/riscv/include/asm/parse_asm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/riscv/include/asm/parse_asm.h +1 -1
@@ -125,7 +125,7 @@#define FUNCT3_C_J 0xa000#define FUNCT3_C_JAL 0x2000#define FUNCT4_C_JR 0x8000 -#define FUNCT4_C_JALR 0xf000 +#define FUNCT4_C_JALR 0x9000#define FUNCT12_SRET 0x10200000
Signature · 7 lines
2.35.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH v5 2/12 RISC-V: add prefix to all constants/macros in parse_asm.h
In reply to Heiko StuebnerFrom: Heiko Stuebner <[email protected]>
Some of the constants and macros already have suitable RV_, RVG_ or RVC_ prefixes.
Extend this to the rest of the file as well, as we want to use these things in a broader scope soon.
--- arch/riscv/include/asm/parse_asm.h | 194 ++++++++++++++--------------- arch/riscv/kernel/kgdb.c | 40 +++--- 2 files changed, 117 insertions(+), 117 deletions(-)
arch/riscv/include/asm/parse_asm.h +97 -97
@@ -6,37 +6,37 @@#include <linux/bits.h> /* The bit field of immediate value in I-type instruction */ -#define I_IMM_SIGN_OPOFF 31 -#define I_IMM_11_0_OPOFF 20 -#define I_IMM_SIGN_OFF 12 -#define I_IMM_11_0_OFF 0 -#define I_IMM_11_0_MASK GENMASK(11, 0) +#define RV_I_IMM_SIGN_OPOFF 31 +#define RV_I_IMM_11_0_OPOFF 20 +#define RV_I_IMM_SIGN_OFF 12 +#define RV_I_IMM_11_0_OFF 0 +#define RV_I_IMM_11_0_MASK GENMASK(11, 0)/* The bit field of immediate value in J-type instruction */ -#define J_IMM_SIGN_OPOFF 31 -#define J_IMM_10_1_OPOFF 21 -#define J_IMM_11_OPOFF 20 -#define J_IMM_19_12_OPOFF 12 -#define J_IMM_SIGN_OFF 20 -#define J_IMM_10_1_OFF 1 -#define J_IMM_11_OFF 11 -#define J_IMM_19_12_OFF 12 -#define J_IMM_10_1_MASK GENMASK(9, 0) -#define J_IMM_11_MASK GENMASK(0, 0) -#define J_IMM_19_12_MASK GENMASK(7, 0) +#define RV_J_IMM_SIGN_OPOFF 31 +#define RV_J_IMM_10_1_OPOFF 21 +#define RV_J_IMM_11_OPOFF 20 +#define RV_J_IMM_19_12_OPOFF 12 +#define RV_J_IMM_SIGN_OFF 20 +#define RV_J_IMM_10_1_OFF 1 +#define RV_J_IMM_11_OFF 11 +#define RV_J_IMM_19_12_OFF 12 +#define RV_J_IMM_10_1_MASK GENMASK(9, 0) +#define RV_J_IMM_11_MASK GENMASK(0, 0) +#define RV_J_IMM_19_12_MASK GENMASK(7, 0)/* The bit field of immediate value in B-type instruction */ -#define B_IMM_SIGN_OPOFF 31 -#define B_IMM_10_5_OPOFF 25 -#define B_IMM_4_1_OPOFF 8 -#define B_IMM_11_OPOFF 7 -#define B_IMM_SIGN_OFF 12 -#define B_IMM_10_5_OFF 5 -#define B_IMM_4_1_OFF 1 -#define B_IMM_11_OFF 11 -#define B_IMM_10_5_MASK GENMASK(5, 0) -#define B_IMM_4_1_MASK GENMASK(3, 0) -#define B_IMM_11_MASK GENMASK(0, 0) +#define RV_B_IMM_SIGN_OPOFF 31 +#define RV_B_IMM_10_5_OPOFF 25 +#define RV_B_IMM_4_1_OPOFF 8 +#define RV_B_IMM_11_OPOFF 7 +#define RV_B_IMM_SIGN_OFF 12 +#define RV_B_IMM_10_5_OFF 5 +#define RV_B_IMM_4_1_OFF 1 +#define RV_B_IMM_11_OFF 11 +#define RV_B_IMM_10_5_MASK GENMASK(5, 0) +#define RV_B_IMM_4_1_MASK GENMASK(3, 0) +#define RV_B_IMM_11_MASK GENMASK(0, 0)/* The register offset in RVG instruction */ #define RVG_RS1_OPOFF 15
@@ -100,71 +100,71 @@#define RVC_C2_RD_OPOFF 7/* parts of opcode for RVG*/ -#define OPCODE_BRANCH 0x63 -#define OPCODE_JALR 0x67 -#define OPCODE_JAL 0x6f -#define OPCODE_SYSTEM 0x73 +#define RVG_OPCODE_BRANCH 0x63 +#define RVG_OPCODE_JALR 0x67 +#define RVG_OPCODE_JAL 0x6f +#define RVG_OPCODE_SYSTEM 0x73/* parts of opcode for RVC*/ -#define OPCODE_C_0 0x0 -#define OPCODE_C_1 0x1 -#define OPCODE_C_2 0x2 +#define RVC_OPCODE_C0 0x0 +#define RVC_OPCODE_C1 0x1 +#define RVC_OPCODE_C2 0x2/* parts of funct3 code for I, M, A extension*/ -#define FUNCT3_JALR 0x0 -#define FUNCT3_BEQ 0x0 -#define FUNCT3_BNE 0x1000 -#define FUNCT3_BLT 0x4000 -#define FUNCT3_BGE 0x5000 -#define FUNCT3_BLTU 0x6000 -#define FUNCT3_BGEU 0x7000 +#define RVG_FUNCT3_JALR 0x0 +#define RVG_FUNCT3_BEQ 0x0 +#define RVG_FUNCT3_BNE 0x1000 +#define RVG_FUNCT3_BLT 0x4000 +#define RVG_FUNCT3_BGE 0x5000 +#define RVG_FUNCT3_BLTU 0x6000 +#define RVG_FUNCT3_BGEU 0x7000/* parts of funct3 code for C extension*/ -#define FUNCT3_C_BEQZ 0xc000 -#define FUNCT3_C_BNEZ 0xe000 -#define FUNCT3_C_J 0xa000 -#define FUNCT3_C_JAL 0x2000 -#define FUNCT4_C_JR 0x8000 -#define FUNCT4_C_JALR 0x9000 - -#define FUNCT12_SRET 0x10200000 - -#define MATCH_JALR (FUNCT3_JALR | OPCODE_JALR) -#define MATCH_JAL (OPCODE_JAL) -#define MATCH_BEQ (FUNCT3_BEQ | OPCODE_BRANCH) -#define MATCH_BNE (FUNCT3_BNE | OPCODE_BRANCH) -#define MATCH_BLT (FUNCT3_BLT | OPCODE_BRANCH) -#define MATCH_BGE (FUNCT3_BGE | OPCODE_BRANCH) -#define MATCH_BLTU (FUNCT3_BLTU | OPCODE_BRANCH) -#define MATCH_BGEU (FUNCT3_BGEU | OPCODE_BRANCH) -#define MATCH_SRET (FUNCT12_SRET | OPCODE_SYSTEM) -#define MATCH_C_BEQZ (FUNCT3_C_BEQZ | OPCODE_C_1) -#define MATCH_C_BNEZ (FUNCT3_C_BNEZ | OPCODE_C_1) -#define MATCH_C_J (FUNCT3_C_J | OPCODE_C_1) -#define MATCH_C_JAL (FUNCT3_C_JAL | OPCODE_C_1) -#define MATCH_C_JR (FUNCT4_C_JR | OPCODE_C_2) -#define MATCH_C_JALR (FUNCT4_C_JALR | OPCODE_C_2) - -#define MASK_JALR 0x707f -#define MASK_JAL 0x7f -#define MASK_C_JALR 0xf07f -#define MASK_C_JR 0xf07f -#define MASK_C_JAL 0xe003 -#define MASK_C_J 0xe003 -#define MASK_BEQ 0x707f -#define MASK_BNE 0x707f -#define MASK_BLT 0x707f -#define MASK_BGE 0x707f -#define MASK_BLTU 0x707f -#define MASK_BGEU 0x707f -#define MASK_C_BEQZ 0xe003 -#define MASK_C_BNEZ 0xe003 -#define MASK_SRET 0xffffffff +#define RVC_FUNCT3_C_BEQZ 0xc000 +#define RVC_FUNCT3_C_BNEZ 0xe000 +#define RVC_FUNCT3_C_J 0xa000 +#define RVC_FUNCT3_C_JAL 0x2000 +#define RVC_FUNCT4_C_JR 0x8000 +#define RVC_FUNCT4_C_JALR 0x9000 + +#define RVG_FUNCT12_SRET 0x10200000 + +#define RVG_MATCH_JALR (RVG_FUNCT3_JALR | RVG_OPCODE_JALR) +#define RVG_MATCH_JAL (RVG_OPCODE_JAL) +#define RVG_MATCH_BEQ (RVG_FUNCT3_BEQ | RVG_OPCODE_BRANCH) +#define RVG_MATCH_BNE (RVG_FUNCT3_BNE | RVG_OPCODE_BRANCH) +#define RVG_MATCH_BLT (RVG_FUNCT3_BLT | RVG_OPCODE_BRANCH) +#define RVG_MATCH_BGE (RVG_FUNCT3_BGE | RVG_OPCODE_BRANCH) +#define RVG_MATCH_BLTU (RVG_FUNCT3_BLTU | RVG_OPCODE_BRANCH) +#define RVG_MATCH_BGEU (RVG_FUNCT3_BGEU | RVG_OPCODE_BRANCH) +#define RVG_MATCH_SRET (RVG_FUNCT12_SRET | RVG_OPCODE_SYSTEM) +#define RVC_MATCH_C_BEQZ (RVC_FUNCT3_C_BEQZ | RVC_OPCODE_C1) +#define RVC_MATCH_C_BNEZ (RVC_FUNCT3_C_BNEZ | RVC_OPCODE_C1) +#define RVC_MATCH_C_J (RVC_FUNCT3_C_J | RVC_OPCODE_C1) +#define RVC_MATCH_C_JAL (RVC_FUNCT3_C_JAL | RVC_OPCODE_C1) +#define RVC_MATCH_C_JR (RVC_FUNCT4_C_JR | RVC_OPCODE_C2) +#define RVC_MATCH_C_JALR (RVC_FUNCT4_C_JALR | RVC_OPCODE_C2) + +#define RVG_MASK_JALR 0x707f +#define RVG_MASK_JAL 0x7f +#define RVC_MASK_C_JALR 0xf07f +#define RVC_MASK_C_JR 0xf07f +#define RVC_MASK_C_JAL 0xe003 +#define RVC_MASK_C_J 0xe003 +#define RVG_MASK_BEQ 0x707f +#define RVG_MASK_BNE 0x707f +#define RVG_MASK_BLT 0x707f +#define RVG_MASK_BGE 0x707f +#define RVG_MASK_BLTU 0x707f +#define RVG_MASK_BGEU 0x707f +#define RVC_MASK_C_BEQZ 0xe003 +#define RVC_MASK_C_BNEZ 0xe003 +#define RVG_MASK_SRET 0xffffffff#define __INSN_LENGTH_MASK _UL(0x3)#define __INSN_LENGTH_GE_32 _UL(0x3)#define __INSN_OPCODE_MASK _UL(0x7F) -#define __INSN_BRANCH_OPCODE _UL(OPCODE_BRANCH) +#define __INSN_BRANCH_OPCODE _UL(RVG_OPCODE_BRANCH)/* Define a series of is_XXX_insn functions to check if the value INSN * is an instance of instruction XXX.
@@ -180,26 +180,26 @@ static inline bool is_ ## INSN_NAME ## _insn(long insn) \#define RV_X (X , s, mask) (((X) >> (s)) & (mask))#define RVC_X (X , s, mask) RV_X(X, s, mask) -#define EXTRACT_JTYPE_IMM (x) \ +#define RV_EXTRACT_JTYPE_IMM (x) \ ({typeof(x) x_ = (x); \ - (RV_X(x_, J_IMM_10_1_OPOFF, J_IMM_10_1_MASK) << J_IMM_10_1_OFF) | \ - (RV_X(x_, J_IMM_11_OPOFF, J_IMM_11_MASK) << J_IMM_11_OFF) | \ - (RV_X(x_, J_IMM_19_12_OPOFF, J_IMM_19_12_MASK) << J_IMM_19_12_OFF) | \ - (RV_IMM_SIGN(x_) << J_IMM_SIGN_OFF); }) + (RV_X(x_, RV_J_IMM_10_1_OPOFF, RV_J_IMM_10_1_MASK) << RV_J_IMM_10_1_OFF) | \ + (RV_X(x_, RV_J_IMM_11_OPOFF, RV_J_IMM_11_MASK) << RV_J_IMM_11_OFF) | \ + (RV_X(x_, RV_J_IMM_19_12_OPOFF, RV_J_IMM_19_12_MASK) << RV_J_IMM_19_12_OFF) | \ + (RV_IMM_SIGN(x_) << RV_J_IMM_SIGN_OFF); }) -#define EXTRACT_ITYPE_IMM (x) \ +#define RV_EXTRACT_ITYPE_IMM (x) \ ({typeof(x) x_ = (x); \ - (RV_X(x_, I_IMM_11_0_OPOFF, I_IMM_11_0_MASK)) | \ - (RV_IMM_SIGN(x_) << I_IMM_SIGN_OFF); }) + (RV_X(x_, RV_I_IMM_11_0_OPOFF, RV_I_IMM_11_0_MASK)) | \ + (RV_IMM_SIGN(x_) << RV_I_IMM_SIGN_OFF); }) -#define EXTRACT_BTYPE_IMM (x) \ +#define RV_EXTRACT_BTYPE_IMM (x) \ ({typeof(x) x_ = (x); \ - (RV_X(x_, B_IMM_4_1_OPOFF, B_IMM_4_1_MASK) << B_IMM_4_1_OFF) | \ - (RV_X(x_, B_IMM_10_5_OPOFF, B_IMM_10_5_MASK) << B_IMM_10_5_OFF) | \ - (RV_X(x_, B_IMM_11_OPOFF, B_IMM_11_MASK) << B_IMM_11_OFF) | \ - (RV_IMM_SIGN(x_) << B_IMM_SIGN_OFF); }) + (RV_X(x_, RV_B_IMM_4_1_OPOFF, RV_B_IMM_4_1_MASK) << RV_B_IMM_4_1_OFF) | \ + (RV_X(x_, RV_B_IMM_10_5_OPOFF, RV_B_IMM_10_5_MASK) << RV_B_IMM_10_5_OFF) | \ + (RV_X(x_, RV_B_IMM_11_OPOFF, RV_B_IMM_11_MASK) << RV_B_IMM_11_OFF) | \ + (RV_IMM_SIGN(x_) << RV_B_IMM_SIGN_OFF); }) -#define EXTRACT_RVC_J_IMM (x) \ +#define RVC_EXTRACT_JTYPE_IMM (x) \ ({typeof(x) x_ = (x); \ (RVC_X(x_, RVC_J_IMM_3_1_OPOFF, RVC_J_IMM_3_1_MASK) << RVC_J_IMM_3_1_OFF) | \ (RVC_X(x_, RVC_J_IMM_4_OPOFF, RVC_J_IMM_4_MASK) << RVC_J_IMM_4_OFF) | \
@@ -210,7 +210,7 @@ static inline bool is_ ## INSN_NAME ## _insn(long insn) \ (RVC_X (x_,RVC_J_IMM_10_OPOFF ,RVC_J_IMM_10_MASK ) <<RVC_J_IMM_10_OFF ) | \ (RVC_IMM_SIGN(x_) << RVC_J_IMM_SIGN_OFF); }) -#define EXTRACT_RVC_B_IMM (x) \ +#define RVC_EXTRACT_BTYPE_IMM (x) \ ({typeof(x) x_ = (x); \ (RVC_X(x_, RVC_B_IMM_2_1_OPOFF, RVC_B_IMM_2_1_MASK) << RVC_B_IMM_2_1_OFF) | \ (RVC_X(x_, RVC_B_IMM_4_3_OPOFF, RVC_B_IMM_4_3_MASK) << RVC_B_IMM_4_3_OFF) | \
arch/riscv/kernel/kgdb.c +20 -20
@@ -29,20 +29,20 @@ DECLARE_INSN(c_jal, MATCH_C_JAL, MASK_C_JAL)#else #define is_c_jal_insn (opcode) 0#endif -DECLARE_INSN(jalr, MATCH_JALR, MASK_JALR) -DECLARE_INSN(jal, MATCH_JAL, MASK_JAL) -DECLARE_INSN(c_jr, MATCH_C_JR, MASK_C_JR) -DECLARE_INSN(c_jalr, MATCH_C_JALR, MASK_C_JALR) -DECLARE_INSN(c_j, MATCH_C_J, MASK_C_J) -DECLARE_INSN(beq, MATCH_BEQ, MASK_BEQ) -DECLARE_INSN(bne, MATCH_BNE, MASK_BNE) -DECLARE_INSN(blt, MATCH_BLT, MASK_BLT) -DECLARE_INSN(bge, MATCH_BGE, MASK_BGE) -DECLARE_INSN(bltu, MATCH_BLTU, MASK_BLTU) -DECLARE_INSN(bgeu, MATCH_BGEU, MASK_BGEU) -DECLARE_INSN(c_beqz, MATCH_C_BEQZ, MASK_C_BEQZ) -DECLARE_INSN(c_bnez, MATCH_C_BNEZ, MASK_C_BNEZ) -DECLARE_INSN(sret, MATCH_SRET, MASK_SRET) +DECLARE_INSN(jalr, RVG_MATCH_JALR, RVG_MASK_JALR) +DECLARE_INSN(jal, RVG_MATCH_JAL, RVG_MASK_JAL) +DECLARE_INSN(c_jr, RVC_MATCH_C_JR, RVC_MASK_C_JR) +DECLARE_INSN(c_jalr, RVC_MATCH_C_JALR, RVC_MASK_C_JALR) +DECLARE_INSN(c_j, RVC_MATCH_C_J, RVC_MASK_C_J) +DECLARE_INSN(beq, RVG_MATCH_BEQ, RVG_MASK_BEQ) +DECLARE_INSN(bne, RVG_MATCH_BNE, RVG_MASK_BNE) +DECLARE_INSN(blt, RVG_MATCH_BLT, RVG_MASK_BLT) +DECLARE_INSN(bge, RVG_MATCH_BGE, RVG_MASK_BGE) +DECLARE_INSN(bltu, RVG_MATCH_BLTU, RVG_MASK_BLTU) +DECLARE_INSN(bgeu, RVG_MATCH_BGEU, RVG_MASK_BGEU) +DECLARE_INSN(c_beqz, RVC_MATCH_C_BEQZ, RVC_MASK_C_BEQZ) +DECLARE_INSN(c_bnez, RVC_MATCH_C_BNEZ, RVC_MASK_C_BNEZ) +DECLARE_INSN(sret, RVG_MATCH_SRET, RVG_MASK_SRET)static int decode_register_index (unsigned long opcode,int offset) {
@@ -69,19 +69,19 @@ static int get_step_address(struct pt_regs *regs, unsigned long *next_addr) rs1_num =decode_register_index (op_code,RVC_C2_RS1_OPOFF ); *next_addr = regs_ptr[rs1_num]; }else if (is_c_j_insn (op_code) ||is_c_jal_insn (op_code)) { - *next_addr =EXTRACT_RVC_J_IMM (op_code) + pc; + *next_addr =RVC_EXTRACT_JTYPE_IMM (op_code) + pc; }else if (is_c_beqz_insn (op_code)) { rs1_num =decode_register_index_short (op_code,RVC_C1_RS1_OPOFF );if (!rs1_num || regs_ptr[rs1_num] ==0 ) - *next_addr =EXTRACT_RVC_B_IMM (op_code) + pc; + *next_addr =RVC_EXTRACT_BTYPE_IMM (op_code) + pc;else *next_addr = pc +2 ; }else if (is_c_bnez_insn (op_code)) { rs1_num =decode_register_index_short (op_code,RVC_C1_RS1_OPOFF );if (rs1_num && regs_ptr[rs1_num] !=0 ) - *next_addr =EXTRACT_RVC_B_IMM (op_code) + pc; + *next_addr =RVC_EXTRACT_BTYPE_IMM (op_code) + pc;else *next_addr = pc +2 ; }else {
@@ -90,7 +90,7 @@ static int get_step_address(struct pt_regs *regs, unsigned long *next_addr) }else {if ((op_code & __INSN_OPCODE_MASK) == __INSN_BRANCH_OPCODE) {bool result = false; -long imm =EXTRACT_BTYPE_IMM (op_code); +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 );
@@ -121,12 +121,12 @@ static int get_step_address(struct pt_regs *regs, unsigned long *next_addr)else *next_addr = pc +4 ; }else if (is_jal_insn (op_code)) { - *next_addr =EXTRACT_JTYPE_IMM (op_code) + pc; + *next_addr =RV_EXTRACT_JTYPE_IMM (op_code) + pc; }else if (is_jalr_insn (op_code)) { rs1_num =decode_register_index (op_code,RVG_RS1_OPOFF );if (rs1_num) *next_addr = ((unsigned long *)regs)[rs1_num]; - *next_addr +=EXTRACT_ITYPE_IMM (op_code); + *next_addr +=RV_EXTRACT_ITYPE_IMM (op_code); }else if (is_sret_insn (op_code)) { *next_addr = pc; }else {
Signature · 7 lines
2.35.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH v5 3/12 RISC-V: detach funct-values from their offset
In reply to Heiko StuebnerFrom: Heiko Stuebner <[email protected]>
Rather than defining funct3, funct4, etc values pre-shifted to their target-position in an instruction, define the values themselves and only shift them where needed.
This allows using these funct-values in other places as well, for example when decoding functions.
At the same time also reduces the use of magic numbers, one would need a spec manual to understand.
--- arch/riscv/include/asm/parse_asm.h | 100 +++++++++++++++++------------ 1 file changed, 59 insertions(+), 41 deletions(-)
arch/riscv/include/asm/parse_asm.h +59 -41
@@ -5,6 +5,15 @@#include <linux/bits.h> +#define RV_INSN_FUNCT3_MASK GENMASK(14, 12) +#define RV_INSN_FUNCT3_OPOFF 12 +#define RV_INSN_OPCODE_MASK GENMASK(6, 0) +#define RV_INSN_OPCODE_OPOFF 0 +#define RV_INSN_FUNCT12_OPOFF 20 + +#define RV_ENCODE_FUNCT3 (f_) (RVG_FUNCT3_##f_ << RV_INSN_FUNCT3_OPOFF) +#define RV_ENCODE_FUNCT12 (f_) (RVG_FUNCT12_##f_ << RV_INSN_FUNCT12_OPOFF) +/* The bit field of immediate value in I-type instruction */ #define RV_I_IMM_SIGN_OPOFF 31#define RV_I_IMM_11_0_OPOFF 20
@@ -84,6 +93,15 @@#define RVC_B_IMM_2_1_MASK GENMASK(1, 0)#define RVC_B_IMM_5_MASK GENMASK(0, 0) +#define RVC_INSN_FUNCT4_MASK GENMASK(15, 12) +#define RVC_INSN_FUNCT4_OPOFF 12 +#define RVC_INSN_FUNCT3_MASK GENMASK(15, 13) +#define RVC_INSN_FUNCT3_OPOFF 13 +#define RVC_INSN_J_RS2_MASK GENMASK(6, 2) +#define RVC_INSN_OPCODE_MASK GENMASK(1, 0) +#define RVC_ENCODE_FUNCT3 (f_) (RVC_FUNCT3_##f_ << RVC_INSN_FUNCT3_OPOFF) +#define RVC_ENCODE_FUNCT4 (f_) (RVC_FUNCT4_##f_ << RVC_INSN_FUNCT4_OPOFF) +/* The register offset in RVC op=C0 instruction */ #define RVC_C0_RS1_OPOFF 7#define RVC_C0_RS2_OPOFF 2
@@ -113,52 +131,52 @@/* parts of funct3 code for I, M, A extension*/ #define RVG_FUNCT3_JALR 0x0#define RVG_FUNCT3_BEQ 0x0 -#define RVG_FUNCT3_BNE 0x1000 -#define RVG_FUNCT3_BLT 0x4000 -#define RVG_FUNCT3_BGE 0x5000 -#define RVG_FUNCT3_BLTU 0x6000 -#define RVG_FUNCT3_BGEU 0x7000 +#define RVG_FUNCT3_BNE 0x1 +#define RVG_FUNCT3_BLT 0x4 +#define RVG_FUNCT3_BGE 0x5 +#define RVG_FUNCT3_BLTU 0x6 +#define RVG_FUNCT3_BGEU 0x7/* parts of funct3 code for C extension*/ -#define RVC_FUNCT3_C_BEQZ 0xc000 -#define RVC_FUNCT3_C_BNEZ 0xe000 -#define RVC_FUNCT3_C_J 0xa000 -#define RVC_FUNCT3_C_JAL 0x2000 -#define RVC_FUNCT4_C_JR 0x8000 -#define RVC_FUNCT4_C_JALR 0x9000 +#define RVC_FUNCT3_C_BEQZ 0x6 +#define RVC_FUNCT3_C_BNEZ 0x7 +#define RVC_FUNCT3_C_J 0x5 +#define RVC_FUNCT3_C_JAL 0x1 +#define RVC_FUNCT4_C_JR 0x8 +#define RVC_FUNCT4_C_JALR 0x9 -#define RVG_FUNCT12_SRET 0x10200000 +#define RVG_FUNCT12_SRET 0x102 -#define RVG_MATCH_JALR (RVG_FUNCT3_JALR | RVG_OPCODE_JALR) +#define RVG_MATCH_JALR (RV_ENCODE_FUNCT3(JALR) | RVG_OPCODE_JALR)#define RVG_MATCH_JAL (RVG_OPCODE_JAL) -#define RVG_MATCH_BEQ (RVG_FUNCT3_BEQ | RVG_OPCODE_BRANCH) -#define RVG_MATCH_BNE (RVG_FUNCT3_BNE | RVG_OPCODE_BRANCH) -#define RVG_MATCH_BLT (RVG_FUNCT3_BLT | RVG_OPCODE_BRANCH) -#define RVG_MATCH_BGE (RVG_FUNCT3_BGE | RVG_OPCODE_BRANCH) -#define RVG_MATCH_BLTU (RVG_FUNCT3_BLTU | RVG_OPCODE_BRANCH) -#define RVG_MATCH_BGEU (RVG_FUNCT3_BGEU | RVG_OPCODE_BRANCH) -#define RVG_MATCH_SRET (RVG_FUNCT12_SRET | RVG_OPCODE_SYSTEM) -#define RVC_MATCH_C_BEQZ (RVC_FUNCT3_C_BEQZ | RVC_OPCODE_C1) -#define RVC_MATCH_C_BNEZ (RVC_FUNCT3_C_BNEZ | RVC_OPCODE_C1) -#define RVC_MATCH_C_J (RVC_FUNCT3_C_J | RVC_OPCODE_C1) -#define RVC_MATCH_C_JAL (RVC_FUNCT3_C_JAL | RVC_OPCODE_C1) -#define RVC_MATCH_C_JR (RVC_FUNCT4_C_JR | RVC_OPCODE_C2) -#define RVC_MATCH_C_JALR (RVC_FUNCT4_C_JALR | RVC_OPCODE_C2) - -#define RVG_MASK_JALR 0x707f -#define RVG_MASK_JAL 0x7f -#define RVC_MASK_C_JALR 0xf07f -#define RVC_MASK_C_JR 0xf07f -#define RVC_MASK_C_JAL 0xe003 -#define RVC_MASK_C_J 0xe003 -#define RVG_MASK_BEQ 0x707f -#define RVG_MASK_BNE 0x707f -#define RVG_MASK_BLT 0x707f -#define RVG_MASK_BGE 0x707f -#define RVG_MASK_BLTU 0x707f -#define RVG_MASK_BGEU 0x707f -#define RVC_MASK_C_BEQZ 0xe003 -#define RVC_MASK_C_BNEZ 0xe003 +#define RVG_MATCH_BEQ (RV_ENCODE_FUNCT3(BEQ) | RVG_OPCODE_BRANCH) +#define RVG_MATCH_BNE (RV_ENCODE_FUNCT3(BNE) | RVG_OPCODE_BRANCH) +#define RVG_MATCH_BLT (RV_ENCODE_FUNCT3(BLT) | RVG_OPCODE_BRANCH) +#define RVG_MATCH_BGE (RV_ENCODE_FUNCT3(BGE) | RVG_OPCODE_BRANCH) +#define RVG_MATCH_BLTU (RV_ENCODE_FUNCT3(BLTU) | RVG_OPCODE_BRANCH) +#define RVG_MATCH_BGEU (RV_ENCODE_FUNCT3(BGEU) | RVG_OPCODE_BRANCH) +#define RVG_MATCH_SRET (RV_ENCODE_FUNCT12(SRET) | RVG_OPCODE_SYSTEM) +#define RVC_MATCH_C_BEQZ (RVC_ENCODE_FUNCT3(C_BEQZ) | RVC_OPCODE_C1) +#define RVC_MATCH_C_BNEZ (RVC_ENCODE_FUNCT3(C_BNEZ) | RVC_OPCODE_C1) +#define RVC_MATCH_C_J (RVC_ENCODE_FUNCT3(C_J) | RVC_OPCODE_C1) +#define RVC_MATCH_C_JAL (RVC_ENCODE_FUNCT3(C_JAL) | RVC_OPCODE_C1) +#define RVC_MATCH_C_JR (RVC_ENCODE_FUNCT4(C_JR) | RVC_OPCODE_C2) +#define RVC_MATCH_C_JALR (RVC_ENCODE_FUNCT4(C_JALR) | RVC_OPCODE_C2) + +#define RVG_MASK_JALR (RV_INSN_FUNCT3_MASK | RV_INSN_OPCODE_MASK) +#define RVG_MASK_JAL (RV_INSN_OPCODE_MASK) +#define RVC_MASK_C_JALR (RVC_INSN_FUNCT4_MASK | RVC_INSN_J_RS2_MASK | RVC_INSN_OPCODE_MASK) +#define RVC_MASK_C_JR (RVC_INSN_FUNCT4_MASK | RVC_INSN_J_RS2_MASK | RVC_INSN_OPCODE_MASK) +#define RVC_MASK_C_JAL (RVC_INSN_FUNCT3_MASK | RVC_INSN_OPCODE_MASK) +#define RVC_MASK_C_J (RVC_INSN_FUNCT3_MASK | RVC_INSN_OPCODE_MASK) +#define RVG_MASK_BEQ (RV_INSN_FUNCT3_MASK | RV_INSN_OPCODE_MASK) +#define RVG_MASK_BNE (RV_INSN_FUNCT3_MASK | RV_INSN_OPCODE_MASK) +#define RVG_MASK_BLT (RV_INSN_FUNCT3_MASK | RV_INSN_OPCODE_MASK) +#define RVG_MASK_BGE (RV_INSN_FUNCT3_MASK | RV_INSN_OPCODE_MASK) +#define RVG_MASK_BLTU (RV_INSN_FUNCT3_MASK | RV_INSN_OPCODE_MASK) +#define RVG_MASK_BGEU (RV_INSN_FUNCT3_MASK | RV_INSN_OPCODE_MASK) +#define RVC_MASK_C_BEQZ (RVC_INSN_FUNCT3_MASK | RVC_INSN_OPCODE_MASK) +#define RVC_MASK_C_BNEZ (RVC_INSN_FUNCT3_MASK | RVC_INSN_OPCODE_MASK)#define RVG_MASK_SRET 0xffffffff#define __INSN_LENGTH_MASK _UL(0x3)
Signature · 7 lines
2.35.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH v5 4/12 RISC-V: add ebreak instructions to definitions
In reply to Heiko StuebnerFrom: Heiko Stuebner <[email protected]>
kprobes need to match ebreak instructions, so add the necessary data to enable us to centralize that functionality.
--- arch/riscv/include/asm/parse_asm.h | 6 ++++++ 1 file changed, 6 insertions(+)
arch/riscv/include/asm/parse_asm.h +6 -0
@@ -144,7 +144,9 @@#define RVC_FUNCT3_C_JAL 0x1#define RVC_FUNCT4_C_JR 0x8#define RVC_FUNCT4_C_JALR 0x9 +#define RVC_FUNCT4_C_EBREAK 0x9 +#define RVG_FUNCT12_EBREAK 0x1#define RVG_FUNCT12_SRET 0x102#define RVG_MATCH_JALR (RV_ENCODE_FUNCT3(JALR) | RVG_OPCODE_JALR)
@@ -155,6 +157,7 @@#define RVG_MATCH_BGE (RV_ENCODE_FUNCT3(BGE) | RVG_OPCODE_BRANCH)#define RVG_MATCH_BLTU (RV_ENCODE_FUNCT3(BLTU) | RVG_OPCODE_BRANCH)#define RVG_MATCH_BGEU (RV_ENCODE_FUNCT3(BGEU) | RVG_OPCODE_BRANCH) +#define RVG_MATCH_EBREAK (RV_ENCODE_FUNCT12(EBREAK) | RVG_OPCODE_SYSTEM)#define RVG_MATCH_SRET (RV_ENCODE_FUNCT12(SRET) | RVG_OPCODE_SYSTEM)#define RVC_MATCH_C_BEQZ (RVC_ENCODE_FUNCT3(C_BEQZ) | RVC_OPCODE_C1)#define RVC_MATCH_C_BNEZ (RVC_ENCODE_FUNCT3(C_BNEZ) | RVC_OPCODE_C1)
@@ -162,6 +165,7 @@#define RVC_MATCH_C_JAL (RVC_ENCODE_FUNCT3(C_JAL) | RVC_OPCODE_C1)#define RVC_MATCH_C_JR (RVC_ENCODE_FUNCT4(C_JR) | RVC_OPCODE_C2)#define RVC_MATCH_C_JALR (RVC_ENCODE_FUNCT4(C_JALR) | RVC_OPCODE_C2) +#define RVC_MATCH_C_EBREAK (RVC_ENCODE_FUNCT4(C_EBREAK) | RVC_OPCODE_C2)#define RVG_MASK_JALR (RV_INSN_FUNCT3_MASK | RV_INSN_OPCODE_MASK)#define RVG_MASK_JAL (RV_INSN_OPCODE_MASK)
@@ -177,6 +181,8 @@#define RVG_MASK_BGEU (RV_INSN_FUNCT3_MASK | RV_INSN_OPCODE_MASK)#define RVC_MASK_C_BEQZ (RVC_INSN_FUNCT3_MASK | RVC_INSN_OPCODE_MASK)#define RVC_MASK_C_BNEZ (RVC_INSN_FUNCT3_MASK | RVC_INSN_OPCODE_MASK) +#define RVC_MASK_C_EBREAK 0xffff +#define RVG_MASK_EBREAK 0xffffffff#define RVG_MASK_SRET 0xffffffff#define __INSN_LENGTH_MASK _UL(0x3)
Signature · 7 lines
2.35.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH v5 5/12 RISC-V: add auipc elements to parse_asm header
In reply to Heiko StuebnerFrom: Heiko Stuebner <[email protected]>
Instruction parsing should not be done in individual code, but instead supported by central
Right now kgdb and kprobes parse instructions and at least kprobes (and the upcoming auipc+jalr alternative fixer-function) need the auipc instruction.
--- arch/riscv/include/asm/parse_asm.h | 3 +++ 1 file changed, 3 insertions(+)
arch/riscv/include/asm/parse_asm.h +3 -0
@@ -118,6 +118,7 @@#define RVC_C2_RD_OPOFF 7/* parts of opcode for RVG*/ +#define RVG_OPCODE_AUIPC 0x17#define RVG_OPCODE_BRANCH 0x63#define RVG_OPCODE_JALR 0x67#define RVG_OPCODE_JAL 0x6f
@@ -149,6 +150,7 @@#define RVG_FUNCT12_EBREAK 0x1#define RVG_FUNCT12_SRET 0x102 +#define RVG_MATCH_AUIPC (RVG_OPCODE_AUIPC)#define RVG_MATCH_JALR (RV_ENCODE_FUNCT3(JALR) | RVG_OPCODE_JALR)#define RVG_MATCH_JAL (RVG_OPCODE_JAL)#define RVG_MATCH_BEQ (RV_ENCODE_FUNCT3(BEQ) | RVG_OPCODE_BRANCH)
@@ -167,6 +169,7 @@#define RVC_MATCH_C_JALR (RVC_ENCODE_FUNCT4(C_JALR) | RVC_OPCODE_C2)#define RVC_MATCH_C_EBREAK (RVC_ENCODE_FUNCT4(C_EBREAK) | RVC_OPCODE_C2) +#define RVG_MASK_AUIPC (RV_INSN_OPCODE_MASK)#define RVG_MASK_JALR (RV_INSN_FUNCT3_MASK | RV_INSN_OPCODE_MASK)#define RVG_MASK_JAL (RV_INSN_OPCODE_MASK)#define RVC_MASK_C_JALR (RVC_INSN_FUNCT4_MASK | RVC_INSN_J_RS2_MASK | RVC_INSN_OPCODE_MASK)
Signature · 7 lines
2.35.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH v5 6/12 RISC-V: Move riscv_insn_is_* macros into a common header
In reply to Heiko StuebnerFrom: Heiko Stuebner <[email protected]>
Right now the riscv kernel has (at least) two independent sets of functions to check if an encoded instruction is of a specific type. One in kgdb and one kprobes simulate-insn code.
More parts of the kernel will probably need this in the future, so instead of allowing this duplication to go on further, move macros that do the function declaration in a common header, similar to at least aarch64.
--- arch/riscv/include/asm/parse_asm.h | 42 ++++++++++++++++---- arch/riscv/kernel/kgdb.c | 49 ++++++++---------------- arch/riscv/kernel/probes/simulate-insn.h | 26 +++---------- 3 files changed, 55 insertions(+), 62 deletions(-)
arch/riscv/include/asm/parse_asm.h +35 -7
@@ -193,13 +193,41 @@#define __INSN_OPCODE_MASK _UL(0x7F)#define __INSN_BRANCH_OPCODE _UL(RVG_OPCODE_BRANCH) -/* Define a series of is_XXX_insn functions to check if the value INSN -* is an instance of instruction XXX. -*/ -#define DECLARE_INSN (INSN_NAME ,INSN_MATCH ,INSN_MASK ) \ -static inline bool is_ ## INSN_NAME ## _insn(long insn) \ -{ \ - return (insn & (INSN_MASK)) == (INSN_MATCH); \ +#define __RISCV_INSN_FUNCS (name, mask, val) \ +static __always_inline bool riscv_insn_is_##name(u32 code) \ +{ \ + BUILD_BUG_ON(~(mask) & (val)); \ + return (code & (mask)) == (val); \ +} \ + +#if __riscv_xlen ==32 +/* C.JAL is an RV32C-only instruction */ +__RISCV_INSN_FUNCS(c_jal, RVC_MASK_C_JAL, RVC_MATCH_C_JAL) +#else +#define riscv_insn_is_c_jal (opcode) 0 +#endif +__RISCV_INSN_FUNCS(auipc, RVG_MASK_AUIPC, RVG_MATCH_AUIPC) +__RISCV_INSN_FUNCS(jalr, RVG_MASK_JALR, RVG_MATCH_JALR) +__RISCV_INSN_FUNCS(jal, RVG_MASK_JAL, RVG_MATCH_JAL) +__RISCV_INSN_FUNCS(c_jr, RVC_MASK_C_JR, RVC_MATCH_C_JR) +__RISCV_INSN_FUNCS(c_jalr, RVC_MASK_C_JALR, RVC_MATCH_C_JALR) +__RISCV_INSN_FUNCS(c_j, RVC_MASK_C_J, RVC_MATCH_C_J) +__RISCV_INSN_FUNCS(beq, RVG_MASK_BEQ, RVG_MATCH_BEQ) +__RISCV_INSN_FUNCS(bne, RVG_MASK_BNE, RVG_MATCH_BNE) +__RISCV_INSN_FUNCS(blt, RVG_MASK_BLT, RVG_MATCH_BLT) +__RISCV_INSN_FUNCS(bge, RVG_MASK_BGE, RVG_MATCH_BGE) +__RISCV_INSN_FUNCS(bltu, RVG_MASK_BLTU, RVG_MATCH_BLTU) +__RISCV_INSN_FUNCS(bgeu, RVG_MASK_BGEU, RVG_MATCH_BGEU) +__RISCV_INSN_FUNCS(c_beqz, RVC_MASK_C_BEQZ, RVC_MATCH_C_BEQZ) +__RISCV_INSN_FUNCS(c_bnez, RVC_MASK_C_BNEZ, RVC_MATCH_C_BNEZ) +__RISCV_INSN_FUNCS(c_ebreak, RVC_MASK_C_EBREAK, RVC_MATCH_C_EBREAK) +__RISCV_INSN_FUNCS(ebreak, RVG_MASK_EBREAK, RVG_MATCH_EBREAK) +__RISCV_INSN_FUNCS (sret,RVG_MASK_SRET ,RVG_MATCH_SRET ) + +/* special case to catch _any_ branch instruction */ +static __always_inline bool riscv_insn_is_branch(u32 code) +{ +return (code &RV_INSN_OPCODE_MASK ) ==RVG_OPCODE_BRANCH ; }#define RV_IMM_SIGN (x) (-(((x) >> 31) & 1))
arch/riscv/kernel/kgdb.c +15 -34
95 lines not on this page · raw message
arch/riscv/kernel/probes/simulate-insn.h +5 -21
@@ -3,14 +3,7 @@#ifndef _RISCV_KERNEL_PROBES_SIMULATE_INSN_H#define _RISCV_KERNEL_PROBES_SIMULATE_INSN_H -#define __RISCV_INSN_FUNCS (name, mask, val) \ -static __always_inline bool riscv_insn_is_##name(probe_opcode_t code) \ -{ \ - BUILD_BUG_ON(~(mask) & (val)); \ - return (code & (mask)) == (val); \ -} \ -bool simulate_##name(u32 opcode, unsigned long addr, \ - struct pt_regs *regs) +#include <asm/parse_asm.h> #define RISCV_INSN_REJECTED (name, code) \ do { \
@@ -30,18 +23,9 @@ __RISCV_INSN_FUNCS(fence, 0x7f, 0x0f); } \ }while (0 ) -__RISCV_INSN_FUNCS (c_j,0xe003 ,0xa001 ); -__RISCV_INSN_FUNCS (c_jr,0xf007 ,0x8002 ); -__RISCV_INSN_FUNCS (c_jal,0xe003 ,0x2001 ); -__RISCV_INSN_FUNCS (c_jalr,0xf007 ,0x9002 ); -__RISCV_INSN_FUNCS (c_beqz,0xe003 ,0xc001 ); -__RISCV_INSN_FUNCS (c_bnez,0xe003 ,0xe001 ); -__RISCV_INSN_FUNCS (c_ebreak,0xffff ,0x9002 ); - -__RISCV_INSN_FUNCS (auipc,0x7f ,0x17 ); -__RISCV_INSN_FUNCS (branch,0x7f ,0x63 ); - -__RISCV_INSN_FUNCS (jal,0x7f ,0x6f ); -__RISCV_INSN_FUNCS (jalr,0x707f ,0x67 ); +bool simulate_auipc(u32 opcode, unsigned long addr, struct pt_regs *regs); +bool simulate_branch (u32 opcode,unsigned long addr,struct pt_regs *regs); +bool simulate_jal (u32 opcode,unsigned long addr,struct pt_regs *regs); +bool simulate_jalr (u32 opcode,unsigned long addr,struct pt_regs *regs);#endif /* _RISCV_KERNEL_PROBES_SIMULATE_INSN_H */
Signature · 7 lines
2.35.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH v5 7/12 RISC-V: rename parse_asm.h to insn.h
In reply to Heiko StuebnerFrom: Heiko Stuebner <[email protected]>
The current parse_asm header should become a more centralized place for everything concerning parsing and constructing instructions.
We already have a header insn-def.h similar to aarch64, so rename parse_asm.h to insn.h (again similar to aarch64) to show that it's meant for more than simple instruction parsing.
---
arch/riscv/include/asm/{parse_asm.h => insn.h} | 0
arch/riscv/kernel/kgdb.c | 2 +-
arch/riscv/kernel/probes/simulate-insn.h | 2 +-
3 files changed, 2 insertions(+), 2 deletions(-)
rename arch/riscv/include/asm/{parse_asm.h => insn.h} (100%)arch/riscv/include/asm/insn.h renamed from arch/riscv/include/asm/parse_asm.h +0 -0
arch/riscv/kernel/kgdb.c +1 -1
@@ -11,7 +11,7 @@#include <linux/string.h> #include <asm/cacheflush.h> #include <asm/gdb_xml.h> -#include <asm/parse_asm.h> +#include <asm/insn.h> enum {NOT_KGDB_BREAK =0 ,
arch/riscv/kernel/probes/simulate-insn.h +1 -1
@@ -3,7 +3,7 @@#ifndef _RISCV_KERNEL_PROBES_SIMULATE_INSN_H#define _RISCV_KERNEL_PROBES_SIMULATE_INSN_H -#include <asm/parse_asm.h> +#include <asm/insn.h> #define RISCV_INSN_REJECTED (name, code) \ do { \
Signature · 7 lines
2.35.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH v5 8/12 RISC-V: kprobes: use central defined funct3 constants
In reply to Heiko StuebnerFrom: Heiko Stuebner <[email protected]>
Don't redefine values that are already available in the central header asm/insn.h . Use the values from there instead.
--- arch/riscv/kernel/probes/simulate-insn.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-)
arch/riscv/kernel/probes/simulate-insn.c +6 -13
@@ -136,13 +136,6 @@ bool __kprobes simulate_auipc(u32 opcode, unsigned long addr, struct pt_regs *re#define branch_offset (opcode) \ sign_extend32((branch_imm(opcode)), 12) -#define BRANCH_BEQ 0x0 -#define BRANCH_BNE 0x1 -#define BRANCH_BLT 0x4 -#define BRANCH_BGE 0x5 -#define BRANCH_BLTU 0x6 -#define BRANCH_BGEU 0x7 -bool __kprobes simulate_branch (u32 opcode,unsigned long addr,struct pt_regs *regs) {/*
@@ -169,22 +162,22 @@ bool __kprobes simulate_branch(u32 opcode, unsigned long addr, struct pt_regs *r offset_tmp =branch_offset (opcode);switch (branch_funct3 (opcode)) { -case BRANCH_BEQ : +case RVG_FUNCT3_BEQ : offset = (rs1_val == rs2_val) ? offset_tmp :4 ;break ; -case BRANCH_BNE : +case RVG_FUNCT3_BNE : offset = (rs1_val != rs2_val) ? offset_tmp :4 ;break ; -case BRANCH_BLT : +case RVG_FUNCT3_BLT : offset = ((long )rs1_val < (long )rs2_val) ? offset_tmp :4 ;break ; -case BRANCH_BGE : +case RVG_FUNCT3_BGE : offset = ((long )rs1_val >= (long )rs2_val) ? offset_tmp :4 ;break ; -case BRANCH_BLTU : +case RVG_FUNCT3_BLTU : offset = (rs1_val < rs2_val) ? offset_tmp :4 ;break ; -case BRANCH_BGEU : +case RVG_FUNCT3_BGEU : offset = (rs1_val >= rs2_val) ? offset_tmp :4 ;break ;default :
Signature · 7 lines
2.35.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH v5 9/12 RISC-V: add U-type imm parsing to insn.h header
In reply to Heiko StuebnerFrom: Heiko Stuebner <[email protected]>
Similar to other existing types, allow extracting the immediate for a U-type instruction.
U-type immediates are special in that regard, that the value in the instruction in bits [31:12] already represents the same bits of the immediate, so no shifting is required.
U-type immediates are for example used in the auipc instruction, so these constants make it easier to parse such instructions.
--- arch/riscv/include/asm/insn.h | 13 +++++++++++++ 1 file changed, 13 insertions(+)
arch/riscv/include/asm/insn.h +13 -0
@@ -34,6 +34,15 @@#define RV_J_IMM_11_MASK GENMASK(0, 0)#define RV_J_IMM_19_12_MASK GENMASK(7, 0) +/* +* U-type IMMs contain the upper 20bits [31:20] of an immediate with +* the rest filled in by zeros, so no shifting required. Similarly, +* bit31 contains the signed state, so no sign extension necessary. +*/ +#define RV_U_IMM_SIGN_OPOFF 31 +#define RV_U_IMM_31_12_OPOFF 0 +#define RV_U_IMM_31_12_MASK GENMASK(31, 12) +/* The bit field of immediate value in B-type instruction */ #define RV_B_IMM_SIGN_OPOFF 31#define RV_B_IMM_10_5_OPOFF 25
@@ -235,6 +244,10 @@ static __always_inline bool riscv_insn_is_branch(u32 code)#define RV_X (X , s, mask) (((X) >> (s)) & (mask))#define RVC_X (X , s, mask) RV_X(X, s, mask) +#define RV_EXTRACT_UTYPE_IMM (x) \ + ({typeof(x) x_ = (x); \ + (RV_X(x_, RV_U_IMM_31_12_OPOFF, RV_U_IMM_31_12_MASK)); }) +#define RV_EXTRACT_JTYPE_IMM (x) \ ({typeof(x) x_ = (x); \ (RV_X(x_, RV_J_IMM_10_1_OPOFF, RV_J_IMM_10_1_MASK) << RV_J_IMM_10_1_OFF) | \
Signature · 7 lines
2.35.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH v5 10/12 RISC-V: add rd reg parsing to insn.h header
In reply to Heiko StuebnerFrom: Heiko Stuebner <[email protected]>
Add a macro to allow parsing of the rd register from an instruction.
--- arch/riscv/include/asm/insn.h | 5 +++++ 1 file changed, 5 insertions(+)
arch/riscv/include/asm/insn.h +5 -0
@@ -60,6 +60,7 @@#define RVG_RS1_OPOFF 15#define RVG_RS2_OPOFF 20#define RVG_RD_OPOFF 7 +#define RVG_RD_MASK GENMASK(4, 0)/* The bit field of immediate value in RVC J instruction */ #define RVC_J_IMM_SIGN_OPOFF 12
@@ -244,6 +245,10 @@ static __always_inline bool riscv_insn_is_branch(u32 code)#define RV_X (X , s, mask) (((X) >> (s)) & (mask))#define RVC_X (X , s, mask) RV_X(X, s, mask) +#define RV_EXTRACT_RD_REG (x) \ + ({typeof(x) x_ = (x); \ + (RV_X(x_, RVG_RD_OPOFF, RVG_RD_MASK)); }) +#define RV_EXTRACT_UTYPE_IMM (x) \ ({typeof(x) x_ = (x); \ (RV_X(x_, RV_U_IMM_31_12_OPOFF, RV_U_IMM_31_12_MASK)); })
Signature · 7 lines
2.35.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH v5 11/12 RISC-V: add helpers for handling immediates in U-type and I-type pairs
In reply to Heiko StuebnerFrom: Heiko Stuebner <[email protected]>
Used together U-type and I-type instructions can for example be used to generate bigger jumps (i.e. in auipc+jalr pairs) by splitting the value into an upper immediate (i.e. auipc) and a 12bit immediate (i.e. jalr).
Due to both immediates being considered signed this creates some corner cases, so add some helper to prevent this from getting duplicated in different places.
--- arch/riscv/include/asm/insn.h | 48 +++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+)
arch/riscv/include/asm/insn.h +48 -0
@@ -290,3 +290,51 @@ static __always_inline bool riscv_insn_is_branch(u32 code) (RVC_X (x_,RVC_B_IMM_5_OPOFF ,RVC_B_IMM_5_MASK ) <<RVC_B_IMM_5_OFF ) | \ (RVC_X (x_,RVC_B_IMM_7_6_OPOFF ,RVC_B_IMM_7_6_MASK ) <<RVC_B_IMM_7_6_OFF ) | \ (RVC_IMM_SIGN(x_) << RVC_B_IMM_SIGN_OFF); }) + +/* +* Put together one immediate from a U-type and I-type instruction pair. +* +* The U-type contains an upper immediate, meaning bits[31:12] with [11:0] +* being zero, while the I-type contains a 12bit immediate. +* Combined these can encode larger 32bit values and are used for example +* in auipc + jalr pairs to allow larger jumps. +* +* @utype_insn: instruction containing the upper immediate +* @itype_insn: instruction +* Return: combined immediate +*/ +static inline s32 riscv_insn_extract_utype_itype_imm (u32 utype_insn,u32 itype_insn) +{ +s32 imm; + + imm =RV_EXTRACT_UTYPE_IMM (utype_insn); + imm +=RV_EXTRACT_ITYPE_IMM (itype_insn); + +return imm; +} + +/* +* Update a set of two instructions (U-type + I-type) with an immediate value. +* +* Used for example in auipc+jalrs pairs the U-type instructions contains +* a 20bit upper immediate representing bits[31:12], while the I-type +* instruction contains a 12bit immediate representing bits[11:0]. +* +* This also takes into account that both separate immediates are +* considered as signed values, so if the I-type immediate becomes +* negative (BIT(11) set) the U-type part gets adjusted. +* +* @utype_insn: pointer to the utype instruction of the pair +* @itype_insn: pointer to the itype instruction of the pair +* @imm: the immediate to insert into the two instructions +*/ +static inline void riscv_insn_insert_utype_itype_imm (u32 *utype_insn,u32 *itype_insn,s32 imm) +{ +/* drop possible old IMM values */ + *utype_insn &= ~(RV_U_IMM_31_12_MASK ); + *itype_insn &= ~(RV_I_IMM_11_0_MASK <<RV_I_IMM_11_0_OPOFF ); + +/* add the adapted IMMs */ + *utype_insn |= (imm &RV_U_IMM_31_12_MASK ) + ((imm &BIT (11 )) <<1 ); + *itype_insn |= ((imm &RV_I_IMM_11_0_MASK ) <<RV_I_IMM_11_0_OPOFF ); +}
Signature · 7 lines
2.35.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH v5 12/12 RISC-V: fix auipc-jalr addresses in patched alternatives
In reply to Heiko StuebnerFrom: Heiko Stuebner <[email protected]>
Alternatives live in a different section, so addresses used by call functions will point to wrong locations after the patch got applied.
Similar to arm64, adjust the location to consider that offset.
--- arch/riscv/include/asm/alternative.h | 3 ++ arch/riscv/kernel/alternative.c | 56 ++++++++++++++++++++++++++++ arch/riscv/kernel/cpufeature.c | 5 ++- 3 files changed, 63 insertions(+), 1 deletion(-)
arch/riscv/include/asm/alternative.h +3 -0
@@ -27,6 +27,9 @@ void __init apply_boot_alternatives(void);void __init apply_early_boot_alternatives (void );void apply_module_alternatives (void *start,size_t length); +void riscv_alternative_fix_offsets (void *alt_ptr,unsigned int len, +int patch_offset); +struct alt_entry {void *old_ptr;/* address of original instruciton or data */ void *alt_ptr;/* address of replacement instruction or data */
arch/riscv/kernel/alternative.c +56 -0
68 lines not on this page · raw message
arch/riscv/kernel/cpufeature.c +4 -1
@@ -339,8 +339,11 @@ void __init_or_module riscv_cpufeature_patch_func(struct alt_entry *begin, } tmp = (1U << alt->errata_id); -if (cpu_req_feature & tmp) +if (cpu_req_feature & tmp) {patch_text_nosync (alt->old_ptr, alt->alt_ptr, alt->alt_len); +riscv_alternative_fix_offsets (alt->old_ptr, alt->alt_len, + alt->old_ptr - alt->alt_ptr); + } } }#endif
Signature · 7 lines
2.35.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
Palmer Dabbelt
AppliedQuoted 5 lines · Heiko Stuebner
From: Heiko Stuebner <[email protected]>
This series is split out of my work on optimizing string functions and provides the basics to:
Quoted 7 lines
- actually allowing calls in alternatives
Function calls use auipc + jalr to reach those 32bit relative addresses but when they're compiled the offset will be wrong as alternatives live in a different section. So when the patch gets applied the address will point to the wrong location.[...]
Applied, thanks!
[01/12] RISC-V: fix funct4 definition for c.jalr in parse_asm.h
https://git.kernel.org/palmer/c/a3775634f6da [02/12] RISC-V: add prefix to all constants/macros in parse_asm.h https://git.kernel.org/palmer/c/bf0cc402d7cd [03/12] RISC-V: detach funct-values from their offset https://git.kernel.org/palmer/c/33e41480b233 [04/12] RISC-V: add ebreak instructions to definitions https://git.kernel.org/palmer/c/2621cac76f84 [05/12] RISC-V: add auipc elements to parse_asm header https://git.kernel.org/palmer/c/cde4a69302a4 [06/12] RISC-V: Move riscv_insn_is_* macros into a common header https://git.kernel.org/palmer/c/ec5f90877516 [07/12] RISC-V: rename parse_asm.h to insn.h https://git.kernel.org/palmer/c/c9c1af3f186a [08/12] RISC-V: kprobes: use central defined funct3 constants https://git.kernel.org/palmer/c/debe28d0a52e [09/12] RISC-V: add U-type imm parsing to insn.h header https://git.kernel.org/palmer/c/8963d6224009 [10/12] RISC-V: add rd reg parsing to insn.h header https://git.kernel.org/palmer/c/088ec01fce4e [11/12] RISC-V: add helpers for handling immediates in U-type and I-type pairs https://git.kernel.org/palmer/c/47f05757d3d8 [12/12] RISC-V: fix auipc-jalr addresses in patched alternatives https://git.kernel.org/palmer/c/27c653c06505
Best regards,
Signature · 6 lines
Palmer Dabbelt <[email protected]> _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
This series was applied to riscv/linux.git (for-next) by Palmer Dabbelt <[email protected]>:
Hello:
This series was applied to riscv/linux.git (for-next) by Palmer Dabbelt <[email protected]>:
Quoted 5 lines · On Fri, 23 Dec 2022 23:13:20 +0100 you wrote:
From: Heiko Stuebner <[email protected]>
This series is split out of my work on optimizing string functions and provides the basics to:
Quoted 7 lines
- actually allowing calls in alternatives
Function calls use auipc + jalr to reach those 32bit relative addresses but when they're compiled the offset will be wrong as alternatives live in a different section. So when the patch gets applied the address will point to the wrong location.[...]
Here is the summary with links:
- [v5,01/12] RISC-V: fix funct4 definition for c.jalr in parse_asm.h
https://git.kernel.org/riscv/c/a3775634f6da - [v5,02/12] RISC-V: add prefix to all constants/macros in parse_asm.h https://git.kernel.org/riscv/c/bf0cc402d7cd - [v5,03/12] RISC-V: detach funct-values from their offset https://git.kernel.org/riscv/c/33e41480b233 - [v5,04/12] RISC-V: add ebreak instructions to definitions https://git.kernel.org/riscv/c/2621cac76f84 - [v5,05/12] RISC-V: add auipc elements to parse_asm header https://git.kernel.org/riscv/c/cde4a69302a4 - [v5,06/12] RISC-V: Move riscv_insn_is_* macros into a common header https://git.kernel.org/riscv/c/ec5f90877516 - [v5,07/12] RISC-V: rename parse_asm.h to insn.h https://git.kernel.org/riscv/c/c9c1af3f186a - [v5,08/12] RISC-V: kprobes: use central defined funct3 constants https://git.kernel.org/riscv/c/debe28d0a52e - [v5,09/12] RISC-V: add U-type imm parsing to insn.h header https://git.kernel.org/riscv/c/8963d6224009 - [v5,10/12] RISC-V: add rd reg parsing to insn.h header https://git.kernel.org/riscv/c/088ec01fce4e - [v5,11/12] RISC-V: add helpers for handling immediates in U-type and I-type pairs https://git.kernel.org/riscv/c/47f05757d3d8 - [v5,12/12] RISC-V: fix auipc-jalr addresses in patched alternatives https://git.kernel.org/riscv/c/27c653c06505
You are awesome, thank you!
Signature · 9 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv