Unverified Commit ee9a6839 authored Aug 01, 2024 by Alexandre Ghiti Committed by Palmer Dabbelt Aug 06, 2024

riscv: Re-introduce global icache flush in patch_text_XXX()

commit edf2d546 ("riscv: patch: Flush the icache right after
patching to avoid illegal insns") mistakenly removed the global icache
flush in patch_text_nosync() and patch_text_set_nosync() functions, so
reintroduce them.

Fixes: edf2d546 ("riscv: patch: Flush the icache right after patching to avoid illegal insns")
Reported-by: Samuel Holland <samuel.holland@sifive.com>
Closes: https://lore.kernel.org/linux-riscv/a28ddc26-d77a-470a-a33f-88144f717e86@sifive.com/

Signed-off-by: Alexandre Ghiti <alexghiti@rivosinc.com>
Reviewed-by: Samuel Holland <samuel.holland@sifive.com>
Reviewed-by: Charlie Jenkins <charlie@rivosinc.com>
Link: https://lore.kernel.org/r/20240801191404.55181-1-alexghiti@rivosinc.com

Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>

parent de9c2c66

arch/riscv/kernel/patch.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -205,6 +205,8 @@ int patch_text_set_nosync(void *addr, u8 c, size_t len)
		int ret;

		ret = patch_insn_set(addr, c, len);
		if (!ret)
		flush_icache_range((uintptr_t)addr, (uintptr_t)addr + len);

		return ret;
		}
		@@ -239,6 +241,8 @@ int patch_text_nosync(void addr, const void insns, size_t len)
		int ret;

		ret = patch_insn_write(addr, insns, len);
		if (!ret)
		flush_icache_range((uintptr_t)addr, (uintptr_t)addr + len);

		return ret;
		}