linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Balbir Singh <bsingharora@gmail.com>
To: linuxppc-dev@lists.ozlabs.org, mpe@ellerman.id.au
Cc: naveen.n.rao@linux.vnet.ibm.com, christophe.leroy@c-s.fr,
	paulus@samba.org, Balbir Singh <bsingharora@gmail.com>
Subject: [PATCH v3 2/9] powerpc/kprobes: Move kprobes over to patch_instruction
Date: Tue,  6 Jun 2017 14:29:38 +1000	[thread overview]
Message-ID: <20170606042945.24997-3-bsingharora@gmail.com> (raw)
In-Reply-To: <20170606042945.24997-1-bsingharora@gmail.com>

arch_arm/disarm_probe use direct assignment for copying
instructions, replace them with patch_instruction

Signed-off-by: Balbir Singh <bsingharora@gmail.com>
---
 arch/powerpc/kernel/kprobes.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/powerpc/kernel/kprobes.c b/arch/powerpc/kernel/kprobes.c
index fc43435..b49f8f0 100644
--- a/arch/powerpc/kernel/kprobes.c
+++ b/arch/powerpc/kernel/kprobes.c
@@ -158,7 +158,7 @@ NOKPROBE_SYMBOL(arch_prepare_kprobe);
 
 void arch_arm_kprobe(struct kprobe *p)
 {
-	*p->addr = BREAKPOINT_INSTRUCTION;
+	patch_instruction(p->addr, BREAKPOINT_INSTRUCTION);
 	flush_icache_range((unsigned long) p->addr,
 			   (unsigned long) p->addr + sizeof(kprobe_opcode_t));
 }
@@ -166,7 +166,7 @@ NOKPROBE_SYMBOL(arch_arm_kprobe);
 
 void arch_disarm_kprobe(struct kprobe *p)
 {
-	*p->addr = p->opcode;
+	patch_instruction(p->addr, p->opcode);
 	flush_icache_range((unsigned long) p->addr,
 			   (unsigned long) p->addr + sizeof(kprobe_opcode_t));
 }
-- 
2.9.4

  parent reply	other threads:[~2017-06-06  4:30 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-06  4:29 [PATCH v3 0/9] Enable STRICT_KERNEL_RWX Balbir Singh
2017-06-06  4:29 ` [PATCH v3 1/9] powerpc/lib/code-patching: Enhance code patching Balbir Singh
2017-06-26  5:42   ` Michael Ellerman
2017-06-06  4:29 ` Balbir Singh [this message]
2017-06-06 19:05   ` [PATCH v3 2/9] powerpc/kprobes: Move kprobes over to patch_instruction Naveen N. Rao
2017-06-07  5:47     ` Balbir Singh
2017-06-26  5:00       ` Michael Ellerman
2017-06-06  4:29 ` [PATCH v3 3/9] powerpc/kprobes/optprobes: Move " Balbir Singh
2017-06-06 19:12   ` Naveen N. Rao
2017-06-07  5:46     ` Balbir Singh
2017-06-07 14:12       ` Naveen N. Rao
2017-06-26  6:12   ` Michael Ellerman
2017-06-06  4:29 ` [PATCH v3 4/9] powerpc/xmon: Add patch_instruction supporf for xmon Balbir Singh
2017-06-06  4:29 ` [PATCH v3 5/9] powerpc/vmlinux.lds: Align __init_begin to 16M Balbir Singh
2017-06-06  4:29 ` [PATCH v3 6/9] powerpc/platform/pseries/lpar: Fix updatepp and updateboltedpp Balbir Singh
2017-06-06  4:29 ` [PATCH v3 7/9] powerpc/mm/hash: Implement mark_rodata_ro() for hash Balbir Singh
2017-06-06  4:29 ` [PATCH v3 8/9] powerpc/Kconfig: Enable STRICT_KERNEL_RWX Balbir Singh
2017-06-06  4:29 ` [PATCH v3 9/9] powerpc/mm/radix: Implement mark_rodata_ro() for radix Balbir Singh

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170606042945.24997-3-bsingharora@gmail.com \
    --to=bsingharora@gmail.com \
    --cc=christophe.leroy@c-s.fr \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=mpe@ellerman.id.au \
    --cc=naveen.n.rao@linux.vnet.ibm.com \
    --cc=paulus@samba.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).