arm64: insn: always inline predicates

We have a number of aarch64_insn_*() predicates which are used in code
which is not instrumentation safe (e.g. alternatives patching, kprobes).
Some of those are marked with __kprobes, but most are not, and are
implemented out-of-line in insn.c.

This patch moves the predicates to insn.h and marks them with
__always_inline. This is ensures that they will respect the
instrumentation requirements of their caller which they will be inlined
into.

At the same time, I've formatted each of the functions consistently as a
list, to make them easier to read and update in future.

Other than preventing unwanted instrumentation, there should be no
functional change as a result of this patch.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Joey Gouly <joey.gouly@arm.com>
Cc: Will Deacon <will@kernel.org>
Reviewed-by: Joey Gouly <joey.gouly@arm.com>
Link: https://lore.kernel.org/r/20221114135928.3000571-3-mark.rutland@arm.com
Signed-off-by: Will Deacon <will@kernel.org>

diff --git a/arch/arm64/include/asm/insn.h b/arch/arm64/include/asm/insn.h
index 03f60234e60a1ecb0db56cdf15ec9b4821c88478..de5bc71b4b1dc4d87f884d770b31fda5a190b638 100644 (file)
--- a/arch/arm64/include/asm/insn.h
+++ b/arch/arm64/include/asm/insn.h
@@ -431,58 +431,122 @@ __AARCH64_INSN_FUNCS(pssbb,      0xFFFFFFFF, 0xD503349F)
 
 #undef __AARCH64_INSN_FUNCS
 
-bool aarch64_insn_is_steppable_hint(u32 insn);
-bool aarch64_insn_is_branch_imm(u32 insn);
+static __always_inline bool aarch64_insn_is_steppable_hint(u32 insn)
+{
+       if (!aarch64_insn_is_hint(insn))
+               return false;
+
+       switch (insn & 0xFE0) {
+       case AARCH64_INSN_HINT_XPACLRI:
+       case AARCH64_INSN_HINT_PACIA_1716:
+       case AARCH64_INSN_HINT_PACIB_1716:
+       case AARCH64_INSN_HINT_PACIAZ:
+       case AARCH64_INSN_HINT_PACIASP:
+       case AARCH64_INSN_HINT_PACIBZ:
+       case AARCH64_INSN_HINT_PACIBSP:
+       case AARCH64_INSN_HINT_BTI:
+       case AARCH64_INSN_HINT_BTIC:
+       case AARCH64_INSN_HINT_BTIJ:
+       case AARCH64_INSN_HINT_BTIJC:
+       case AARCH64_INSN_HINT_NOP:
+               return true;
+       default:
+               return false;
+       }
+}
+
+static __always_inline bool aarch64_insn_is_branch(u32 insn)
+{
+       /* b, bl, cb*, tb*, ret*, b.cond, br*, blr* */
+
+       return aarch64_insn_is_b(insn) ||
+              aarch64_insn_is_bl(insn) ||
+              aarch64_insn_is_cbz(insn) ||
+              aarch64_insn_is_cbnz(insn) ||
+              aarch64_insn_is_tbz(insn) ||
+              aarch64_insn_is_tbnz(insn) ||
+              aarch64_insn_is_ret(insn) ||
+              aarch64_insn_is_ret_auth(insn) ||
+              aarch64_insn_is_br(insn) ||
+              aarch64_insn_is_br_auth(insn) ||
+              aarch64_insn_is_blr(insn) ||
+              aarch64_insn_is_blr_auth(insn) ||
+              aarch64_insn_is_bcond(insn);
+}
+
+static __always_inline bool aarch64_insn_is_branch_imm(u32 insn)
+{
+       return aarch64_insn_is_b(insn) ||
+              aarch64_insn_is_bl(insn) ||
+              aarch64_insn_is_tbz(insn) ||
+              aarch64_insn_is_tbnz(insn) ||
+              aarch64_insn_is_cbz(insn) ||
+              aarch64_insn_is_cbnz(insn) ||
+              aarch64_insn_is_bcond(insn);
+}
 
-static inline bool aarch64_insn_is_adr_adrp(u32 insn)
+static __always_inline bool aarch64_insn_is_adr_adrp(u32 insn)
 {
-       return aarch64_insn_is_adr(insn) || aarch64_insn_is_adrp(insn);
+       return aarch64_insn_is_adr(insn) ||
+              aarch64_insn_is_adrp(insn);
 }
 
-static inline bool aarch64_insn_is_dsb(u32 insn)
+static __always_inline bool aarch64_insn_is_dsb(u32 insn)
 {
-       return aarch64_insn_is_dsb_base(insn) || aarch64_insn_is_dsb_nxs(insn);
+       return aarch64_insn_is_dsb_base(insn) ||
+              aarch64_insn_is_dsb_nxs(insn);
 }
 
-static inline bool aarch64_insn_is_barrier(u32 insn)
+static __always_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) ||
+       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);
 }
 
-static inline bool aarch64_insn_is_store_single(u32 insn)
+static __always_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)
+static __always_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)
+static __always_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)
+static __always_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);
 }
 
+static __always_inline bool aarch64_insn_uses_literal(u32 insn)
+{
+       /* ldr/ldrsw (literal), prfm */
+
+       return aarch64_insn_is_ldr_lit(insn) ||
+              aarch64_insn_is_ldrsw_lit(insn) ||
+              aarch64_insn_is_adr_adrp(insn) ||
+              aarch64_insn_is_prfm_lit(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);
 u64 aarch64_insn_decode_immediate(enum aarch64_insn_imm_type type, u32 insn);
 u32 aarch64_insn_encode_immediate(enum aarch64_insn_imm_type type,
                                  u32 insn, u64 imm);

diff --git a/arch/arm64/lib/insn.c b/arch/arm64/lib/insn.c
index ac0df03fffcdd248f6ec3fad2693a0b6ae17c618..67c1be804cc3aa7f3f2908dbf96e738b32291339 100644 (file)
--- a/arch/arm64/lib/insn.c
+++ b/arch/arm64/lib/insn.c
@@ -44,67 +44,6 @@ enum aarch64_insn_encoding_class __kprobes aarch64_get_insn_class(u32 insn)
        return aarch64_insn_encoding_class[(insn >> 25) & 0xf];
 }
 
-bool __kprobes aarch64_insn_is_steppable_hint(u32 insn)
-{
-       if (!aarch64_insn_is_hint(insn))
-               return false;
-
-       switch (insn & 0xFE0) {
-       case AARCH64_INSN_HINT_XPACLRI:
-       case AARCH64_INSN_HINT_PACIA_1716:
-       case AARCH64_INSN_HINT_PACIB_1716:
-       case AARCH64_INSN_HINT_PACIAZ:
-       case AARCH64_INSN_HINT_PACIASP:
-       case AARCH64_INSN_HINT_PACIBZ:
-       case AARCH64_INSN_HINT_PACIBSP:
-       case AARCH64_INSN_HINT_BTI:
-       case AARCH64_INSN_HINT_BTIC:
-       case AARCH64_INSN_HINT_BTIJ:
-       case AARCH64_INSN_HINT_BTIJC:
-       case AARCH64_INSN_HINT_NOP:
-               return true;
-       default:
-               return false;
-       }
-}
-
-bool aarch64_insn_is_branch_imm(u32 insn)
-{
-       return (aarch64_insn_is_b(insn) || aarch64_insn_is_bl(insn) ||
-               aarch64_insn_is_tbz(insn) || aarch64_insn_is_tbnz(insn) ||
-               aarch64_insn_is_cbz(insn) || aarch64_insn_is_cbnz(insn) ||
-               aarch64_insn_is_bcond(insn));
-}
-
-bool __kprobes aarch64_insn_uses_literal(u32 insn)
-{
-       /* ldr/ldrsw (literal), prfm */
-
-       return aarch64_insn_is_ldr_lit(insn) ||
-               aarch64_insn_is_ldrsw_lit(insn) ||
-               aarch64_insn_is_adr_adrp(insn) ||
-               aarch64_insn_is_prfm_lit(insn);
-}
-
-bool __kprobes aarch64_insn_is_branch(u32 insn)
-{
-       /* b, bl, cb*, tb*, ret*, b.cond, br*, blr* */
-
-       return aarch64_insn_is_b(insn) ||
-               aarch64_insn_is_bl(insn) ||
-               aarch64_insn_is_cbz(insn) ||
-               aarch64_insn_is_cbnz(insn) ||
-               aarch64_insn_is_tbz(insn) ||
-               aarch64_insn_is_tbnz(insn) ||
-               aarch64_insn_is_ret(insn) ||
-               aarch64_insn_is_ret_auth(insn) ||
-               aarch64_insn_is_br(insn) ||
-               aarch64_insn_is_br_auth(insn) ||
-               aarch64_insn_is_blr(insn) ||
-               aarch64_insn_is_blr_auth(insn) ||
-               aarch64_insn_is_bcond(insn);
-}
-
 static int __kprobes aarch64_get_imm_shift_mask(enum aarch64_insn_imm_type type,
                                                u32 *maskp, int *shiftp)
 {