Commit 8033c6c2 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by Alexei Starovoitov
Browse files

bpf: remove unused static inlines 



Remove two dead stubs, sk_msg_clear_meta() was never
used, use of xskq_cons_is_full() got replaced by
xsk_tx_writeable() in v5.10.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Link: https://lore.kernel.org/r/20220126185412.2776254-1-kuba@kernel.org


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

include/linux/bpf.h

+0 −10
Original line number Diff line number Diff line
@@ -1875,11 +1875,6 @@ static inline int bpf_obj_get_user(const char __user *pathname, int flags) 
	return -EOPNOTSUPP;

}



static inline bool dev_map_can_have_prog(struct bpf_map *map)

{

	return false;

}



static inline void __dev_flush(void)

{

}
@@ -1943,11 +1938,6 @@ static inline int cpu_map_generic_redirect(struct bpf_cpu_map_entry *rcpu, 
	return -EOPNOTSUPP;

}



static inline bool cpu_map_prog_allowed(struct bpf_map *map)

{

	return false;

}



static inline struct bpf_prog *bpf_prog_get_type_path(const char *name,

				enum bpf_prog_type type)

{

include/linux/skmsg.h

+0 −5
Original line number Diff line number Diff line
@@ -171,11 +171,6 @@ static inline u32 sk_msg_iter_dist(u32 start, u32 end) 
#define sk_msg_iter_next(msg, which)			\

	sk_msg_iter_var_next(msg->sg.which)



static inline void sk_msg_clear_meta(struct sk_msg *msg)

{

	memset(&msg->sg, 0, offsetofend(struct sk_msg_sg, copy));

}



static inline void sk_msg_init(struct sk_msg *msg)

{

	BUILD_BUG_ON(ARRAY_SIZE(msg->sg.data) - 1 != NR_MSG_FRAG_IDS);

net/xdp/xsk_queue.h

+0 −7
Original line number Diff line number Diff line
@@ -304,13 +304,6 @@ static inline void xskq_cons_release_n(struct xsk_queue *q, u32 cnt) 
	q->cached_cons += cnt;

}



static inline bool xskq_cons_is_full(struct xsk_queue *q)

{

	/* No barriers needed since data is not accessed */

	return READ_ONCE(q->ring->producer) - READ_ONCE(q->ring->consumer) ==

		q->nentries;

}



static inline u32 xskq_cons_present_entries(struct xsk_queue *q)

{

	/* No barriers needed since data is not accessed */