Patch "ARM: net: bpf: avoid 'bx' instruction on non-Thumb capable CPUs" has been added to the 4.14-stable tree
Subsystems (4)
This is a note to let you know that I've just added the patch titled
ARM: net: bpf: avoid 'bx' instruction on non-Thumb capable CPUs
to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
arm-net-bpf-avoid-bx-instruction-on-non-thumb-capable-cpus.patch
and it can be found in the queue-4.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
e9062481824384f00299971f923fecf6b3668001Mon Sep 17 00:00:00 2001
From: Russell King <[email protected]>
Date: Sat, 13 Jan 2018 11:35:15 +0000
Subject: ARM: net: bpf: avoid 'bx' instruction on non-Thumb capable CPUs
From: Russell King <[email protected]>
commit e9062481824384f00299971f923fecf6b3668001 upstream.
Avoid the 'bx' instruction on CPUs that have no support for Thumb and thus do not implement this instruction by moving the generation of this opcode to a separate function that selects between:
bx reg
and
mov pc, reg
according to the capabilities of the CPU.
--- arch/arm/net/bpf_jit_32.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)
arch/arm/net/bpf_jit_32.c +11 -7
@@ -285,16 +285,20 @@ static inline void emit_mov_i(const u8 remit_mov_i_no8m (rd, val, ctx); } -static inline void emit_blx_r (u8 tgt_reg,struct jit_ctx *ctx) +static void emit_bx_r (u8 tgt_reg,struct jit_ctx *ctx) { - ctx->seen |=SEEN_CALL ; -#if __LINUX_ARM_ARCH__ <5 -emit (ARM_MOV_R (ARM_LR ,ARM_PC ), ctx); -if (elf_hwcap &HWCAP_THUMB )emit (ARM_BX (tgt_reg), ctx);else emit (ARM_MOV_R (ARM_PC , tgt_reg), ctx); +} + +static inline void emit_blx_r (u8 tgt_reg,struct jit_ctx *ctx) +{ + ctx->seen |=SEEN_CALL ; +#if __LINUX_ARM_ARCH__ <5 +emit (ARM_MOV_R (ARM_LR ,ARM_PC ), ctx); +emit_bx_r (tgt_reg, ctx);#else emit (ARM_BLX_R (tgt_reg), ctx);#endif
@@ -997,7 +1001,7 @@ static int emit_bpf_tail_call(struct jitemit_a32_mov_i (tmp2[1 ], off, false, ctx);emit (ARM_LDR_R (tmp[1 ], tmp[1 ], tmp2[1 ]), ctx);emit (ARM_ADD_I (tmp[1 ], tmp[1 ], ctx->prologue_bytes), ctx); -emit (ARM_BX (tmp[1 ]), ctx); +emit_bx_r (tmp[1 ], ctx);/* out: */ if (out_offset ==-1 )
@@ -1166,7 +1170,7 @@ static void build_epilogue(struct jit_ctemit (ARM_POP (reg_set), ctx);/* Return back to the callee function */ if (!(ctx->seen &SEEN_CALL )) -emit (ARM_BX (ARM_LR ), ctx); +emit_bx_r (ARM_LR , ctx);#endif }
Patches currently in stable-queue which might be from [email protected] are
queue-4.14/arm-net-bpf-fix-stack-alignment.patch queue-4.14/arm-net-bpf-fix-ldx-instructions.patch queue-4.14/arm-net-bpf-fix-register-saving.patch queue-4.14/arm-net-bpf-move-stack-documentation.patch queue-4.14/arm-net-bpf-correct-stack-layout-documentation.patch queue-4.14/arm-net-bpf-clarify-tail_call-index.patch queue-4.14/arm-net-bpf-avoid-bx-instruction-on-non-thumb-capable-cpus.patch queue-4.14/arm-net-bpf-fix-tail-call-jumps.patch