* [PATCH net] net: remove skb_free_datagram_locked()
@ 2024-03-15 8:49 Eric Dumazet
2024-03-15 8:58 ` Jason Xing
2024-03-19 12:36 ` Paolo Abeni
0 siblings, 2 replies; 3+ messages in thread
From: Eric Dumazet @ 2024-03-15 8:49 UTC (permalink / raw
To: David S . Miller, Jakub Kicinski, Paolo Abeni
Cc: netdev, eric.dumazet, Eric Dumazet
Last user of skb_free_datagram_locked() went away in 2016
with commit 850cbaddb52d ("udp: use it's own memory
accounting schema").
Signed-off-by: Eric Dumazet <edumazet@google.com>
---
include/linux/skbuff.h | 6 ------
net/core/datagram.c | 19 -------------------
2 files changed, 25 deletions(-)
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 3023bc2be6a1c126bdbba2a0bc9b1f11d4131735..499ae20f161af6397ad3f973da42239f639fd90f 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -4053,12 +4053,6 @@ int skb_copy_datagram_from_iter(struct sk_buff *skb, int offset,
struct iov_iter *from, int len);
int zerocopy_sg_from_iter(struct sk_buff *skb, struct iov_iter *frm);
void skb_free_datagram(struct sock *sk, struct sk_buff *skb);
-void __skb_free_datagram_locked(struct sock *sk, struct sk_buff *skb, int len);
-static inline void skb_free_datagram_locked(struct sock *sk,
- struct sk_buff *skb)
-{
- __skb_free_datagram_locked(sk, skb, 0);
-}
int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags);
int skb_copy_bits(const struct sk_buff *skb, int offset, void *to, int len);
int skb_store_bits(struct sk_buff *skb, int offset, const void *from, int len);
diff --git a/net/core/datagram.c b/net/core/datagram.c
index a8b625abe242c657dca8cd0188c236553757c6b2..e614cfd8e14a50a08c764dfed30c2e0838413a93 100644
--- a/net/core/datagram.c
+++ b/net/core/datagram.c
@@ -324,25 +324,6 @@ void skb_free_datagram(struct sock *sk, struct sk_buff *skb)
}
EXPORT_SYMBOL(skb_free_datagram);
-void __skb_free_datagram_locked(struct sock *sk, struct sk_buff *skb, int len)
-{
- bool slow;
-
- if (!skb_unref(skb)) {
- sk_peek_offset_bwd(sk, len);
- return;
- }
-
- slow = lock_sock_fast(sk);
- sk_peek_offset_bwd(sk, len);
- skb_orphan(skb);
- unlock_sock_fast(sk, slow);
-
- /* skb is now orphaned, can be freed outside of locked section */
- __kfree_skb(skb);
-}
-EXPORT_SYMBOL(__skb_free_datagram_locked);
-
int __sk_queue_drop_skb(struct sock *sk, struct sk_buff_head *sk_queue,
struct sk_buff *skb, unsigned int flags,
void (*destructor)(struct sock *sk,
--
2.44.0.291.gc1ea87d7ee-goog
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net] net: remove skb_free_datagram_locked()
2024-03-15 8:49 [PATCH net] net: remove skb_free_datagram_locked() Eric Dumazet
@ 2024-03-15 8:58 ` Jason Xing
2024-03-19 12:36 ` Paolo Abeni
1 sibling, 0 replies; 3+ messages in thread
From: Jason Xing @ 2024-03-15 8:58 UTC (permalink / raw
To: Eric Dumazet
Cc: David S . Miller, Jakub Kicinski, Paolo Abeni, netdev,
eric.dumazet
On Fri, Mar 15, 2024 at 4:49 PM Eric Dumazet <edumazet@google.com> wrote:
>
> Last user of skb_free_datagram_locked() went away in 2016
> with commit 850cbaddb52d ("udp: use it's own memory
> accounting schema").
>
> Signed-off-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: Jason Xing <kerneljasonxing@gmail.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net] net: remove skb_free_datagram_locked()
2024-03-15 8:49 [PATCH net] net: remove skb_free_datagram_locked() Eric Dumazet
2024-03-15 8:58 ` Jason Xing
@ 2024-03-19 12:36 ` Paolo Abeni
1 sibling, 0 replies; 3+ messages in thread
From: Paolo Abeni @ 2024-03-19 12:36 UTC (permalink / raw
To: Eric Dumazet, David S . Miller, Jakub Kicinski; +Cc: netdev, eric.dumazet
Hi,
On Fri, 2024-03-15 at 08:49 +0000, Eric Dumazet wrote:
> Last user of skb_free_datagram_locked() went away in 2016
> with commit 850cbaddb52d ("udp: use it's own memory
> accounting schema").
>
> Signed-off-by: Eric Dumazet <edumazet@google.com>
The patch LGTM, but it also looks more suitable for the net-next
branch. I suggest to target such tree, deferring this patch.
Thanks,
Paolo
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-03-19 12:36 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-15 8:49 [PATCH net] net: remove skb_free_datagram_locked() Eric Dumazet
2024-03-15 8:58 ` Jason Xing
2024-03-19 12:36 ` Paolo Abeni
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.