powerpc/kprobes: Use patch_instruction()
authorJordan Niethe <jniethe5@gmail.com>
Wed, 6 May 2020 03:40:35 +0000 (13:40 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Mon, 18 May 2020 14:10:37 +0000 (00:10 +1000)
Instead of using memcpy() and flush_icache_range() use
patch_instruction() which not only accomplishes both of these steps but
will also make it easier to add support for prefixed instructions.

Signed-off-by: Jordan Niethe <jniethe5@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Reviewed-by: Alistair Popple <alistair@popple.id.au>
Link: https://lore.kernel.org/r/20200506034050.24806-16-jniethe5@gmail.com
arch/powerpc/kernel/kprobes.c

index f64312d..a72c8e1 100644 (file)
@@ -125,11 +125,8 @@ int arch_prepare_kprobe(struct kprobe *p)
        }
 
        if (!ret) {
-               memcpy(p->ainsn.insn, p->addr,
-                               MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
+               patch_instruction((struct ppc_inst *)p->ainsn.insn, insn);
                p->opcode = ppc_inst_val(insn);
-               flush_icache_range((unsigned long)p->ainsn.insn,
-                       (unsigned long)p->ainsn.insn + sizeof(kprobe_opcode_t));
        }
 
        p->ainsn.boostable = 0;