linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Jordan Niethe <jniethe5@gmail.com>
To: linuxppc-dev@lists.ozlabs.org
Cc: alistair@popple.id.au, npiggin@gmail.com, bala24@linux.ibm.com,
	Jordan Niethe <jniethe5@gmail.com>,
	dja@axtens.net
Subject: [PATCH v6 01/28] powerpc/xmon: Remove store_inst() for patch_instruction()
Date: Tue, 28 Apr 2020 11:57:47 +1000	[thread overview]
Message-ID: <20200428015814.15380-2-jniethe5@gmail.com> (raw)
In-Reply-To: <20200428015814.15380-1-jniethe5@gmail.com>

For modifying instructions in xmon, patch_instruction() can serve the
same role that store_inst() is performing with the advantage of not
being specific to xmon. In some places patch_instruction() is already
being using followed by store_inst(). In these cases just remove the
store_inst(). Otherwise replace store_inst() with patch_instruction().

Reviewed-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Jordan Niethe <jniethe5@gmail.com>
---
v4: Read into a local variable
---
 arch/powerpc/xmon/xmon.c | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index e8c84d265602..02e3bd62cab4 100644
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -325,11 +325,6 @@ static inline void sync(void)
 	asm volatile("sync; isync");
 }
 
-static inline void store_inst(void *p)
-{
-	asm volatile ("dcbst 0,%0; sync; icbi 0,%0; isync" : : "r" (p));
-}
-
 static inline void cflush(void *p)
 {
 	asm volatile ("dcbf 0,%0; icbi 0,%0" : : "r" (p));
@@ -881,8 +876,7 @@ static struct bpt *new_breakpoint(unsigned long a)
 	for (bp = bpts; bp < &bpts[NBPTS]; ++bp) {
 		if (!bp->enabled && atomic_read(&bp->ref_count) == 0) {
 			bp->address = a;
-			bp->instr[1] = bpinstr;
-			store_inst(&bp->instr[1]);
+			patch_instruction(&bp->instr[1], bpinstr);
 			return bp;
 		}
 	}
@@ -894,25 +888,26 @@ static struct bpt *new_breakpoint(unsigned long a)
 static void insert_bpts(void)
 {
 	int i;
+	unsigned int instr;
 	struct bpt *bp;
 
 	bp = bpts;
 	for (i = 0; i < NBPTS; ++i, ++bp) {
 		if ((bp->enabled & (BP_TRAP|BP_CIABR)) == 0)
 			continue;
-		if (mread(bp->address, &bp->instr[0], 4) != 4) {
+		if (mread(bp->address, &instr, 4) != 4) {
 			printf("Couldn't read instruction at %lx, "
 			       "disabling breakpoint there\n", bp->address);
 			bp->enabled = 0;
 			continue;
 		}
-		if (IS_MTMSRD(bp->instr[0]) || IS_RFID(bp->instr[0])) {
+		if (IS_MTMSRD(instr) || IS_RFID(instr)) {
 			printf("Breakpoint at %lx is on an mtmsrd or rfid "
 			       "instruction, disabling it\n", bp->address);
 			bp->enabled = 0;
 			continue;
 		}
-		store_inst(&bp->instr[0]);
+		patch_instruction(bp->instr, instr);
 		if (bp->enabled & BP_CIABR)
 			continue;
 		if (patch_instruction((unsigned int *)bp->address,
@@ -922,7 +917,6 @@ static void insert_bpts(void)
 			bp->enabled &= ~BP_TRAP;
 			continue;
 		}
-		store_inst((void *)bp->address);
 	}
 }
 
@@ -957,8 +951,6 @@ static void remove_bpts(void)
 			(unsigned int *)bp->address, bp->instr[0]) != 0)
 			printf("Couldn't remove breakpoint at %lx\n",
 			       bp->address);
-		else
-			store_inst((void *)bp->address);
 	}
 }
 
-- 
2.17.1


  reply	other threads:[~2020-04-28  2:03 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-28  1:57 [PATCH v6 00/28] Initial Prefixed Instruction support Jordan Niethe
2020-04-28  1:57 ` Jordan Niethe [this message]
2020-04-28  1:57 ` [PATCH v6 02/28] powerpc/xmon: Move breakpoint instructions to own array Jordan Niethe
2020-04-28  1:57 ` [PATCH v6 03/28] powerpc/xmon: Move breakpoints to text section Jordan Niethe
2020-04-28  5:19   ` Christophe Leroy
2020-04-28  5:30     ` Jordan Niethe
2020-04-28  5:36       ` Christophe Leroy
2020-04-29  2:45         ` Jordan Niethe
2020-04-28  1:57 ` [PATCH v6 04/28] powerpc/xmon: Use bitwise calculations in_breakpoint_table() Jordan Niethe
2020-04-28  1:57 ` [PATCH v6 05/28] powerpc: Change calling convention for create_branch() et. al Jordan Niethe
2020-04-28  1:57 ` [PATCH v6 06/28] powerpc: Use a macro for creating instructions from u32s Jordan Niethe
2020-04-28  1:57 ` [PATCH v6 07/28] powerpc: Use an accessor for instructions Jordan Niethe
2020-04-28  1:57 ` [PATCH v6 08/28] powerpc: Use a function for getting the instruction op code Jordan Niethe
2020-04-28  1:57 ` [PATCH v6 09/28] powerpc: Use a function for byte swapping instructions Jordan Niethe
2020-04-28  1:57 ` [PATCH v6 10/28] powerpc: Introduce functions for instruction equality Jordan Niethe
2020-04-29  1:59   ` Alistair Popple
2020-04-29  2:52     ` Jordan Niethe
2020-04-28  1:57 ` [PATCH v6 11/28] powerpc: Use a datatype for instructions Jordan Niethe
2020-04-29  2:02   ` Alistair Popple
2020-04-29  2:57     ` Jordan Niethe
2020-04-28  1:57 ` [PATCH v6 12/28] powerpc: Use a function for reading instructions Jordan Niethe
2020-04-28  1:57 ` [PATCH v6 13/28] powerpc: Add a probe_user_read_inst() function Jordan Niethe
2020-04-28  1:58 ` [PATCH v6 14/28] powerpc: Add a probe_kernel_read_inst() function Jordan Niethe
2020-04-28  1:58 ` [PATCH v6 15/28] powerpc/kprobes: Use patch_instruction() Jordan Niethe
2020-04-28  1:58 ` [PATCH v6 16/28] powerpc: Define and use __get_user_instr{, inatomic}() Jordan Niethe
2020-04-28  1:58 ` [PATCH v6 17/28] powerpc: Introduce a function for reporting instruction length Jordan Niethe
2020-04-28  1:58 ` [PATCH v6 18/28] powerpc/xmon: Use a function for reading instructions Jordan Niethe
2020-04-28  1:58 ` [PATCH v6 19/28] powerpc/xmon: Move insertion of breakpoint for xol'ing Jordan Niethe
2020-04-28  1:58 ` [PATCH v6 20/28] powerpc: Make test_translate_branch() independent of instruction length Jordan Niethe
2020-04-28  1:58 ` [PATCH v6 21/28] powerpc: Enable Prefixed Instructions Jordan Niethe
2020-04-28  1:58 ` [PATCH v6 22/28] powerpc: Define new SRR1 bits for a future ISA version Jordan Niethe
2020-04-28  1:58 ` [PATCH v6 23/28] powerpc: Add prefixed instructions to instruction data type Jordan Niethe
2020-04-28  1:58 ` [PATCH v6 24/28] powerpc: Test prefixed code patching Jordan Niethe
2020-04-28  1:58 ` [PATCH v6 25/28] powerpc: Test prefixed instructions in feature fixups Jordan Niethe
2020-04-28  1:58 ` [PATCH v6 26/28] powerpc: Support prefixed instructions in alignment handler Jordan Niethe
2020-04-28  1:58 ` [PATCH v6 27/28] powerpc sstep: Add support for prefixed load/stores Jordan Niethe
2020-04-28  1:58 ` [PATCH v6 28/28] powerpc sstep: Add support for prefixed fixed-point arithmetic Jordan Niethe
2020-04-28 10:06 ` [PATCH v6 00/28] Initial Prefixed Instruction support Balamuruhan S
2020-04-29  2:51   ` Jordan Niethe

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=20200428015814.15380-2-jniethe5@gmail.com \
    --to=jniethe5@gmail.com \
    --cc=alistair@popple.id.au \
    --cc=bala24@linux.ibm.com \
    --cc=dja@axtens.net \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=npiggin@gmail.com \
    /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).