riscv: Simplify text patching loops

This reduces the number of variables and makes the code easier to parse.

Signed-off-by: Samuel Holland <samuel.holland@sifive.com>
Reviewed-by: Björn Töpel <bjorn@rivosinc.com>
Reviewed-by: Conor Dooley <conor.dooley@microchip.com>
Link: https://lore.kernel.org/r/20240327160520.791322-5-samuel.holland@sifive.com
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>

diff --git a/arch/riscv/kernel/patch.c b/arch/riscv/kernel/patch.c
index 4007563fb60735d8ca42017fec18cd7f60cda426..cd6159411f519de7d7848c614162b1dedda1ae37 100644 (file)
--- a/arch/riscv/kernel/patch.c
+++ b/arch/riscv/kernel/patch.c
@@ -163,22 +163,24 @@ NOKPROBE_SYMBOL(__patch_insn_write);
 
 static int patch_insn_set(void *addr, u8 c, size_t len)
 {
-       size_t patched = 0;
        size_t size;
-       int ret = 0;
+       int ret;
 
        /*
         * __patch_insn_set() can only work on 2 pages at a time so call it in a
         * loop with len <= 2 * PAGE_SIZE.
         */
-       while (patched < len && !ret) {
-               size = min_t(size_t, PAGE_SIZE * 2 - offset_in_page(addr + patched), len - patched);
-               ret = __patch_insn_set(addr + patched, c, size);
-
-               patched += size;
+       while (len) {
+               size = min(len, PAGE_SIZE * 2 - offset_in_page(addr));
+               ret = __patch_insn_set(addr, c, size);
+               if (ret)
+                       return ret;
+
+               addr += size;
+               len -= size;
        }
 
-       return ret;
+       return 0;
 }
 NOKPROBE_SYMBOL(patch_insn_set);
 
@@ -198,22 +200,25 @@ NOKPROBE_SYMBOL(patch_text_set_nosync);
 
 int patch_insn_write(void *addr, const void *insn, size_t len)
 {
-       size_t patched = 0;
        size_t size;
-       int ret = 0;
+       int ret;
 
        /*
         * Copy the instructions to the destination address, two pages at a time
         * because __patch_insn_write() can only handle len <= 2 * PAGE_SIZE.
         */
-       while (patched < len && !ret) {
-               size = min_t(size_t, PAGE_SIZE * 2 - offset_in_page(addr + patched), len - patched);
-               ret = __patch_insn_write(addr + patched, insn + patched, size);
-
-               patched += size;
+       while (len) {
+               size = min(len, PAGE_SIZE * 2 - offset_in_page(addr));
+               ret = __patch_insn_write(addr, insn, size);
+               if (ret)
+                       return ret;
+
+               addr += size;
+               insn += size;
+               len -= size;
        }
 
-       return ret;
+       return 0;
 }
 NOKPROBE_SYMBOL(patch_insn_write);