Commit ab224b9e authored by Rafael Passos's avatar Rafael Passos Committed by Alexei Starovoitov
Browse files

bpf: remove unused parameter in __bpf_free_used_btfs 



Fixes a compiler warning. The __bpf_free_used_btfs function
was taking an extra unused struct bpf_prog_aux *aux param

Signed-off-by: default avatarRafael Passos <rafael@rcpassos.me>
Link: https://lore.kernel.org/r/20240615022641.210320-3-rafael@rcpassos.me


Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent 9919c5c9

include/linux/bpf.h

+1 −2
Original line number Diff line number Diff line
@@ -2933,8 +2933,7 @@ bpf_probe_read_kernel_common(void *dst, u32 size, const void *unsafe_ptr) 
	return ret;

}



void __bpf_free_used_btfs(struct bpf_prog_aux *aux,

			  struct btf_mod_pair *used_btfs, u32 len);

void __bpf_free_used_btfs(struct btf_mod_pair *used_btfs, u32 len);



static inline struct bpf_prog *bpf_prog_get_type(u32 ufd,

						 enum bpf_prog_type type)

kernel/bpf/core.c

+2 −3
Original line number Diff line number Diff line
@@ -2742,8 +2742,7 @@ static void bpf_free_used_maps(struct bpf_prog_aux *aux) 
	kfree(aux->used_maps);

}



void __bpf_free_used_btfs(struct bpf_prog_aux *aux,

			  struct btf_mod_pair *used_btfs, u32 len)

void __bpf_free_used_btfs(struct btf_mod_pair *used_btfs, u32 len)

{

#ifdef CONFIG_BPF_SYSCALL

	struct btf_mod_pair *btf_mod;
@@ -2760,7 +2759,7 @@ void __bpf_free_used_btfs(struct bpf_prog_aux *aux, 


static void bpf_free_used_btfs(struct bpf_prog_aux *aux)

{

	__bpf_free_used_btfs(aux, aux->used_btfs, aux->used_btf_cnt);

	__bpf_free_used_btfs(aux->used_btfs, aux->used_btf_cnt);

	kfree(aux->used_btfs);

}

kernel/bpf/verifier.c

+1 −2
Original line number Diff line number Diff line
@@ -18694,8 +18694,7 @@ static void release_maps(struct bpf_verifier_env *env) 
/* drop refcnt of maps used by the rejected program */

static void release_btfs(struct bpf_verifier_env *env)

{

	__bpf_free_used_btfs(env->prog->aux, env->used_btfs,

			     env->used_btf_cnt);

	__bpf_free_used_btfs(env->used_btfs, env->used_btf_cnt);

}









/* convert pseudo BPF_LD_IMM64 into generic BPF_LD_IMM64 */