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 v4 4/9] powerpc/xmon: Add patch_instruction() support for xmon
Date: Tue, 27 Jun 2017 17:48:58 +1000 [thread overview]
Message-ID: <20170627074903.19324-5-bsingharora@gmail.com> (raw)
In-Reply-To: <20170627074903.19324-1-bsingharora@gmail.com>
Move from mwrite() to patch_instruction() for xmon for
breakpoint addition and removal.
Signed-off-by: Balbir Singh <bsingharora@gmail.com>
---
arch/powerpc/xmon/xmon.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index a728e19..08e367e 100644
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -53,6 +53,7 @@
#include <asm/xive.h>
#include <asm/opal.h>
#include <asm/firmware.h>
+#include <asm/code-patching.h>
#ifdef CONFIG_PPC64
#include <asm/hvcall.h>
@@ -837,7 +838,8 @@ static void insert_bpts(void)
store_inst(&bp->instr[0]);
if (bp->enabled & BP_CIABR)
continue;
- if (mwrite(bp->address, &bpinstr, 4) != 4) {
+ if (patch_instruction((unsigned int *)bp->address,
+ bpinstr) != 0) {
printf("Couldn't write instruction at %lx, "
"disabling breakpoint there\n", bp->address);
bp->enabled &= ~BP_TRAP;
@@ -874,7 +876,8 @@ static void remove_bpts(void)
continue;
if (mread(bp->address, &instr, 4) == 4
&& instr == bpinstr
- && mwrite(bp->address, &bp->instr, 4) != 4)
+ && patch_instruction(
+ (unsigned int *)bp->address, bp->instr[0]) != 0)
printf("Couldn't remove breakpoint at %lx\n",
bp->address);
else
--
2.9.4
next prev parent reply other threads:[~2017-06-27 7:49 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-27 7:48 [PATCH v4 0/9] Provide STRICT_KERNEL_RWX for powerpc Balbir Singh
2017-06-27 7:48 ` [PATCH v4 1/9] powerpc/lib/code-patching: Use alternate map for patch_instruction() Balbir Singh
2017-06-27 8:32 ` Christophe LEROY
2017-06-27 11:19 ` Balbir Singh
2017-06-27 7:48 ` [PATCH v4 2/9] powerpc/kprobes: Move kprobes over to patch_instruction Balbir Singh
2017-06-27 8:34 ` Christophe LEROY
2017-06-27 7:48 ` [PATCH v4 3/9] powerpc/kprobes/optprobes: Move " Balbir Singh
2017-06-27 8:34 ` Christophe LEROY
2017-06-27 11:13 ` Balbir Singh
2017-06-27 7:48 ` Balbir Singh [this message]
2017-06-27 7:48 ` [PATCH v4 5/9] powerpc/vmlinux.lds: Align __init_begin to 16M Balbir Singh
2017-06-27 7:49 ` [PATCH v4 6/9] powerpc/platform/pseries/lpar: Fix updatepp and updateboltedpp Balbir Singh
2017-06-27 7:49 ` [PATCH v4 7/9] powerpc/mm/hash: Implement mark_rodata_ro() for hash Balbir Singh
2017-06-27 7:49 ` [PATCH v4 8/9] powerpc/mm/radix: Implement mark_rodata_ro() for radix Balbir Singh
2017-06-27 7:49 ` [PATCH v4 9/9] powerpc/Kconfig: Enable STRICT_KERNEL_RWX 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=20170627074903.19324-5-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.