From: Alistair Popple <alistair@popple•id.au>
To: Jordan Niethe <jniethe5@gmail•com>
Cc: npiggin@gmail•com, bala24@linux•ibm.com,
naveen.n.rao@linux•vnet.ibm.com, linuxppc-dev@lists•ozlabs.org,
dja@axtens•net
Subject: Re: [PATCH v7 20/28] powerpc: Make test_translate_branch() independent of instruction length
Date: Tue, 05 May 2020 12:40:06 +1000 [thread overview]
Message-ID: <2254967.rLgCsJFhqv@townsend> (raw)
In-Reply-To: <20200501034220.8982-21-jniethe5@gmail.com>
I guess this could change if there were prefixed branch instructions, but there
aren't so:
Reviewed-by: Alistair Popple <alistair@popple•id.au>
On Friday, 1 May 2020 1:42:12 PM AEST Jordan Niethe wrote:
> test_translate_branch() uses two pointers to instructions within a
> buffer, p and q, to test patch_branch(). The pointer arithmetic done on
> them assumes a size of 4. This will not work if the instruction length
> changes. Instead do the arithmetic relative to the void * to the buffer.
>
> Signed-off-by: Jordan Niethe <jniethe5@gmail•com>
> ---
> v4: New to series
> ---
> arch/powerpc/lib/code-patching.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/powerpc/lib/code-patching.c
> b/arch/powerpc/lib/code-patching.c index 110f710500c8..5b2f66d06b1e 100644
> --- a/arch/powerpc/lib/code-patching.c
> +++ b/arch/powerpc/lib/code-patching.c
> @@ -569,7 +569,7 @@ static void __init test_branch_bform(void)
> static void __init test_translate_branch(void)
> {
> unsigned long addr;
> - struct ppc_inst *p, *q;
> + void *p, *q;
> struct ppc_inst instr;
> void *buf;
>
> @@ -583,7 +583,7 @@ static void __init test_translate_branch(void)
> addr = (unsigned long)p;
> patch_branch(p, addr, 0);
> check(instr_is_branch_to_addr(p, addr));
> - q = p + 1;
> + q = p + 4;
> translate_branch(&instr, q, p);
> patch_instruction(q, instr);
> check(instr_is_branch_to_addr(q, addr));
> @@ -639,7 +639,7 @@ static void __init test_translate_branch(void)
> create_cond_branch(&instr, p, addr, 0);
> patch_instruction(p, instr);
> check(instr_is_branch_to_addr(p, addr));
> - q = p + 1;
> + q = buf + 4;
> translate_branch(&instr, q, p);
> patch_instruction(q, instr);
> check(instr_is_branch_to_addr(q, addr));
next prev parent reply other threads:[~2020-05-05 2:41 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-01 3:41 [PATCH v7 00/28] Initial Prefixed Instruction support Jordan Niethe
2020-05-01 3:41 ` [PATCH v7 01/28] powerpc/xmon: Remove store_inst() for patch_instruction() Jordan Niethe
2020-05-01 3:41 ` [PATCH v7 02/28] powerpc/xmon: Move breakpoint instructions to own array Jordan Niethe
2020-05-04 5:41 ` Alistair Popple
2020-05-04 5:52 ` Jordan Niethe
2020-05-01 3:41 ` [PATCH v7 03/28] powerpc/xmon: Move breakpoints to text section Jordan Niethe
2020-05-01 3:41 ` [PATCH v7 04/28] powerpc/xmon: Use bitwise calculations in_breakpoint_table() Jordan Niethe
2020-05-04 5:41 ` Alistair Popple
2020-05-05 7:08 ` Michael Ellerman
2020-05-05 7:31 ` Jordan Niethe
2020-05-01 3:41 ` [PATCH v7 05/28] powerpc: Change calling convention for create_branch() et. al Jordan Niethe
2020-05-04 2:55 ` Alistair Popple
2020-05-01 3:41 ` [PATCH v7 06/28] powerpc: Use a macro for creating instructions from u32s Jordan Niethe
2020-05-04 5:54 ` Alistair Popple
2020-05-01 3:41 ` [PATCH v7 07/28] powerpc: Use an accessor for instructions Jordan Niethe
2020-05-01 3:42 ` [PATCH v7 08/28] powerpc: Use a function for getting the instruction op code Jordan Niethe
2020-05-04 8:01 ` Alistair Popple
2020-05-01 3:42 ` [PATCH v7 09/28] powerpc: Use a function for byte swapping instructions Jordan Niethe
2020-05-01 3:42 ` [PATCH v7 10/28] powerpc: Introduce functions for instruction equality Jordan Niethe
2020-05-01 3:42 ` [PATCH v7 11/28] powerpc: Use a datatype for instructions Jordan Niethe
2020-05-02 14:29 ` kbuild test robot
2020-05-01 3:42 ` [PATCH v7 12/28] powerpc: Use a function for reading instructions Jordan Niethe
2020-05-04 8:26 ` Alistair Popple
2020-05-01 3:42 ` [PATCH v7 13/28] powerpc: Add a probe_user_read_inst() function Jordan Niethe
2020-05-04 8:30 ` Alistair Popple
2020-05-01 3:42 ` [PATCH v7 14/28] powerpc: Add a probe_kernel_read_inst() function Jordan Niethe
2020-05-04 9:24 ` Alistair Popple
2020-05-01 3:42 ` [PATCH v7 15/28] powerpc/kprobes: Use patch_instruction() Jordan Niethe
2020-05-05 1:41 ` Alistair Popple
2020-05-01 3:42 ` [PATCH v7 16/28] powerpc: Define and use __get_user_instr{, inatomic}() Jordan Niethe
2020-05-05 1:46 ` Alistair Popple
2020-05-01 3:42 ` [PATCH v7 17/28] powerpc: Introduce a function for reporting instruction length Jordan Niethe
2020-05-05 2:02 ` Alistair Popple
2020-05-01 3:42 ` [PATCH v7 18/28] powerpc/xmon: Use a function for reading instructions Jordan Niethe
2020-05-05 2:07 ` Alistair Popple
2020-05-01 3:42 ` [PATCH v7 19/28] powerpc/xmon: Move insertion of breakpoint for xol'ing Jordan Niethe
2020-05-05 2:19 ` Alistair Popple
2020-05-01 3:42 ` [PATCH v7 20/28] powerpc: Make test_translate_branch() independent of instruction length Jordan Niethe
2020-05-05 2:40 ` Alistair Popple [this message]
2020-05-01 3:42 ` [PATCH v7 21/28] powerpc: Enable Prefixed Instructions Jordan Niethe
2020-05-01 3:42 ` [PATCH v7 22/28] powerpc: Define new SRR1 bits for a future ISA version Jordan Niethe
2020-05-05 2:49 ` Alistair Popple
2020-05-01 3:42 ` [PATCH v7 23/28] powerpc: Add prefixed instructions to instruction data type Jordan Niethe
2020-05-05 6:04 ` Alistair Popple
2020-05-01 3:42 ` [PATCH v7 24/28] powerpc: Test prefixed code patching Jordan Niethe
2020-05-05 6:08 ` Alistair Popple
2020-05-01 3:42 ` [PATCH v7 25/28] powerpc: Test prefixed instructions in feature fixups Jordan Niethe
2020-05-05 7:15 ` Alistair Popple
2020-05-05 7:34 ` Jordan Niethe
2020-05-01 3:42 ` [PATCH v7 26/28] powerpc: Support prefixed instructions in alignment handler Jordan Niethe
2020-05-05 7:17 ` Alistair Popple
2020-05-01 3:42 ` [PATCH v7 27/28] powerpc sstep: Add support for prefixed load/stores Jordan Niethe
2020-05-01 3:42 ` [PATCH v7 28/28] powerpc sstep: Add support for prefixed fixed-point arithmetic 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=2254967.rLgCsJFhqv@townsend \
--to=alistair@popple$(echo .)id.au \
--cc=bala24@linux$(echo .)ibm.com \
--cc=dja@axtens$(echo .)net \
--cc=jniethe5@gmail$(echo .)com \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=naveen.n.rao@linux$(echo .)vnet.ibm.com \
--cc=npiggin@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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