Skip to content

Commit 7be86d6

Browse files
puranjaymohanKernel Patches Daemon
authored and
Kernel Patches Daemon
committed
bpf, arm64: inline bpf_get_smp_processor_id() helper
Inline calls to bpf_get_smp_processor_id() helper in the JIT by emitting a read from struct thread_info. The SP_EL0 system register holds the pointer to the task_struct and thread_info is the first member of this struct. We can read the cpu number from the thread_info. Here is how the ARM64 JITed assembly changes after this commit: ARM64 JIT =========== BEFORE AFTER -------- ------- int cpu = bpf_get_smp_processor_id(); int cpu = bpf_get_smp_processor_id(); mov x10, #0xfffffffffffff4d0 mrs x10, sp_el0 movk x10, #0x802b, lsl #16 ldr w7, [x10, #24] movk x10, #0x8000, lsl #32 blr x10 add x7, x0, #0x0 Performance improvement using benchmark[1] ./benchs/run_bench_trigger.sh glob-arr-inc arr-inc hash-inc +---------------+-------------------+-------------------+--------------+ | Name | Before | After | % change | |---------------+-------------------+-------------------+--------------| | glob-arr-inc | 23.380 ± 1.675M/s | 25.893 ± 0.026M/s | + 10.74% | | arr-inc | 23.928 ± 0.034M/s | 25.213 ± 0.063M/s | + 5.37% | | hash-inc | 12.352 ± 0.005M/s | 12.609 ± 0.013M/s | + 2.08% | +---------------+-------------------+-------------------+--------------+ [1] anakryiko/linux@8dec900975ef Signed-off-by: Puranjay Mohan <[email protected]> Acked-by: Andrii Nakryiko <[email protected]>
1 parent db67827 commit 7be86d6

File tree

3 files changed

+28
-0
lines changed

3 files changed

+28
-0
lines changed

arch/arm64/include/asm/insn.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ enum aarch64_insn_special_register {
138138
enum aarch64_insn_system_register {
139139
AARCH64_INSN_SYSREG_TPIDR_EL1 = 0x4684,
140140
AARCH64_INSN_SYSREG_TPIDR_EL2 = 0x6682,
141+
AARCH64_INSN_SYSREG_SP_EL0 = 0x4208,
141142
};
142143

143144
enum aarch64_insn_variant {

arch/arm64/net/bpf_jit.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -302,5 +302,7 @@
302302
aarch64_insn_gen_mrs(Rt, AARCH64_INSN_SYSREG_TPIDR_EL1)
303303
#define A64_MRS_TPIDR_EL2(Rt) \
304304
aarch64_insn_gen_mrs(Rt, AARCH64_INSN_SYSREG_TPIDR_EL2)
305+
#define A64_MRS_SP_EL0(Rt) \
306+
aarch64_insn_gen_mrs(Rt, AARCH64_INSN_SYSREG_SP_EL0)
305307

306308
#endif /* _BPF_JIT_H */

arch/arm64/net/bpf_jit_comp.c

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1228,6 +1228,21 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx,
12281228
const u8 r0 = bpf2a64[BPF_REG_0];
12291229
bool func_addr_fixed;
12301230
u64 func_addr;
1231+
u32 cpu_offset;
1232+
1233+
/* Implement helper call to bpf_get_smp_processor_id() inline */
1234+
if (insn->src_reg == 0 && insn->imm == BPF_FUNC_get_smp_processor_id) {
1235+
cpu_offset = offsetof(struct thread_info, cpu);
1236+
1237+
emit(A64_MRS_SP_EL0(tmp), ctx);
1238+
if (is_lsi_offset(cpu_offset, 2)) {
1239+
emit(A64_LDR32I(r0, tmp, cpu_offset), ctx);
1240+
} else {
1241+
emit_a64_mov_i(1, tmp2, cpu_offset, ctx);
1242+
emit(A64_LDR32(r0, tmp, tmp2), ctx);
1243+
}
1244+
break;
1245+
}
12311246

12321247
ret = bpf_jit_get_func_addr(ctx->prog, insn, extra_pass,
12331248
&func_addr, &func_addr_fixed);
@@ -2573,6 +2588,16 @@ bool bpf_jit_supports_percpu_insn(void)
25732588
return true;
25742589
}
25752590

2591+
bool bpf_jit_inlines_helper_call(s32 imm)
2592+
{
2593+
switch (imm) {
2594+
case BPF_FUNC_get_smp_processor_id:
2595+
return true;
2596+
default:
2597+
return false;
2598+
}
2599+
}
2600+
25762601
void bpf_jit_free(struct bpf_prog *prog)
25772602
{
25782603
if (prog->jited) {

0 commit comments

Comments
 (0)