| From 83cff927615e38180967710de974e540a8d0ab44 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 27 Jan 2021 14:15:01 -0800 |
| Subject: skmsg: Make sk_psock_destroy() static |
| |
| From: Cong Wang <cong.wang@bytedance.com> |
| |
| [ Upstream commit 8063e184e49011f6f3f34f6c358dc8a83890bb5b ] |
| |
| sk_psock_destroy() is a RCU callback, I can't see any reason why |
| it could be used outside. |
| |
| Signed-off-by: Cong Wang <cong.wang@bytedance.com> |
| Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> |
| Cc: John Fastabend <john.fastabend@gmail.com> |
| Cc: Jakub Sitnicki <jakub@cloudflare.com> |
| Cc: Lorenz Bauer <lmb@cloudflare.com> |
| Link: https://lore.kernel.org/bpf/20210127221501.46866-1-xiyou.wangcong@gmail.com |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| include/linux/skmsg.h | 1 - |
| net/core/skmsg.c | 3 +-- |
| 2 files changed, 1 insertion(+), 3 deletions(-) |
| |
| diff --git a/include/linux/skmsg.h b/include/linux/skmsg.h |
| index 82126d529798..822c048934e3 100644 |
| --- a/include/linux/skmsg.h |
| +++ b/include/linux/skmsg.h |
| @@ -395,7 +395,6 @@ static inline struct sk_psock *sk_psock_get(struct sock *sk) |
| } |
| |
| void sk_psock_stop(struct sock *sk, struct sk_psock *psock); |
| -void sk_psock_destroy(struct rcu_head *rcu); |
| void sk_psock_drop(struct sock *sk, struct sk_psock *psock); |
| |
| static inline void sk_psock_put(struct sock *sk, struct sk_psock *psock) |
| diff --git a/net/core/skmsg.c b/net/core/skmsg.c |
| index c4c224a5b9de..5dd5569f89bf 100644 |
| --- a/net/core/skmsg.c |
| +++ b/net/core/skmsg.c |
| @@ -676,14 +676,13 @@ static void sk_psock_destroy_deferred(struct work_struct *gc) |
| kfree(psock); |
| } |
| |
| -void sk_psock_destroy(struct rcu_head *rcu) |
| +static void sk_psock_destroy(struct rcu_head *rcu) |
| { |
| struct sk_psock *psock = container_of(rcu, struct sk_psock, rcu); |
| |
| INIT_WORK(&psock->gc, sk_psock_destroy_deferred); |
| schedule_work(&psock->gc); |
| } |
| -EXPORT_SYMBOL_GPL(sk_psock_destroy); |
| |
| void sk_psock_drop(struct sock *sk, struct sk_psock *psock) |
| { |
| -- |
| 2.30.2 |
| |