Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 479321e9 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by Daniel Borkmann
Browse files

bpf: turn bpf_prog_get_type() into a wrapper 



bpf_prog_get_type() is identical to bpf_prog_get_type_dev(),
with false passed as attach_drv.  Instead of keeping it as
an exported symbol turn it into static inline wrapper.

Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: default avatarQuentin Monnet <quentin.monnet@netronome.com>
Acked-by: default avatarAlexei Starovoitov <ast@kernel.org>
Acked-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent 441a3303

include/linux/bpf.h

+6 −7
Original line number Diff line number Diff line
@@ -334,7 +334,6 @@ extern const struct bpf_verifier_ops tc_cls_act_analyzer_ops; 
extern const struct bpf_verifier_ops xdp_analyzer_ops;



struct bpf_prog *bpf_prog_get(u32 ufd);

struct bpf_prog *bpf_prog_get_type(u32 ufd, enum bpf_prog_type type);

struct bpf_prog *bpf_prog_get_type_dev(u32 ufd, enum bpf_prog_type type,

				       bool attach_drv);

struct bpf_prog * __must_check bpf_prog_add(struct bpf_prog *prog, int i);
@@ -425,12 +424,6 @@ static inline struct bpf_prog *bpf_prog_get(u32 ufd) 
	return ERR_PTR(-EOPNOTSUPP);

}



static inline struct bpf_prog *bpf_prog_get_type(u32 ufd,

						 enum bpf_prog_type type)

{

	return ERR_PTR(-EOPNOTSUPP);

}



static inline struct bpf_prog *bpf_prog_get_type_dev(u32 ufd,

						     enum bpf_prog_type type,

						     bool attach_drv)
@@ -514,6 +507,12 @@ static inline int cpu_map_enqueue(struct bpf_cpu_map_entry *rcpu, 
}

#endif /* CONFIG_BPF_SYSCALL */



static inline struct bpf_prog *bpf_prog_get_type(u32 ufd,

						 enum bpf_prog_type type)

{

	return bpf_prog_get_type_dev(ufd, type, false);

}



int bpf_prog_offload_compile(struct bpf_prog *prog);

void bpf_prog_offload_destroy(struct bpf_prog *prog);

u32 bpf_prog_offload_ifindex(struct bpf_prog *prog);

kernel/bpf/syscall.c

+0 −10
Original line number Diff line number Diff line
@@ -1097,16 +1097,6 @@ struct bpf_prog *bpf_prog_get(u32 ufd) 
	return __bpf_prog_get(ufd, NULL, false);

}



struct bpf_prog *bpf_prog_get_type(u32 ufd, enum bpf_prog_type type)

{

	struct bpf_prog *prog = __bpf_prog_get(ufd, &type, false);



	if (!IS_ERR(prog))

		trace_bpf_prog_get_type(prog);

	return prog;

}

EXPORT_SYMBOL_GPL(bpf_prog_get_type);



struct bpf_prog *bpf_prog_get_type_dev(u32 ufd, enum bpf_prog_type type,

				       bool attach_drv)

{