Skip to content

Initial Prefixed Instruction support

Jordan Niethe linuxppc-dev oe-kbuild-all 8 versions – Applied

Status from this message: Applied to powerpc/next.

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v8 Latest30 patches 47 repliesApplied
  2. v728 patches 23 repliesSuperseded
  3. v628 patches 10 repliesSuperseded
Earlier versions · 5
VersionPostedPatchesRepliesStatus
v521 patches39 repliesSuperseded
v416 patches48 repliesSuperseded
v314 patches21 repliesSuperseded
v213 patches12 repliesSuperseded
v118 patches23 repliesSuperseded

Patches in v8 Applied

#Subject and filesSizeRepliesApplied
1/30powerpc/xmon: Remove store_inst() for patch_instruction()arch/powerpc/xmon/xmon.c+5 -130 replies
2/30powerpc/xmon: Move breakpoint instructions to own arrayarch/powerpc/xmon/xmon.c+12 -90 replies
3/30powerpc/xmon: Move breakpoints to text sectionarch/powerpc/kernel/asm-offsets.c arch/powerpc/xmon/Makefile arch/powerpc/xmon/xmon.c +2 more+33 -60 replies
4/30powerpc/xmon: Use bitwise calculations in_breakpoint_table()arch/powerpc/xmon/xmon.c+2 -20 replies
5/30powerpc: Change calling convention for create_branch() et. al.arch/powerpc/include/asm/code-patching.h arch/powerpc/kernel/optprobes.c arch/powerpc/kernel/setup_32.c +3 more+119 -840 replies
6/30powerpc: Use a macro for creating instructions from u32sarch/powerpc/include/asm/code-patching.h arch/powerpc/include/asm/inst.h arch/powerpc/kernel/align.c +21 more+156 -1200 replies
7/30powerpc: Use an accessor for instructionsarch/powerpc/include/asm/inst.h arch/powerpc/include/asm/sstep.h arch/powerpc/kernel/align.c +8 more+190 -1790 replies
8/30powerpc: Use a function for getting the instruction op codearch/powerpc/include/asm/inst.h arch/powerpc/kernel/align.c arch/powerpc/kernel/vecemu.c +3 more+13 -63 replies
9/30powerpc: Use a function for byte swapping instructionsarch/powerpc/include/asm/inst.h arch/powerpc/kernel/align.c+6 -10 replies
10/30powerpc: Introduce functions for instruction equalityarch/powerpc/include/asm/inst.h arch/powerpc/kernel/trace/ftrace.c arch/powerpc/lib/code-patching.c +1 more+21 -150 replies
11/30powerpc: Use a datatype for instructionsarch/powerpc/include/asm/code-patching.h arch/powerpc/include/asm/inst.h arch/powerpc/include/asm/sstep.h +23 more+233 -2115 replies
12/30powerpc: Use a function for reading instructionsarch/powerpc/include/asm/inst.h arch/powerpc/kernel/kprobes.c arch/powerpc/kernel/mce_power.c +6 more+33 -265 replies
13/30powerpc: Add a probe_user_read_inst() functionarch/powerpc/include/asm/inst.h arch/powerpc/lib/Makefile arch/powerpc/lib/inst.c +1 more+23 -24 replies
14/30powerpc: Add a probe_kernel_read_inst() functionarch/powerpc/include/asm/inst.h arch/powerpc/kernel/trace/ftrace.c arch/powerpc/lib/inst.c+26 -100 replies
15/30powerpc/kprobes: Use patch_instruction()arch/powerpc/kernel/kprobes.c+1 -40 replies
16/30powerpc: Define and use __get_user_instr{, inatomic}()arch/powerpc/include/asm/uaccess.h arch/powerpc/kernel/align.c arch/powerpc/kernel/hw_breakpoint.c +1 more+8 -33 replies
17/30powerpc: Introduce a function for reporting instruction lengtharch/powerpc/include/asm/inst.h arch/powerpc/kernel/kprobes.c arch/powerpc/kernel/uprobes.c +1 more+17 -100 replies
18/30powerpc/xmon: Use a function for reading instructionsarch/powerpc/xmon/xmon.c+24 -40 replies
19/30powerpc/xmon: Move insertion of breakpoint for xol'ingarch/powerpc/xmon/xmon.c+2 -10 replies
20/30powerpc: Make test_translate_branch() independent of instruction lengtharch/powerpc/lib/code-patching.c+3 -30 replies
21/30powerpc: Enable Prefixed Instructionsarch/powerpc/include/asm/reg.h arch/powerpc/kernel/traps.c+4 -00 replies
22/30powerpc: Define new SRR1 bits for a future ISA versionarch/powerpc/include/asm/reg.h arch/powerpc/kvm/book3s_hv_nested.c arch/powerpc/kvm/book3s_hv_rm_mmu.c+5 -31 reply
23/30powerpc: Add prefixed instructions to instruction data typearch/powerpc/include/asm/inst.h arch/powerpc/include/asm/kprobes.h arch/powerpc/include/asm/ppc-opcode.h +11 more+200 -3810 replies
24/30powerpc: Test prefixed code patchingarch/powerpc/lib/Makefile arch/powerpc/lib/code-patching.c arch/powerpc/lib/test_code-patching.S+42 -11 reply
25/30powerpc: Test prefixed instructions in feature fixupsarch/powerpc/lib/feature-fixups-test.S arch/powerpc/lib/feature-fixups.c+142 -01 reply
26/30powerpc/xmon: Don't allow breakpoints on suffixesarch/powerpc/xmon/xmon.c+27 -20 replies
27/30powerpc/kprobes: Don't allow breakpoints on suffixesarch/powerpc/kernel/kprobes.c+13 -04 replies
28/30powerpc: Support prefixed instructions in alignment handlerarch/powerpc/kernel/traps.c+18 -13 replies
29/30powerpc sstep: Add support for prefixed load/storesarch/powerpc/include/asm/sstep.h arch/powerpc/lib/sstep.c+165 -24 replies
30/30powerpc sstep: Add support for prefixed fixed-point arithmeticarch/powerpc/lib/sstep.c+20 -02 replies

Reviews trailers per patch

23 of 30 patches have a Reviewed-by or Acked-by.

PatchNicholas PigginAlistair PoppleBalamuruhan S
1/30R-b
2/30R-b
3/30
4/30R-b
5/30R-b
6/30R-b
7/30
8/30R-b
9/30R-b
10/30R-b
11/30
12/30R-b
13/30R-b
14/30R-b
15/30R-b
16/30R-b
17/30R-b
18/30R-b
19/30R-b
20/30R-b
21/30R-b
22/30R-b
23/30R-b
24/30
25/30
26/30
27/30
28/30R-b
29/30R-b
30/30R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v8 thread

Cover letter [PATCH v8 00/30] Initial Prefixed Instruction support

A future revision of the ISA will introduce prefixed instructions. A prefixed instruction is composed of a 4-byte prefix followed by a 4-byte suffix.

All prefixes have the major opcode 1. A prefix will never be a valid word instruction. A suffix may be an existing word instruction or a new instruction.

This series enables prefixed instructions and extends the instruction emulation to support them. Then the places where prefixed instructions might need to be emulated are updated.

v8 incorporates feedback from Alistair Popple and Balamuruhan Suriyakumar. The major changes:
- Fix some style issues
- Fix __patch_instruction() on big endian
- Reintroduce v3's forbidding breakpoints on second word of prefix instructions for kprobes and xmon. Missed this when changing to using a data type.
- Use the data type in some places that were missed.

v7 fixes compilation issues for some configs reported by Alistair Popple.

v6 is based on feedback from Balamuruhan Suriyakumar, Alistair Popple, Christophe Leroy and Segher Boessenkool.
The major changes:
- Use the instruction type in more places that had been missed before
- Fix issues with ppc32
- Introduce new self tests for code patching and feature fixups

v5 is based on feedback from Nick Piggins, Michael Ellerman, Balamuruhan Suriyakumar and Alistair Popple.
The major changes:
- The ppc instruction type is now a struct
- Series now just based on next
- ppc_inst_masked() dropped
- Space for xmon breakpoints allocated in an assembly file
- "Add prefixed instructions to instruction data type" patch seperated in to smaller patches
- Calling convention for create_branch() is changed
- Some places which had not been updated to use the data type are now updated

v4 is based on feedback from Nick Piggins, Christophe Leroy and Daniel Axtens. The major changes:
- Move xmon breakpoints from data section to text section
- Introduce a data type for instructions on powerpc

v3 is based on feedback from Christophe Leroy. The major changes:
- Completely replacing store_inst() with patch_instruction() in xmon
- Improve implementation of mread_instr() to not use mread().
- Base the series on top of
https://patchwork.ozlabs.org/patch/1232619/ as this will effect kprobes.
- Some renaming and simplification of conditionals.

v2 incorporates feedback from Daniel Axtens and and Balamuruhan S. The major changes are:
- Squashing together all commits about SRR1 bits
- Squashing all commits for supporting prefixed load stores
- Changing abbreviated references to sufx/prfx -> suffix/prefix
- Introducing macros for returning the length of an instruction
- Removing sign extension flag from pstd/pld in sstep.c
- Dropping patch "powerpc/fault: Use analyse_instr() to check for store with updates to sp" from the series, it did not really fit with prefixed enablement in the first place and as reported by Greg Kurz did not work correctly.

Alistair Popple (1):
powerpc: Enable Prefixed Instructions

Jordan Niethe (29):
powerpc/xmon: Remove store_inst() for patch_instruction() powerpc/xmon: Move breakpoint instructions to own array powerpc/xmon: Move breakpoints to text section powerpc/xmon: Use bitwise calculations in_breakpoint_table()
powerpc: Change calling convention for create_branch() et. al.
powerpc: Use a macro for creating instructions from u32s
powerpc: Use an accessor for instructions
powerpc: Use a function for getting the instruction op code
powerpc: Use a function for byte swapping instructions
powerpc: Introduce functions for instruction equality
powerpc: Use a datatype for instructions
powerpc: Use a function for reading instructions
powerpc: Add a probe_user_read_inst() function
powerpc: Add a probe_kernel_read_inst() function powerpc/kprobes: Use patch_instruction()
powerpc: Define and use __get_user_instr{,inatomic}()
powerpc: Introduce a function for reporting instruction length powerpc/xmon: Use a function for reading instructions powerpc/xmon: Move insertion of breakpoint for xol'ing
powerpc: Make test_translate_branch() independent of instruction
length
powerpc: Define new SRR1 bits for a future ISA version
powerpc: Add prefixed instructions to instruction data type
powerpc: Test prefixed code patching
powerpc: Test prefixed instructions in feature fixups powerpc/xmon: Don't allow breakpoints on suffixes powerpc/kprobes: Don't allow breakpoints on suffixes
powerpc: Support prefixed instructions in alignment handler powerpc sstep: Add support for prefixed load/stores powerpc sstep: Add support for prefixed fixed-point arithmetic

 arch/powerpc/include/asm/code-patching.h  |  37 +-
 arch/powerpc/include/asm/inst.h           | 107 +++++
 arch/powerpc/include/asm/kprobes.h        |   2 +-
 arch/powerpc/include/asm/ppc-opcode.h     |   3 +
 arch/powerpc/include/asm/reg.h            |   7 +-
 arch/powerpc/include/asm/sstep.h          |  15 +-
 arch/powerpc/include/asm/uaccess.h        |  43 ++
 arch/powerpc/include/asm/uprobes.h        |   7 +-
 arch/powerpc/kernel/align.c               |  13 +-
 arch/powerpc/kernel/asm-offsets.c         |   8 +
 arch/powerpc/kernel/crash_dump.c          |   7 +-
 arch/powerpc/kernel/epapr_paravirt.c      |   7 +-
 arch/powerpc/kernel/hw_breakpoint.c       |   5 +-
 arch/powerpc/kernel/jump_label.c          |   5 +-
 arch/powerpc/kernel/kgdb.c                |   9 +-
 arch/powerpc/kernel/kprobes.c             |  37 +-
 arch/powerpc/kernel/mce_power.c           |   5 +-
 arch/powerpc/kernel/module_64.c           |   3 +-
 arch/powerpc/kernel/optprobes.c           | 102 +++--
 arch/powerpc/kernel/optprobes_head.S      |   3 +
 arch/powerpc/kernel/security.c            |  12 +-
 arch/powerpc/kernel/setup_32.c            |   8 +-
 arch/powerpc/kernel/trace/ftrace.c        | 168 ++++----
 arch/powerpc/kernel/traps.c               |  20 +-
 arch/powerpc/kernel/uprobes.c             |   5 +-
 arch/powerpc/kernel/vecemu.c              |  20 +-
 arch/powerpc/kvm/book3s_hv_nested.c       |   2 +-
 arch/powerpc/kvm/book3s_hv_rm_mmu.c       |   2 +-
 arch/powerpc/kvm/emulate_loadstore.c      |   2 +-
 arch/powerpc/lib/Makefile                 |   2 +-
 arch/powerpc/lib/code-patching.c          | 319 +++++++++------
 arch/powerpc/lib/feature-fixups-test.S    |  69 ++++
 arch/powerpc/lib/feature-fixups.c         | 160 ++++++--
 arch/powerpc/lib/inst.c                   |  70 ++++
 arch/powerpc/lib/sstep.c                  | 459 +++++++++++++++-------
 arch/powerpc/lib/test_code-patching.S     |  20 +
 arch/powerpc/lib/test_emulate_step.c      |  56 +--
 arch/powerpc/mm/fault.c                   |  15 +-
 arch/powerpc/mm/nohash/8xx.c              |   5 +-
 arch/powerpc/perf/8xx-pmu.c               |   9 +-
 arch/powerpc/perf/core-book3s.c           |   4 +-
 arch/powerpc/platforms/86xx/mpc86xx_smp.c |   5 +-
 arch/powerpc/platforms/powermac/smp.c     |   5 +-
 arch/powerpc/xmon/Makefile                |   2 +-
 arch/powerpc/xmon/xmon.c                  | 122 ++++--
 arch/powerpc/xmon/xmon_bpts.S             |  11 +
 arch/powerpc/xmon/xmon_bpts.h             |  14 +
 47 files changed, 1409 insertions(+), 602 deletions(-)
 create mode 100644 arch/powerpc/include/asm/inst.h
 create mode 100644 arch/powerpc/lib/inst.c
 create mode 100644 arch/powerpc/lib/test_code-patching.S
 create mode 100644 arch/powerpc/xmon/xmon_bpts.S
 create mode 100644 arch/powerpc/xmon/xmon_bpts.h
Signature · 1 line
2.17.1