riscv: correct riscv_insn_is_c_jr() and riscv_insn_is_c_jalr()
PATCH 1/1 riscv: correct riscv_insn_is_c_jr() and riscv_insn_is_c_jalr()
The instructions c.jr and c.jalr must have rs1 != 0, but riscv_insn_is_c_jr() and riscv_insn_is_c_jalr() do not check for this. So, riscv_insn_is_c_jr() can match a reserved encoding, while riscv_insn_is_c_jalr() can match the c.ebreak instruction.
Rewrite them with check for rs1 != 0.
--- arch/riscv/include/asm/insn.h | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
arch/riscv/include/asm/insn.h +13 -2
@@ -110,6 +110,7 @@#define RVC_INSN_FUNCT4_OPOFF 12#define RVC_INSN_FUNCT3_MASK GENMASK(15, 13)#define RVC_INSN_FUNCT3_OPOFF 13 +#define RVC_INSN_J_RS1_MASK GENMASK(11, 7)#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)
@@ -245,8 +246,6 @@ __RISCV_INSN_FUNCS(c_jal, RVC_MASK_C_JAL, RVC_MATCH_C_JAL) __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 )
@@ -273,6 +272,18 @@ static __always_inline bool riscv_insn_is_branch(u32 code)return (code &RV_INSN_OPCODE_MASK ) ==RVG_OPCODE_BRANCH ; } +static __always_inline bool riscv_insn_is_c_jr(u32 code) +{ +return (code &RVC_MASK_C_JR ) ==RVC_MATCH_C_JR && + (code &RVC_INSN_J_RS1_MASK ) !=0 ; +} + +static __always_inline bool riscv_insn_is_c_jalr(u32 code) +{ +return (code &RVC_MASK_C_JALR ) ==RVC_MATCH_C_JALR && + (code &RVC_INSN_J_RS1_MASK ) !=0 ; +} +#define RV_IMM_SIGN (x) (-(((x) >> 31) & 1))#define RVC_IMM_SIGN (x) (-(((x) >> 12) & 1))#define RV_X (X , s, mask) (((X) >> (s)) & (mask))
Signature · 1 line
2.34.1
Quoted 55 lines · Nam Cao
The instructions c.jr and c.jalr must have rs1 != 0, but
riscv_insn_is_c_jr()andriscv_insn_is_c_jalr()do not check for this. So,riscv_insn_is_c_jr()can match a reserved encoding, whileriscv_insn_is_c_jalr()can match the c.ebreak instruction.Rewrite them with check for rs1 != 0.
Signed-off-by Nam Cao <[email protected]>--- arch/riscv/include/asm/insn.h | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)arch/riscv/include/asm/insn.h +13
-2@@ -110,6 +110,7 @@#define RVC_INSN_FUNCT4_OPOFF 12#define RVC_INSN_FUNCT3_MASK GENMASK(15, 13)#define RVC_INSN_FUNCT3_OPOFF 13 +#define RVC_INSN_J_RS1_MASK GENMASK(11, 7)#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)@@ -245,8 +246,6 @@ __RISCV_INSN_FUNCS(c_jal, RVC_MASK_C_JAL, RVC_MATCH_C_JAL) __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 )@@ -273,6 +272,18 @@ static __always_inline bool riscv_insn_is_branch(u32 code)return (code &RV_INSN_OPCODE_MASK ) ==RVG_OPCODE_BRANCH ; } +static __always_inline bool riscv_insn_is_c_jr(u32 code) +{ +return (code &RVC_MASK_C_JR ) ==RVC_MATCH_C_JR && + (code &RVC_INSN_J_RS1_MASK ) !=0 ; +} + +static __always_inline bool riscv_insn_is_c_jalr(u32 code) +{ +return (code &RVC_MASK_C_JALR ) ==RVC_MATCH_C_JALR && + (code &RVC_INSN_J_RS1_MASK ) !=0 ; +} +#define RV_IMM_SIGN (x) (-(((x) >> 31) & 1))#define RVC_IMM_SIGN (x) (-(((x) >> 12) & 1))#define RV_X (X , s, mask) (((X) >> (s)) & (mask))Signature · 1 line
2.34.1
Good catch. You can add:
Quoted 5 lines
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
Quoted 39 lines · Nam Cao
The instructions c.jr and c.jalr must have rs1 != 0, but
riscv_insn_is_c_jr()andriscv_insn_is_c_jalr()do not check for this. So,riscv_insn_is_c_jr()can match a reserved encoding, whileriscv_insn_is_c_jalr()can match the c.ebreak instruction.Rewrite them with check for rs1 != 0.
Signed-off-by Nam Cao <[email protected]>--- arch/riscv/include/asm/insn.h | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)arch/riscv/include/asm/insn.h +3
-2@@ -110,6 +110,7 @@#define RVC_INSN_FUNCT4_OPOFF 12#define RVC_INSN_FUNCT3_MASK GENMASK(15, 13)#define RVC_INSN_FUNCT3_OPOFF 13 +#define RVC_INSN_J_RS1_MASK GENMASK(11, 7)#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)@@ -245,8 +246,6 @@ __RISCV_INSN_FUNCS(c_jal, RVC_MASK_C_JAL, RVC_MATCH_C_JAL) __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 )@@ -273,6 +272,18 @@ static __always_inline bool riscv_insn_is_branch(u32 code)return (code &RV_INSN_OPCODE_MASK ) ==RVG_OPCODE_BRANCH ; } +static __always_inline bool riscv_insn_is_c_jr(u32 code) +{
arch/riscv/include/asm/insn.h static __always_inline bool riscv_insn_is_branch(u32 code) · line 286
Quoted 10 lines
arch/riscv/include/asm/insn.h +10
-0+return (code &RVC_MASK_C_JR ) ==RVC_MATCH_C_JR && + (code &RVC_INSN_J_RS1_MASK ) !=0 ; +} + +static __always_inline bool riscv_insn_is_c_jalr(u32 code) +{ +return (code &RVC_MASK_C_JALR ) ==RVC_MATCH_C_JALR && + (code &RVC_INSN_J_RS1_MASK ) !=0 ; +} +
Nice one!
In the future, add a Fixes-tag for these kind of changes!
(No need for a respin, b4 will pick up the Fixes above.)
Björn
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
Quoted 4 lines · Björn Töpel
In the future, add a Fixes-tag for these kind of changes!
Fixes ec5f90877516 ("RISC-V: Move riscv_insn_is_* macros into a common header")(No need for a respin, b4 will pick up the Fixes above.)
Thanks! I will keep that in mind in the future.
Best regards,
Nam
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
This patch was applied to riscv/linux.git (fixes) by Palmer Dabbelt <[email protected]>:
Hello:
This patch was applied to riscv/linux.git (fixes)
by Palmer Dabbelt <[email protected]>:
Quoted 8 lines · On Mon, 31 Jul 2023 20:39:25 +0200 you wrote:
The instructions c.jr and c.jalr must have rs1 != 0, but
riscv_insn_is_c_jr()andriscv_insn_is_c_jalr()do not check for this. So,riscv_insn_is_c_jr()can match a reserved encoding, whileriscv_insn_is_c_jalr()can match the c.ebreak instruction.Rewrite them with check for rs1 != 0.
[...]
Here is the summary with links:
- riscv: correct riscv_insn_is_c_jr() and riscv_insn_is_c_jalr()
https://git.kernel.org/riscv/c/79bc3f85c51f
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