Skip to content

Commit 521bd39

Browse files
hbathinimaddy-kerneldev
authored andcommitted
powerpc64/bpf: do not increment tailcall count when prog is NULL
Do not increment tailcall count, if tailcall did not succeed due to missing BPF program. Fixes: ce07614 ("powerpc/bpf: Implement support for tail calls") Cc: stable@vger.kernel.org Tested-by: Venkat Rao Bagalkote <venkat88@linux.ibm.com> Signed-off-by: Hari Bathini <hbathini@linux.ibm.com> Signed-off-by: Madhavan Srinivasan <maddy@linux.ibm.com> Link: https://patch.msgid.link/20260303181031.390073-2-hbathini@linux.ibm.com
1 parent db54c28 commit 521bd39

1 file changed

Lines changed: 21 additions & 18 deletions

File tree

arch/powerpc/net/bpf_jit_comp64.c

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -522,9 +522,30 @@ static int bpf_jit_emit_tail_call(u32 *image, struct codegen_context *ctx, u32 o
522522

523523
/*
524524
* tail_call_info++; <- Actual value of tcc here
525+
* Writeback this updated value only if tailcall succeeds.
525526
*/
526527
EMIT(PPC_RAW_ADDI(bpf_to_ppc(TMP_REG_1), bpf_to_ppc(TMP_REG_1), 1));
527528

529+
/* prog = array->ptrs[index]; */
530+
EMIT(PPC_RAW_MULI(bpf_to_ppc(TMP_REG_2), b2p_index, 8));
531+
EMIT(PPC_RAW_ADD(bpf_to_ppc(TMP_REG_2), bpf_to_ppc(TMP_REG_2), b2p_bpf_array));
532+
EMIT(PPC_RAW_LD(bpf_to_ppc(TMP_REG_2), bpf_to_ppc(TMP_REG_2),
533+
offsetof(struct bpf_array, ptrs)));
534+
535+
/*
536+
* if (prog == NULL)
537+
* goto out;
538+
*/
539+
EMIT(PPC_RAW_CMPLDI(bpf_to_ppc(TMP_REG_2), 0));
540+
PPC_BCC_SHORT(COND_EQ, out);
541+
542+
/* goto *(prog->bpf_func + prologue_size); */
543+
EMIT(PPC_RAW_LD(bpf_to_ppc(TMP_REG_2), bpf_to_ppc(TMP_REG_2),
544+
offsetof(struct bpf_prog, bpf_func)));
545+
EMIT(PPC_RAW_ADDI(bpf_to_ppc(TMP_REG_2), bpf_to_ppc(TMP_REG_2),
546+
FUNCTION_DESCR_SIZE + bpf_tailcall_prologue_size));
547+
EMIT(PPC_RAW_MTCTR(bpf_to_ppc(TMP_REG_2)));
548+
528549
/*
529550
* Before writing updated tail_call_info, distinguish if current frame
530551
* is storing a reference to tail_call_info or actual tcc value in
@@ -539,24 +560,6 @@ static int bpf_jit_emit_tail_call(u32 *image, struct codegen_context *ctx, u32 o
539560
/* Writeback updated value to tail_call_info */
540561
EMIT(PPC_RAW_STD(bpf_to_ppc(TMP_REG_1), bpf_to_ppc(TMP_REG_2), 0));
541562

542-
/* prog = array->ptrs[index]; */
543-
EMIT(PPC_RAW_MULI(bpf_to_ppc(TMP_REG_1), b2p_index, 8));
544-
EMIT(PPC_RAW_ADD(bpf_to_ppc(TMP_REG_1), bpf_to_ppc(TMP_REG_1), b2p_bpf_array));
545-
EMIT(PPC_RAW_LD(bpf_to_ppc(TMP_REG_1), bpf_to_ppc(TMP_REG_1), offsetof(struct bpf_array, ptrs)));
546-
547-
/*
548-
* if (prog == NULL)
549-
* goto out;
550-
*/
551-
EMIT(PPC_RAW_CMPLDI(bpf_to_ppc(TMP_REG_1), 0));
552-
PPC_BCC_SHORT(COND_EQ, out);
553-
554-
/* goto *(prog->bpf_func + prologue_size); */
555-
EMIT(PPC_RAW_LD(bpf_to_ppc(TMP_REG_1), bpf_to_ppc(TMP_REG_1), offsetof(struct bpf_prog, bpf_func)));
556-
EMIT(PPC_RAW_ADDI(bpf_to_ppc(TMP_REG_1), bpf_to_ppc(TMP_REG_1),
557-
FUNCTION_DESCR_SIZE + bpf_tailcall_prologue_size));
558-
EMIT(PPC_RAW_MTCTR(bpf_to_ppc(TMP_REG_1)));
559-
560563
/* tear down stack, restore NVRs, ... */
561564
bpf_jit_emit_common_epilogue(image, ctx);
562565

0 commit comments

Comments
 (0)