arm64: Prepare instruction decoder for objtool
Subsystems (3)
v2 cover arm64: Prepare instruction decoder for objtool
To support arm64, objtool will need to be able to decode aarch64 instructions. This patch series adds some instruction definitions needed by objtool and moves out encoding/decoding functionalities that do not rely on kernel code in order.
Changes since v1[1]:
- Split the isolation of instruction encoder/decoder capabilities in several steps as suggested by Mark R.
- Exclude dsb encoding where CRm != 0b0x00
- Support dsb FEAT_XS encoding
- Support previously missing barriers
[1] https://lkml.org/lkml/2021/1/20/791
Thanks,
Julien
-->
Julien Thierry (8):
arm64: Move patching utilities out of instruction encoding/decoding
arm64: Move aarch32 condition check functions
arm64: insn: Reduce header dependencies of instruction decoder
arm64: Move instruction encoder/decoder under lib/
arm64: insn: Add SVE instruction class
arm64: insn: Add barrier encodings
arm64: insn: Add some opcodes to instruction decoder
arm64: insn: Add load/store decoding helpers
arch/arm64/include/asm/alternative-macros.h | 3 -
arch/arm64/include/asm/insn.h | 70 +++++-
arch/arm64/include/asm/patching.h | 13 +
arch/arm64/include/asm/probes.h | 2 +-
arch/arm64/include/asm/traps.h | 3 +
arch/arm64/kernel/Makefile | 4 +-
arch/arm64/kernel/ftrace.c | 1 +
arch/arm64/kernel/jump_label.c | 1 +
arch/arm64/kernel/patching.c | 148 ++++++++++++
arch/arm64/kernel/probes/simulate-insn.c | 1 +
arch/arm64/kernel/traps.c | 100 +++++++-
arch/arm64/lib/Makefile | 6 +-
arch/arm64/{kernel => lib}/insn.c | 249 +-------------------
13 files changed, 338 insertions(+), 263 deletions(-)
create mode 100644 arch/arm64/include/asm/patching.h
create mode 100644 arch/arm64/kernel/patching.c
rename arch/arm64/{kernel => lib}/insn.c (86%)--
2.25.4
RFC PATCH v2 1/8 arm64: Move patching utilities out of instruction encoding/decoding
Files insn.[c|h] containt some functions used for instruction patching. In order to reuse the instruction encoder/decoder, move the patching utilities to their own file.
--- arch/arm64/include/asm/insn.h | 5 - arch/arm64/include/asm/patching.h | 13 +++ arch/arm64/kernel/Makefile | 2 +- arch/arm64/kernel/ftrace.c | 1 + arch/arm64/kernel/insn.c | 149 +----------------------------- arch/arm64/kernel/jump_label.c | 1 + arch/arm64/kernel/patching.c | 148 +++++++++++++++++++++++++++++ arch/arm64/kernel/traps.c | 1 + 8 files changed, 168 insertions(+), 152 deletions(-) create mode 100644 arch/arm64/include/asm/patching.h create mode 100644 arch/arm64/kernel/patching.c
arch/arm64/include/asm/insn.h +0 -5
@@ -379,8 +379,6 @@ static inline bool aarch64_insn_is_adr_adrp(u32 insn)return aarch64_insn_is_adr (insn) ||aarch64_insn_is_adrp (insn); } -int aarch64_insn_read (void *addr,u32 *insnp); -int aarch64_insn_write (void *addr,u32 insn);enum aarch64_insn_encoding_class aarch64_get_insn_class (u32 insn);bool aarch64_insn_uses_literal (u32 insn);bool aarch64_insn_is_branch (u32 insn);
@@ -487,9 +485,6 @@ u32 aarch64_insn_gen_prefetch(enum aarch64_insn_register base,s32 aarch64_get_branch_offset (u32 insn);u32 aarch64_set_branch_offset (u32 insn,s32 offset); -int aarch64_insn_patch_text_nosync (void *addr,u32 insn); -int aarch64_insn_patch_text (void *addrs[],u32 insns[],int cnt); -s32 aarch64_insn_adrp_get_offset (u32 insn);u32 aarch64_insn_adrp_set_offset (u32 insn,s32 offset);
arch/arm64/include/asm/patching.h new file +13 -0
@@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef __ASM_PATCHING_H +#define __ASM_PATCHING_H + +#include <linux/types.h> + +int aarch64_insn_read (void *addr,u32 *insnp); +int aarch64_insn_write (void *addr,u32 insn); + +int aarch64_insn_patch_text_nosync (void *addr,u32 insn); +int aarch64_insn_patch_text (void *addrs[],u32 insns[],int cnt); + +#endif /* __ASM_PATCHING_H */
arch/arm64/kernel/Makefile +1 -1
@@ -17,7 +17,7 @@ obj-y := debug-monitors.o entry.o irq.o fpsimd.o \ return_address.o cpuinfo.o cpu_errata.o \ cpufeature.o alternative.o cacheinfo.o \ smp.o smp_spin_table.o topology.o smccc-call.o \ - syscall.o proton-pack.o idreg-override.o + syscall.o proton-pack.o idreg-override.o patching.o targets += efi-entry.o
arch/arm64/kernel/ftrace.c +1 -0
@@ -15,6 +15,7 @@#include <asm/debug-monitors.h> #include <asm/ftrace.h> #include <asm/insn.h> +#include <asm/patching.h> #ifdef CONFIG_DYNAMIC_FTRACE /*
arch/arm64/kernel/insn.c +3 -146
172 lines not on this page · raw message
arch/arm64/kernel/jump_label.c +1 -0
@@ -8,6 +8,7 @@#include <linux/kernel.h> #include <linux/jump_label.h> #include <asm/insn.h> +#include <asm/patching.h> void arch_jump_label_transform (struct jump_entry *entry,enum jump_label_type type)
arch/arm64/kernel/patching.c new file +148 -0
148 lines not on this page · raw message
arch/arm64/kernel/traps.c +1 -0
@@ -38,6 +38,7 @@#include <asm/extable.h> #include <asm/insn.h> #include <asm/kprobes.h> +#include <asm/patching.h> #include <asm/traps.h> #include <asm/smp.h> #include <asm/stack_pointer.h>
Signature · 1 line
2.25.4
RFC PATCH v2 2/8 arm64: Move aarch32 condition check functions
In reply to Julien ThierryThe functions to check condition flags for aarch32 execution is only used to emulate aarch32 instructions. Move them from the instruction encoding/decoding code to the trap handling files.
--- arch/arm64/include/asm/insn.h | 2 - arch/arm64/include/asm/probes.h | 2 +- arch/arm64/include/asm/traps.h | 3 + arch/arm64/kernel/insn.c | 98 ----------------------- arch/arm64/kernel/probes/simulate-insn.c | 1 + arch/arm64/kernel/traps.c | 99 +++++++++++++++++++++++- 6 files changed, 103 insertions(+), 102 deletions(-)
arch/arm64/include/asm/insn.h +0 -2
@@ -499,8 +499,6 @@ u32 aarch32_insn_extract_reg_num(u32 insn, int offset);u32 aarch32_insn_mcr_extract_opc2 (u32 insn);u32 aarch32_insn_mcr_extract_crm (u32 insn); -typedef bool (pstate_check_t )(unsigned long ); -extern pstate_check_t *const aarch32_opcode_cond_checks[16 ];#endif /* __ASSEMBLY__ */ #endif /* __ASM_INSN_H */
arch/arm64/include/asm/probes.h +1 -1
@@ -7,7 +7,7 @@#ifndef _ARM_PROBES_H#define _ARM_PROBES_H -#include <asm/insn.h> +#include <asm/traps.h> typedef u32 probe_opcode_t ;typedef void (probes_handler_t ) (u32 opcode,long addr,struct pt_regs *);
arch/arm64/include/asm/traps.h +3 -0
@@ -100,4 +100,7 @@ static inline u32 arm64_ras_serror_get_severity(u32 esr)bool arm64_is_fatal_ras_serror (struct pt_regs *regs,unsigned int esr);void __noreturn arm64_serror_panic (struct pt_regs *regs,u32 esr); + +typedef bool (pstate_check_t )(unsigned long ); +extern pstate_check_t *const aarch32_opcode_cond_checks[16 ];#endif
arch/arm64/kernel/insn.c +0 -98
104 lines not on this page · raw message
arch/arm64/kernel/probes/simulate-insn.c +1 -0
@@ -10,6 +10,7 @@#include <linux/kprobes.h> #include <asm/ptrace.h> +#include <asm/traps.h> #include "simulate-insn.h"
arch/arm64/kernel/traps.c +98 -1
111 lines not on this page · raw message
Signature · 1 line
2.25.4
RFC PATCH v2 3/8 arm64: insn: Reduce header dependencies of instruction decoder
In reply to Julien ThierryThe instruction encoder/decoder depends on alternative headers only for single macro definitions that could be part of the instruction decoder.
--- arch/arm64/include/asm/alternative-macros.h | 3 --- arch/arm64/include/asm/insn.h | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-)
arch/arm64/include/asm/alternative-macros.h +0 -3
@@ -6,9 +6,6 @@#define ARM64_CB_PATCH ARM64_NCAPS -/* A64 instructions are always 32 bits. */ -#define AARCH64_INSN_SIZE 4 -#ifndef __ASSEMBLY__#include <linux/stringify.h>
arch/arm64/include/asm/insn.h +2 -1
@@ -10,7 +10,8 @@#include <linux/build_bug.h> #include <linux/types.h> -#include <asm/alternative.h> +/* A64 instructions are always 32 bits. */ +#define AARCH64_INSN_SIZE 4#ifndef __ASSEMBLY__/*
Signature · 1 line
2.25.4
RFC PATCH v2 4/8 arm64: Move instruction encoder/decoder under lib/
In reply to Julien ThierryAarch64 instruction set encoding and decoding logic can prove useful for some features/tools both part of the kernel and outside the kernel.
Isolate the function dealing only with encoding/decoding instructions, with minimal dependency on kernel utilities in order to be able to reuse that code.
Code was only moved, no code should have been added, removed nor modifier.
---
arch/arm64/kernel/Makefile | 2 +-
arch/arm64/lib/Makefile | 6 +++---
arch/arm64/{kernel => lib}/insn.c | 0
3 files changed, 4 insertions(+), 4 deletions(-)
rename arch/arm64/{kernel => lib}/insn.c (100%)arch/arm64/kernel/Makefile +1 -1
@@ -13,7 +13,7 @@ CFLAGS_REMOVE_return_address.o = $(CC_FLAGS_FTRACE) obj-y := debug-monitors.o entry.o irq.o fpsimd.o \ entry-common.o entry-fpsimd.o process.o ptrace.o \ setup.o signal.o sys.o stacktrace.o time.o traps.o \ - io.o vdso.o hyp-stub.o psci.o cpu_ops.o insn.o \ + io.o vdso.o hyp-stub.o psci.o cpu_ops.o \ return_address.o cpuinfo.o cpu_errata.o \ cpufeature.o alternative.o cacheinfo.o \ smp.o smp_spin_table.o topology.o smccc-call.o \
arch/arm64/lib/Makefile +3 -3
@@ -1,9 +1,9 @@ # SPDX-License-Identifier: GPL-2.0 lib-y := clear_user.o delay.o copy_from_user.o \ copy_to_user.o copy_in_user.o copy_page.o \ - clear_page.o csum.o memchr.o memcpy.o memmove.o \ - memset.o memcmp.o strcmp.o strncmp.o strlen.o \ - strnlen.o strchr.o strrchr.o tishift.o + clear_page.o csum.o insn.o memchr.o memcpy.o \ + memmove.o memset.o memcmp.o strcmp.o strncmp.o \ + strlen.o strnlen.o strchr.o strrchr.o tishift.o ifeq ($(CONFIG_KERNEL_MODE_NEON), y) obj-$(CONFIG_XOR_BLOCKS) += xor-neon.o
arch/arm64/lib/insn.c renamed from arch/arm64/kernel/insn.c +0 -0
Signature · 1 line
2.25.4
RFC PATCH v2 5/8 arm64: insn: Add SVE instruction class
In reply to Julien ThierrySVE has been public for some time now. Let the decoder acknowledge its existence.
--- arch/arm64/include/asm/insn.h | 1 + arch/arm64/lib/insn.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
arch/arm64/include/asm/insn.h +1 -0
@@ -31,6 +31,7 @@*/ enum aarch64_insn_encoding_class {AARCH64_INSN_CLS_UNKNOWN ,/* UNALLOCATED */ +AARCH64_INSN_CLS_SVE ,/* SVE instructions */ AARCH64_INSN_CLS_DP_IMM ,/* Data processing - immediate */ AARCH64_INSN_CLS_DP_REG ,/* Data processing - register */ AARCH64_INSN_CLS_DP_FPSIMD ,/* Data processing - SIMD and FP */
arch/arm64/lib/insn.c +1 -1
@@ -23,7 +23,7 @@static const int aarch64_insn_encoding_class[] = {AARCH64_INSN_CLS_UNKNOWN ,AARCH64_INSN_CLS_UNKNOWN , -AARCH64_INSN_CLS_UNKNOWN , +AARCH64_INSN_CLS_SVE ,AARCH64_INSN_CLS_UNKNOWN ,AARCH64_INSN_CLS_LDST ,AARCH64_INSN_CLS_DP_REG ,
Signature · 1 line
2.25.4
RFC PATCH v2 6/8 arm64: insn: Add barrier encodings
In reply to Julien ThierryCreate necessary functions to encode/decode aarch64 barrier instructions.
DSB needs special case handling as it has multiple encodings.
--- arch/arm64/include/asm/insn.h | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
arch/arm64/include/asm/insn.h +22 -0
@@ -370,6 +370,14 @@ __AARCH64_INSN_FUNCS(eret_auth, 0xFFFFFBFF, 0xD69F0BFF) __AARCH64_INSN_FUNCS(mrs, 0xFFF00000, 0xD5300000) __AARCH64_INSN_FUNCS(msr_imm, 0xFFF8F01F, 0xD500401F) __AARCH64_INSN_FUNCS(msr_reg, 0xFFF00000, 0xD5100000) +__AARCH64_INSN_FUNCS(dmb, 0xFFFFF0FF, 0xD50330BF) +__AARCH64_INSN_FUNCS(dsb_base, 0xFFFFF0FF, 0xD503309F) +__AARCH64_INSN_FUNCS(dsb_nxs, 0xFFFFF3FF, 0xD503323F) +__AARCH64_INSN_FUNCS(isb, 0xFFFFF0FF, 0xD50330DF) +__AARCH64_INSN_FUNCS(sb, 0xFFFFFFFF, 0xD50330FF) +__AARCH64_INSN_FUNCS(clrex, 0xFFFFF0FF, 0xD503305F) +__AARCH64_INSN_FUNCS(ssbb, 0xFFFFFFFF, 0xD503309F) +__AARCH64_INSN_FUNCS(pssbb, 0xFFFFFFFF, 0xD503349F)#undef __AARCH64_INSN_FUNCS
@@ -381,6 +389,20 @@ static inline bool aarch64_insn_is_adr_adrp(u32 insn)return aarch64_insn_is_adr (insn) ||aarch64_insn_is_adrp (insn); } +static inline bool aarch64_insn_is_dsb (u32 insn) +{ +return (aarch64_insn_is_dsb_base (insn) && (insn &0xb00 )) || +aarch64_insn_is_dsb_nxs (insn); +} + +static inline bool aarch64_insn_is_barrier (u32 insn) +{ +return aarch64_insn_is_dmb (insn) ||aarch64_insn_is_dsb (insn) || +aarch64_insn_is_isb (insn) ||aarch64_insn_is_sb (insn) || +aarch64_insn_is_clrex (insn) ||aarch64_insn_is_ssbb (insn) || +aarch64_insn_is_pssbb (insn); +} +enum aarch64_insn_encoding_class aarch64_get_insn_class (u32 insn);bool aarch64_insn_uses_literal (u32 insn);bool aarch64_insn_is_branch (u32 insn);
Signature · 1 line
2.25.4
RFC PATCH v2 7/8 arm64: insn: Add some opcodes to instruction decoder
In reply to Julien ThierryAdd decoding capability for some instructions that objtool will need to decode.
--- arch/arm64/include/asm/insn.h | 9 +++++++++ 1 file changed, 9 insertions(+)
arch/arm64/include/asm/insn.h +9 -0
@@ -296,6 +296,12 @@ __AARCH64_INSN_FUNCS(adr, 0x9F000000, 0x10000000) __AARCH64_INSN_FUNCS(adrp, 0x9F000000, 0x90000000) __AARCH64_INSN_FUNCS(prfm, 0x3FC00000, 0x39800000) __AARCH64_INSN_FUNCS(prfm_lit, 0xFF000000, 0xD8000000) +__AARCH64_INSN_FUNCS(store_imm, 0x3FC00000, 0x39000000) +__AARCH64_INSN_FUNCS(load_imm, 0x3FC00000, 0x39400000) +__AARCH64_INSN_FUNCS(store_pre, 0x3FE00C00, 0x38000C00) +__AARCH64_INSN_FUNCS(load_pre, 0x3FE00C00, 0x38400C00) +__AARCH64_INSN_FUNCS(store_post, 0x3FE00C00, 0x38000400) +__AARCH64_INSN_FUNCS(load_post, 0x3FE00C00, 0x38400400) __AARCH64_INSN_FUNCS(str_reg, 0x3FE0EC00, 0x38206800) __AARCH64_INSN_FUNCS(ldadd, 0x3F20FC00, 0x38200000)__AARCH64_INSN_FUNCS (ldr_reg,0x3FE0EC00 ,0x38606800 )
@@ -304,6 +310,8 @@ __AARCH64_INSN_FUNCS(ldrsw_lit, 0xFF000000, 0x98000000) __AARCH64_INSN_FUNCS(exclusive, 0x3F800000, 0x08000000) __AARCH64_INSN_FUNCS(load_ex, 0x3F400000, 0x08400000) __AARCH64_INSN_FUNCS(store_ex, 0x3F400000, 0x08000000) +__AARCH64_INSN_FUNCS(stp, 0x7FC00000, 0x29000000) +__AARCH64_INSN_FUNCS(ldp, 0x7FC00000, 0x29400000) __AARCH64_INSN_FUNCS(stp_post, 0x7FC00000, 0x28800000) __AARCH64_INSN_FUNCS(ldp_post, 0x7FC00000, 0x28C00000)__AARCH64_INSN_FUNCS (stp_pre,0x7FC00000 ,0x29800000 )
@@ -336,6 +344,7 @@ __AARCH64_INSN_FUNCS(rev64, 0x7FFFFC00, 0x5AC00C00) __AARCH64_INSN_FUNCS(and, 0x7F200000, 0x0A000000) __AARCH64_INSN_FUNCS(bic, 0x7F200000, 0x0A200000) __AARCH64_INSN_FUNCS(orr, 0x7F200000, 0x2A000000) +__AARCH64_INSN_FUNCS(mov_reg, 0x7FE0FFE0, 0x2A0003E0) __AARCH64_INSN_FUNCS(orn, 0x7F200000, 0x2A200000) __AARCH64_INSN_FUNCS(eor, 0x7F200000, 0x4A000000)__AARCH64_INSN_FUNCS (eon,0x7F200000 ,0x4A200000 )
Signature · 1 line
2.25.4
RFC PATCH v2 8/8 arm64: insn: Add load/store decoding helpers
In reply to Julien ThierryProvide some function to group different load/store instructions.
--- arch/arm64/include/asm/insn.h | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)
arch/arm64/include/asm/insn.h +28 -0
@@ -412,6 +412,34 @@ static inline bool aarch64_insn_is_barrier(u32 insn)aarch64_insn_is_pssbb (insn); } +static inline bool aarch64_insn_is_store_single (u32 insn) +{ +return aarch64_insn_is_store_imm (insn) || +aarch64_insn_is_store_pre (insn) || +aarch64_insn_is_store_post (insn); +} + +static inline bool aarch64_insn_is_store_pair (u32 insn) +{ +return aarch64_insn_is_stp (insn) || +aarch64_insn_is_stp_pre (insn) || +aarch64_insn_is_stp_post (insn); +} + +static inline bool aarch64_insn_is_load_single (u32 insn) +{ +return aarch64_insn_is_load_imm (insn) || +aarch64_insn_is_load_pre (insn) || +aarch64_insn_is_load_post (insn); +} + +static inline bool aarch64_insn_is_load_pair (u32 insn) +{ +return aarch64_insn_is_ldp (insn) || +aarch64_insn_is_ldp_pre (insn) || +aarch64_insn_is_ldp_post (insn); +} +enum aarch64_insn_encoding_class aarch64_get_insn_class (u32 insn);bool aarch64_insn_uses_literal (u32 insn);bool aarch64_insn_is_branch (u32 insn);
Signature · 1 line
2.25.4