Commit ba49f976 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Daniel Borkmann
Browse files

bpf: Hide unused bpf_patch_call_args 



This function is only used when CONFIG_BPF_JIT_ALWAYS_ON is disabled, but
CONFIG_BPF_SYSCALL is enabled. When both are turned off, the prototype is
missing but the unused function is still compiled, as seen from this W=1
warning:

  [...]
  kernel/bpf/core.c:2075:6: error: no previous prototype for 'bpf_patch_call_args' [-Werror=missing-prototypes]
  [...]

Add a matching #ifdef for the definition to leave it out.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarYonghong Song <yhs@fb.com>
Link: https://lore.kernel.org/bpf/20230602135128.1498362-1-arnd@kernel.org
parent b23ed4d7

kernel/bpf/core.c

+5 −3
Original line number Diff line number Diff line
@@ -2064,7 +2064,8 @@ EVAL4(PROG_NAME_LIST, 416, 448, 480, 512) 
};

#undef PROG_NAME_LIST

#define PROG_NAME_LIST(stack_size) PROG_NAME_ARGS(stack_size),

static u64 (*interpreters_args[])(u64 r1, u64 r2, u64 r3, u64 r4, u64 r5,

static __maybe_unused

u64 (*interpreters_args[])(u64 r1, u64 r2, u64 r3, u64 r4, u64 r5,

			   const struct bpf_insn *insn) = {

EVAL6(PROG_NAME_LIST, 32, 64, 96, 128, 160, 192)

EVAL6(PROG_NAME_LIST, 224, 256, 288, 320, 352, 384)
@@ -2072,6 +2073,7 @@ EVAL4(PROG_NAME_LIST, 416, 448, 480, 512) 
};

#undef PROG_NAME_LIST



#ifdef CONFIG_BPF_SYSCALL

void bpf_patch_call_args(struct bpf_insn *insn, u32 stack_depth)

{

	stack_depth = max_t(u32, stack_depth, 1);
@@ -2080,7 +2082,7 @@ void bpf_patch_call_args(struct bpf_insn *insn, u32 stack_depth) 
		__bpf_call_base_args;

	insn->code = BPF_JMP | BPF_CALL_ARGS;

}



#endif

#else

static unsigned int __bpf_prog_ret0_warn(const void *ctx,

					 const struct bpf_insn *insn)