riscv: alternative: proceed one more instruction for auipc/jalr pair

xhackerustc · palmer-dabbelt · commit 91612cfb1736 · 2023-02-21T17:21:50.000-08:00
If we patched auipc + jalr pair, we'd better proceed one more instruction. Andrew pointed out "There's not a problem now, since we're only adding a fixup for jal, not jalr, but we should future-proof this and there's no reason to revisit an already fixed-up instruction anyway." Signed-off-by: Jisheng Zhang <jszhang@kernel.org> Suggested-by: Andrew Jones <ajones@ventanamicro.com> Reviewed-by: Andrew Jones <ajones@ventanamicro.com> Reviewed-by: Heiko Stuebner <heiko@sntech.de> Link: https://lore.kernel.org/r/20230115162811.3146-1-jszhang@kernel.org Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
diff --git a/arch/riscv/kernel/alternative.c b/arch/riscv/kernel/alternative.c
@@ -122,6 +122,7 @@ void riscv_alternative_fix_offsets(void *alt_ptr, unsigned int len,
 
 			riscv_alternative_fix_auipc_jalr(alt_ptr + i * sizeof(u32),
 							 insn, insn2, patch_offset);
+			i++;
 		}
 
 		if (riscv_insn_is_jal(insn)) {

Original file line number	Diff line number	Diff line change
`@@ -122,6 +122,7 @@ void riscv_alternative_fix_offsets(void *alt_ptr, unsigned int len,`
`122`	`122`
`123`	`123`	`riscv_alternative_fix_auipc_jalr(alt_ptr + i * sizeof(u32),`
`124`	`124`	`insn, insn2, patch_offset);`
	`125`	`+ i++;`
`125`	`126`	`}`
`126`	`127`
`127`	`128`	`if (riscv_insn_is_jal(insn)) {`