From: Christophe Leroy <christophe.leroy@csgroup.eu>
To: Alistair Popple <alistair@popple.id.au>
Cc: Jordan Niethe <jniethe5@gmail.com>,
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 v8 29/30] powerpc sstep: Add support for prefixed load/stores
Date: Thu, 14 May 2020 15:00:25 +0200 [thread overview]
Message-ID: <d2ab90e5-a06f-a638-c645-bf87ba67e516@csgroup.eu> (raw)
In-Reply-To: <3995356.VobCscqqe9@townsend>
Le 14/05/2020 à 14:19, Alistair Popple a écrit :
> On Thursday, 14 May 2020 4:15:06 PM AEST Christophe Leroy wrote:
>> Shouldn't this patch go before patch 23 ?
>
> Perhaps I am missing something, but it seems reasonable enough to me that you
> would introduce the machinery for dealing with prefix instructions prior to
> defining them. What would be the advantage of doing things the other way
> around?
If someone single steps a prefixed instruction before the kernel is able
to single step them, what happens ?
Christophe
>
> - Alistair
>
>> Christophe
>>
>> Le 06/05/2020 à 05:40, Jordan Niethe a écrit :
>>> This adds emulation support for the following prefixed integer
>>>
>>> load/stores:
>>> * Prefixed Load Byte and Zero (plbz)
>>> * Prefixed Load Halfword and Zero (plhz)
>>> * Prefixed Load Halfword Algebraic (plha)
>>> * Prefixed Load Word and Zero (plwz)
>>> * Prefixed Load Word Algebraic (plwa)
>>> * Prefixed Load Doubleword (pld)
>>> * Prefixed Store Byte (pstb)
>>> * Prefixed Store Halfword (psth)
>>> * Prefixed Store Word (pstw)
>>> * Prefixed Store Doubleword (pstd)
>>> * Prefixed Load Quadword (plq)
>>> * Prefixed Store Quadword (pstq)
>>>
>>> the follow prefixed floating-point load/stores:
>>> * Prefixed Load Floating-Point Single (plfs)
>>> * Prefixed Load Floating-Point Double (plfd)
>>> * Prefixed Store Floating-Point Single (pstfs)
>>> * Prefixed Store Floating-Point Double (pstfd)
>>>
>>> and for the following prefixed VSX load/stores:
>>> * Prefixed Load VSX Scalar Doubleword (plxsd)
>>> * Prefixed Load VSX Scalar Single-Precision (plxssp)
>>> * Prefixed Load VSX Vector [0|1] (plxv, plxv0, plxv1)
>>> * Prefixed Store VSX Scalar Doubleword (pstxsd)
>>> * Prefixed Store VSX Scalar Single-Precision (pstxssp)
>>> * Prefixed Store VSX Vector [0|1] (pstxv, pstxv0, pstxv1)
>>>
>>> Reviewed-by: Balamuruhan S <bala24@linux.ibm.com>
>>> Signed-off-by: Jordan Niethe <jniethe5@gmail.com>
>>> ---
>>> v2: - Combine all load/store patches
>>>
>>> - Fix the name of Type 01 instructions
>>> - Remove sign extension flag from pstd/pld
>>> - Rename sufx -> suffix
>>>
>>> v3: - Move prefixed loads and stores into the switch statement
>>> v6: - Compile on ppc32
>>>
>>> - Add back in + GETLENGTH(op->type)
>>>
>>> v8: Use fallthrough; keyword
>>> ---
>>>
>>> arch/powerpc/include/asm/sstep.h | 4 +
>>> arch/powerpc/lib/sstep.c | 163 ++++++++++++++++++++++++++++++-
>>> 2 files changed, 165 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/arch/powerpc/include/asm/sstep.h
>>> b/arch/powerpc/include/asm/sstep.h index c3ce903ac488..9b200a5f8794
>>> 100644
>>> --- a/arch/powerpc/include/asm/sstep.h
>>> +++ b/arch/powerpc/include/asm/sstep.h
>>> @@ -90,11 +90,15 @@ enum instruction_type {
>>>
>>> #define VSX_LDLEFT 4 /* load VSX register from left */
>>> #define VSX_CHECK_VEC 8 /* check MSR_VEC not MSR_VSX for reg >= 32 */
>>>
>>> +/* Prefixed flag, ORed in with type */
>>> +#define PREFIXED 0x800
>>> +
>>>
>>> /* Size field in type word */
>>> #define SIZE(n) ((n) << 12)
>>> #define GETSIZE(w) ((w) >> 12)
>>>
>>> #define GETTYPE(t) ((t) & INSTR_TYPE_MASK)
>>>
>>> +#define GETLENGTH(t) (((t) & PREFIXED) ? 8 : 4)
>>>
>>> #define MKOP(t, f, s) ((t) | (f) | SIZE(s))
>>>
>>> diff --git a/arch/powerpc/lib/sstep.c b/arch/powerpc/lib/sstep.c
>>> index ecd756c346fd..6794a7672ad5 100644
>>> --- a/arch/powerpc/lib/sstep.c
>>> +++ b/arch/powerpc/lib/sstep.c
>>> @@ -187,6 +187,44 @@ static nokprobe_inline unsigned long
>>> xform_ea(unsigned int instr,>
>>> return ea;
>>>
>>> }
>>>
>>> +/*
>>> + * Calculate effective address for a MLS:D-form / 8LS:D-form
>>> + * prefixed instruction
>>> + */
>>> +static nokprobe_inline unsigned long mlsd_8lsd_ea(unsigned int instr,
>>> + unsigned int suffix,
>>> + const struct pt_regs *regs)
>>> +{
>>> + int ra, prefix_r;
>>> + unsigned int dd;
>>> + unsigned long ea, d0, d1, d;
>>> +
>>> + prefix_r = instr & (1ul << 20);
>>> + ra = (suffix >> 16) & 0x1f;
>>> +
>>> + d0 = instr & 0x3ffff;
>>> + d1 = suffix & 0xffff;
>>> + d = (d0 << 16) | d1;
>>> +
>>> + /*
>>> + * sign extend a 34 bit number
>>> + */
>>> + dd = (unsigned int)(d >> 2);
>>> + ea = (signed int)dd;
>>> + ea = (ea << 2) | (d & 0x3);
>>> +
>>> + if (!prefix_r && ra)
>>> + ea += regs->gpr[ra];
>>> + else if (!prefix_r && !ra)
>>> + ; /* Leave ea as is */
>>> + else if (prefix_r && !ra)
>>> + ea += regs->nip;
>>> + else if (prefix_r && ra)
>>> + ; /* Invalid form. Should already be checked for by caller! */
>>> +
>>> + return ea;
>>> +}
>>> +
>>>
>>> /*
>>>
>>> * Return the largest power of 2, not greater than sizeof(unsigned
>>> long),
>>> * such that x is a multiple of it.
>>>
>>> @@ -1166,6 +1204,9 @@ int analyse_instr(struct instruction_op *op, const
>>> struct pt_regs *regs,>
>>> struct ppc_inst instr)
>>>
>>> {
>>>
>>> unsigned int opcode, ra, rb, rc, rd, spr, u;
>>>
>>> +#ifdef __powerpc64__
>>> + unsigned int suffixopcode, prefixtype, prefix_r;
>>> +#endif
>>>
>>> unsigned long int imm;
>>> unsigned long int val, val2;
>>> unsigned int mb, me, sh;
>>>
>>> @@ -2652,6 +2693,124 @@ int analyse_instr(struct instruction_op *op, const
>>> struct pt_regs *regs,>
>>> break;
>>>
>>> }
>>> break;
>>>
>>> + case 1: /* Prefixed instructions */
>>> + prefix_r = word & (1ul << 20);
>>> + ra = (suffix >> 16) & 0x1f;
>>> + op->update_reg = ra;
>>> + rd = (suffix >> 21) & 0x1f;
>>> + op->reg = rd;
>>> + op->val = regs->gpr[rd];
>>> +
>>> + suffixopcode = suffix >> 26;
>>> + prefixtype = (word >> 24) & 0x3;
>>> + switch (prefixtype) {
>>> + case 0: /* Type 00 Eight-Byte Load/Store */
>>> + if (prefix_r && ra)
>>> + break;
>>> + op->ea = mlsd_8lsd_ea(word, suffix, regs);
>>> + switch (suffixopcode) {
>>> + case 41: /* plwa */
>>> + op->type = MKOP(LOAD, PREFIXED | SIGNEXT, 4);
>>> + break;
>>> + case 42: /* plxsd */
>>> + op->reg = rd + 32;
>>> + op->type = MKOP(LOAD_VSX, PREFIXED, 8);
>>> + op->element_size = 8;
>>> + op->vsx_flags = VSX_CHECK_VEC;
>>> + break;
>>> + case 43: /* plxssp */
>>> + op->reg = rd + 32;
>>> + op->type = MKOP(LOAD_VSX, PREFIXED, 4);
>>> + op->element_size = 8;
>>> + op->vsx_flags = VSX_FPCONV | VSX_CHECK_VEC;
>>> + break;
>>> + case 46: /* pstxsd */
>>> + op->reg = rd + 32;
>>> + op->type = MKOP(STORE_VSX, PREFIXED, 8);
>>> + op->element_size = 8;
>>> + op->vsx_flags = VSX_CHECK_VEC;
>>> + break;
>>> + case 47: /* pstxssp */
>>> + op->reg = rd + 32;
>>> + op->type = MKOP(STORE_VSX, PREFIXED, 4);
>>> + op->element_size = 8;
>>> + op->vsx_flags = VSX_FPCONV | VSX_CHECK_VEC;
>>> + break;
>>> + case 51: /* plxv1 */
>>> + op->reg += 32;
>>> + fallthrough;
>>> + case 50: /* plxv0 */
>>> + op->type = MKOP(LOAD_VSX, PREFIXED, 16);
>>> + op->element_size = 16;
>>> + op->vsx_flags = VSX_CHECK_VEC;
>>> + break;
>>> + case 55: /* pstxv1 */
>>> + op->reg = rd + 32;
>>> + fallthrough;
>>> + case 54: /* pstxv0 */
>>> + op->type = MKOP(STORE_VSX, PREFIXED, 16);
>>> + op->element_size = 16;
>>> + op->vsx_flags = VSX_CHECK_VEC;
>>> + break;
>>> + case 56: /* plq */
>>> + op->type = MKOP(LOAD, PREFIXED, 16);
>>> + break;
>>> + case 57: /* pld */
>>> + op->type = MKOP(LOAD, PREFIXED, 8);
>>> + break;
>>> + case 60: /* stq */
>>> + op->type = MKOP(STORE, PREFIXED, 16);
>>> + break;
>>> + case 61: /* pstd */
>>> + op->type = MKOP(STORE, PREFIXED, 8);
>>> + break;
>>> + }
>>> + break;
>>> + case 1: /* Type 01 Eight-Byte Register-to-Register */
>>> + break;
>>> + case 2: /* Type 10 Modified Load/Store */
>>> + if (prefix_r && ra)
>>> + break;
>>> + op->ea = mlsd_8lsd_ea(word, suffix, regs);
>>> + switch (suffixopcode) {
>>> + case 32: /* plwz */
>>> + op->type = MKOP(LOAD, PREFIXED, 4);
>>> + break;
>>> + case 34: /* plbz */
>>> + op->type = MKOP(LOAD, PREFIXED, 1);
>>> + break;
>>> + case 36: /* pstw */
>>> + op->type = MKOP(STORE, PREFIXED, 4);
>>> + break;
>>> + case 38: /* pstb */
>>> + op->type = MKOP(STORE, PREFIXED, 1);
>>> + break;
>>> + case 40: /* plhz */
>>> + op->type = MKOP(LOAD, PREFIXED, 2);
>>> + break;
>>> + case 42: /* plha */
>>> + op->type = MKOP(LOAD, PREFIXED | SIGNEXT, 2);
>>> + break;
>>> + case 44: /* psth */
>>> + op->type = MKOP(STORE, PREFIXED, 2);
>>> + break;
>>> + case 48: /* plfs */
>>> + op->type = MKOP(LOAD_FP, PREFIXED | FPCONV, 4);
>>> + break;
>>> + case 50: /* plfd */
>>> + op->type = MKOP(LOAD_FP, PREFIXED, 8);
>>> + break;
>>> + case 52: /* pstfs */
>>> + op->type = MKOP(STORE_FP, PREFIXED | FPCONV, 4);
>>> + break;
>>> + case 54: /* pstfd */
>>> + op->type = MKOP(STORE_FP, PREFIXED, 8);
>>> + break;
>>> + }
>>> + break;
>>> + case 3: /* Type 11 Modified Register-to-Register */
>>> + break;
>>> + }
>>>
>>> #endif /* __powerpc64__ */
>>>
>>> }
>>>
>>> @@ -2760,7 +2919,7 @@ void emulate_update_regs(struct pt_regs *regs,
>>> struct instruction_op *op)>
>>> {
>>>
>>> unsigned long next_pc;
>>>
>>> - next_pc = truncate_if_32bit(regs->msr, regs->nip + 4);
>>> + next_pc = truncate_if_32bit(regs->msr, regs->nip + GETLENGTH(op-
>> type));
>>>
>>> switch (GETTYPE(op->type)) {
>>>
>>> case COMPUTE:
>>> if (op->type & SETREG)
>>>
>>> @@ -3205,7 +3364,7 @@ int emulate_step(struct pt_regs *regs, struct
>>> ppc_inst instr)>
>>> return 0;
>>>
>>> instr_done:
>>> - regs->nip = truncate_if_32bit(regs->msr, regs->nip + 4);
>>> + regs->nip = truncate_if_32bit(regs->msr, regs->nip +
>>> GETLENGTH(op.type));
>>>
>>> return 1;
>>>
>>> }
>>> NOKPROBE_SYMBOL(emulate_step);
next prev parent reply other threads:[~2020-05-14 13:07 UTC|newest]
Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-06 3:40 [PATCH v8 00/30] Initial Prefixed Instruction support Jordan Niethe
2020-05-06 3:40 ` [PATCH v8 01/30] powerpc/xmon: Remove store_inst() for patch_instruction() Jordan Niethe
2020-05-06 3:40 ` [PATCH v8 02/30] powerpc/xmon: Move breakpoint instructions to own array Jordan Niethe
2020-05-06 3:40 ` [PATCH v8 03/30] powerpc/xmon: Move breakpoints to text section Jordan Niethe
2020-05-06 3:40 ` [PATCH v8 04/30] powerpc/xmon: Use bitwise calculations in_breakpoint_table() Jordan Niethe
2020-05-06 3:40 ` [PATCH v8 05/30] powerpc: Change calling convention for create_branch() et. al Jordan Niethe
2020-05-06 3:40 ` [PATCH v8 06/30] powerpc: Use a macro for creating instructions from u32s Jordan Niethe
2020-05-06 3:40 ` [PATCH v8 07/30] powerpc: Use an accessor for instructions Jordan Niethe
2020-05-06 3:40 ` [PATCH v8 08/30] powerpc: Use a function for getting the instruction op code Jordan Niethe
2020-05-15 7:48 ` Jordan Niethe
2020-05-16 11:08 ` Michael Ellerman
2020-05-17 7:41 ` Jordan Niethe
2020-05-06 3:40 ` [PATCH v8 09/30] powerpc: Use a function for byte swapping instructions Jordan Niethe
2020-05-06 3:40 ` [PATCH v8 10/30] powerpc: Introduce functions for instruction equality Jordan Niethe
2020-05-06 3:40 ` [PATCH v8 11/30] powerpc: Use a datatype for instructions Jordan Niethe
2020-05-08 1:51 ` Jordan Niethe
2020-05-08 7:17 ` Christophe Leroy
2020-05-11 1:19 ` Jordan Niethe
2020-05-08 2:15 ` Jordan Niethe
2020-05-17 10:48 ` Jordan Niethe
2020-05-06 3:40 ` [PATCH v8 12/30] powerpc: Use a function for reading instructions Jordan Niethe
2020-05-16 18:39 ` Christophe Leroy
2020-05-17 10:44 ` Jordan Niethe
2020-05-19 4:05 ` Michael Ellerman
2020-05-19 5:03 ` Christophe Leroy
2020-05-20 4:16 ` Michael Ellerman
2020-05-06 3:40 ` [PATCH v8 13/30] powerpc: Add a probe_user_read_inst() function Jordan Niethe
2020-05-13 12:52 ` Michael Ellerman
2020-05-13 23:51 ` Jordan Niethe
2020-05-14 5:46 ` Christophe Leroy
2020-05-15 3:46 ` Jordan Niethe
2020-05-06 3:40 ` [PATCH v8 14/30] powerpc: Add a probe_kernel_read_inst() function Jordan Niethe
2020-05-06 3:40 ` [PATCH v8 15/30] powerpc/kprobes: Use patch_instruction() Jordan Niethe
2020-05-06 3:40 ` [PATCH v8 16/30] powerpc: Define and use __get_user_instr{, inatomic}() Jordan Niethe
2020-05-13 14:18 ` Michael Ellerman
2020-05-13 23:54 ` Jordan Niethe
2020-05-14 1:43 ` Jordan Niethe
2020-05-06 3:40 ` [PATCH v8 17/30] powerpc: Introduce a function for reporting instruction length Jordan Niethe
2020-05-06 3:40 ` [PATCH v8 18/30] powerpc/xmon: Use a function for reading instructions Jordan Niethe
2020-05-06 3:40 ` [PATCH v8 19/30] powerpc/xmon: Move insertion of breakpoint for xol'ing Jordan Niethe
2020-05-06 3:40 ` [PATCH v8 20/30] powerpc: Make test_translate_branch() independent of instruction length Jordan Niethe
2020-05-06 3:40 ` [PATCH v8 21/30] powerpc: Enable Prefixed Instructions Jordan Niethe
2020-05-06 3:40 ` [PATCH v8 22/30] powerpc: Define new SRR1 bits for a future ISA version Jordan Niethe
2020-05-08 2:26 ` Jordan Niethe
2020-05-06 3:40 ` [PATCH v8 23/30] powerpc: Add prefixed instructions to instruction data type Jordan Niethe
2020-05-14 1:40 ` Jordan Niethe
2020-05-14 6:11 ` Christophe Leroy
2020-05-14 12:06 ` Alistair Popple
2020-05-14 12:29 ` Jordan Niethe
2020-05-14 12:57 ` Christophe Leroy
2020-05-14 12:28 ` Jordan Niethe
2020-05-15 1:33 ` Michael Ellerman
2020-05-15 7:52 ` Jordan Niethe
2020-05-16 11:54 ` [PATCH v8 22.5/30] powerpc/optprobes: Add register argument to patch_imm64_load_insns() Michael Ellerman
2020-06-09 5:51 ` Michael Ellerman
2020-05-06 3:40 ` [PATCH v8 24/30] powerpc: Test prefixed code patching Jordan Niethe
2020-05-15 7:54 ` Jordan Niethe
2020-05-06 3:40 ` [PATCH v8 25/30] powerpc: Test prefixed instructions in feature fixups Jordan Niethe
2020-05-15 7:57 ` Jordan Niethe
2020-05-06 3:40 ` [PATCH v8 26/30] powerpc/xmon: Don't allow breakpoints on suffixes Jordan Niethe
2020-05-06 3:40 ` [PATCH v8 27/30] powerpc/kprobes: " Jordan Niethe
2021-05-18 18:43 ` Christophe Leroy
2021-05-18 19:52 ` Gabriel Paubert
2021-05-19 8:11 ` Naveen N. Rao
2021-05-20 3:45 ` Jordan Niethe
2020-05-06 3:40 ` [PATCH v8 28/30] powerpc: Support prefixed instructions in alignment handler Jordan Niethe
2020-05-14 6:14 ` Christophe Leroy
2020-05-14 12:15 ` Alistair Popple
2020-05-14 12:59 ` Christophe Leroy
2020-05-06 3:40 ` [PATCH v8 29/30] powerpc sstep: Add support for prefixed load/stores Jordan Niethe
2020-05-14 6:15 ` Christophe Leroy
2020-05-14 12:19 ` Alistair Popple
2020-05-14 13:00 ` Christophe Leroy [this message]
2020-05-15 7:59 ` Jordan Niethe
2020-05-06 3:40 ` [PATCH v8 30/30] powerpc sstep: Add support for prefixed fixed-point arithmetic Jordan Niethe
2020-05-14 6:15 ` Christophe Leroy
2020-05-15 8:02 ` Jordan Niethe
2020-05-14 5:31 ` [PATCH v8 00/30] Initial Prefixed Instruction support Christophe Leroy
2020-05-14 10:33 ` Jordan Niethe
2020-05-20 10:59 ` Michael Ellerman
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=d2ab90e5-a06f-a638-c645-bf87ba67e516@csgroup.eu \
--to=christophe.leroy@csgroup.eu \
--cc=alistair@popple.id.au \
--cc=bala24@linux.ibm.com \
--cc=dja@axtens.net \
--cc=jniethe5@gmail.com \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=naveen.n.rao@linux.vnet.ibm.com \
--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).