Skip to contentSkip to conversation

Couple of skb memory leak fixes

PATCH Applied Gal Pressman 3 participants 6 messages Jan 17, 2022 – Jan 23, 2022

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

cover Couple of skb memory leak fixes

As discussed in:
https://lore.kernel.org/netdev/[email protected]/

These are the two followup suggestions from Eric and Jakub. Patch #1 adds a sk_defer_free_flush() call to the kTLS splice_read handler.
Patch #2 verifies the defer list is empty on socket destroy, and calls a defer free flush as well.

Thanks!

Gal Pressman (2):
net/tls: Fix another skb memory leak when running kTLS traffic
net: Flush deferred skb free on socket destroy

 net/core/sock.c  | 3 +++
 net/tls/tls_sw.c | 1 +
 2 files changed, 4 insertions(+)
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/2 net/tls: Fix another skb memory leak when running kTLS traffic

This patch is a followup to
commit ffef737fd037 ("net/tls: Fix skb memory leak when running kTLS traffic")

Which was missing another sk_defer_free_flush() call in tls_sw_splice_read().

Fixes f35f821935d8 ("tcp: defer skb freeing after socket lock is released")
---
 net/tls/tls_sw.c | 1 +
 1 file changed, 1 insertion(+)
net/tls/tls_sw.c +1 -0
index 95e774f1b91f..efc84845bb6b 100644
@@ -2059,6 +2059,7 @@ ssize_t tls_sw_splice_read(struct socket *sock,  loff_t *ppos,
 
 splice_read_end:
 	release_sock(sk);
+	sk_defer_free_flush(sk);
 	return copied ? : err;
 }
 
Signature · 1 line
2.25.1
#2 lore raw

PATCH 2/2 net: Flush deferred skb free on socket destroy

In reply to Gal Pressman

The cited Fixes patch moved to a deferred skb approach where the skbs are not freed immediately under the socket lock. Add a WARN_ON_ONCE() to verify the deferred list is empty on socket destroy, and empty it to prevent potential memory leaks.

Fixes f35f821935d8 ("tcp: defer skb freeing after socket lock is released")
---
 net/core/sock.c | 3 +++
 1 file changed, 3 insertions(+)
net/core/sock.c +3 -0
index f32ec08a0c37..4ff806d71921 100644
@@ -2049,6 +2049,9 @@ void sk_destruct(struct sock *sk)
 {
 	bool use_call_rcu = sock_flag(sk, SOCK_RCU_FREE);
 
+	WARN_ON_ONCE(!llist_empty(&sk->defer_list));
+	sk_defer_free_flush(sk);
+
 	if (rcu_access_pointer(sk->sk_reuseport_cb)) {
 		reuseport_detach_sock(sk);
 		use_call_rcu = true;
Signature · 1 line
2.25.1
#3 lore raw

Re: [PATCH net 2/2] net: Flush deferred skb free on socket destroy

Quoted 16 lines · Gal Pressman

The cited Fixes patch moved to a deferred skb approach where the skbs are not freed immediately under the socket lock. Add a WARN_ON_ONCE() to verify the deferred list is empty on socket destroy, and empty it to prevent potential memory leaks.

Fixes f35f821935d8 ("tcp: defer skb freeing after socket lock is released")
---
 net/core/sock.c | 3 +++
 1 file changed, 3 insertions(+)
net/core/sock.c +0 -0
index f32ec08a0c37..4ff806d71921 100644

net/core/sock.c void sk_destruct(struct sock *sk) · line 2054

Quoted 6 lines
net/core/sock.c +3 -0
@@ -2049,6 +2049,9 @@ void sk_destruct(struct sock *sk)
 {
 	bool use_call_rcu = sock_flag(sk, SOCK_RCU_FREE);
 
+	WARN_ON_ONCE(!llist_empty(&sk->defer_list));
+	sk_defer_free_flush(sk);
+

This leads to a link error if CONFIG_INET is not set:

s390x-11.2.0-ld: net/core/sock.o: in function `sk_defer_free_flush':
linux/./include/net/tcp.h:1378: undefined reference to `__sk_defer_free_flush'
make: *** [Makefile:1155: vmlinux] Error 1

#4 lore raw

Re: [PATCH net 2/2] net: Flush deferred skb free on socket destroy

Quoted 20 lines · Heiko Carstens
Quoted 19 lines · Gal Pressman

The cited Fixes patch moved to a deferred skb approach where the skbs are not freed immediately under the socket lock. Add a WARN_ON_ONCE() to verify the deferred list is empty on socket destroy, and empty it to prevent potential memory leaks.

Fixes f35f821935d8 ("tcp: defer skb freeing after socket lock is released")
---
 net/core/sock.c | 3 +++
 1 file changed, 3 insertions(+)
net/core/sock.c +0 -0
index f32ec08a0c37..4ff806d71921 100644
@@ -2049,6 +2049,9 @@ void sk_destruct(struct sock *sk)
 {
 	bool use_call_rcu = sock_flag(sk, SOCK_RCU_FREE);
 
Quoted 8 lines

net/core/sock.c void sk_destruct(struct sock *sk) · line 2054

Quoted 3 lines
net/core/sock.c +3 -0
+	WARN_ON_ONCE(!llist_empty(&sk->defer_list));
+	sk_defer_free_flush(sk);
+

This leads to a link error if CONFIG_INET is not set:

s390x-11.2.0-ld: net/core/sock.o: in function `sk_defer_free_flush':
linux/./include/net/tcp.h:1378: undefined reference to `__sk_defer_free_flush'
make: *** [Makefile:1155: vmlinux] Error 1

Thanks, it is fixed in:

https://lore.kernel.org/netdev/[email protected]/

#5 lore raw
In reply to Gal Pressman
This series was applied to netdev/net.git (master) by David S. Miller <[email protected]>:

Hello:

This series was applied to netdev/net.git (master) by David S. Miller <[email protected]>:

Quoted 10 lines · On Mon, 17 Jan 2022 11:27:31 +0200 you wrote:

As discussed in:
https://lore.kernel.org/netdev/[email protected]/

These are the two followup suggestions from Eric and Jakub. Patch #1 adds a sk_defer_free_flush() call to the kTLS splice_read handler.
Patch #2 verifies the defer list is empty on socket destroy, and calls a defer free flush as well.

[...]

Here is the summary with links:
- [net,1/2] net/tls: Fix another skb memory leak when running kTLS traffic

    https://git.kernel.org/netdev/net/c/db094aa8140e
  - [net,2/2] net: Flush deferred skb free on socket destroy
    https://git.kernel.org/netdev/net/c/79074a72d335

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html