[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20220126185412.2776254-1-kuba@kernel.org>
Date: Wed, 26 Jan 2022 10:54:12 -0800
From: Jakub Kicinski <kuba@...nel.org>
To: daniel@...earbox.net, ast@...nel.org
Cc: netdev@...r.kernel.org, Jakub Kicinski <kuba@...nel.org>,
andrii@...nel.org, kafai@...com, songliubraving@...com, yhs@...com,
john.fastabend@...il.com, kpsingh@...nel.org, jakub@...udflare.com,
lmb@...udflare.com, bjorn@...nel.org, magnus.karlsson@...el.com,
jonathan.lemon@...il.com, hawk@...nel.org, bpf@...r.kernel.org
Subject: [PATCH bpf-next] 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: Jakub Kicinski <kuba@...nel.org>
---
CC: ast@...nel.org
CC: daniel@...earbox.net
CC: andrii@...nel.org
CC: kafai@...com
CC: songliubraving@...com
CC: yhs@...com
CC: john.fastabend@...il.com
CC: kpsingh@...nel.org
CC: jakub@...udflare.com
CC: lmb@...udflare.com
CC: bjorn@...nel.org
CC: magnus.karlsson@...el.com
CC: jonathan.lemon@...il.com
CC: hawk@...nel.org
CC: bpf@...r.kernel.org
---
include/linux/bpf.h | 10 ----------
include/linux/skmsg.h | 5 -----
net/xdp/xsk_queue.h | 7 -------
3 files changed, 22 deletions(-)
diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index 8c92c974bd12..652b29763423 100644
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@ -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)
{
diff --git a/include/linux/skmsg.h b/include/linux/skmsg.h
index 18a717fe62eb..ddde5f620901 100644
--- a/include/linux/skmsg.h
+++ b/include/linux/skmsg.h
@@ -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);
diff --git a/net/xdp/xsk_queue.h b/net/xdp/xsk_queue.h
index e9aa2c236356..79be3e53ddf1 100644
--- a/net/xdp/xsk_queue.h
+++ b/net/xdp/xsk_queue.h
@@ -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 */
--
2.34.1
Powered by blists - more mailing lists