* [PATCH net] tcp: add a missing sk_defer_free_flush() in tcp_splice_read()
@ 2022-01-20 12:45 Eric Dumazet
2022-01-21 6:00 ` patchwork-bot+netdevbpf
0 siblings, 1 reply; 2+ messages in thread
From: Eric Dumazet @ 2022-01-20 12:45 UTC (permalink / raw)
To: David S . Miller, Jakub Kicinski
Cc: netdev, Eric Dumazet, Eric Dumazet, Gal Pressman
From: Eric Dumazet <edumazet@google.com>
Without it, splice users can hit the warning
added in commit 79074a72d335 ("net: Flush deferred skb free on socket destroy")
Fixes: f35f821935d8 ("tcp: defer skb freeing after socket lock is released")
Fixes: 79074a72d335 ("net: Flush deferred skb free on socket destroy")
Suggested-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Gal Pressman <gal@nvidia.com>
---
net/ipv4/tcp.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 3b75836db19b07b0f178ef4457bda0ec641fd40d..78e81465f5f3632f54093495d2f2a064e60c7237 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -842,6 +842,7 @@ ssize_t tcp_splice_read(struct socket *sock, loff_t *ppos,
}
release_sock(sk);
+ sk_defer_free_flush(sk);
if (spliced)
return spliced;
--
2.34.1.703.g22d0c6ccf7-goog
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net] tcp: add a missing sk_defer_free_flush() in tcp_splice_read()
2022-01-20 12:45 [PATCH net] tcp: add a missing sk_defer_free_flush() in tcp_splice_read() Eric Dumazet
@ 2022-01-21 6:00 ` patchwork-bot+netdevbpf
0 siblings, 0 replies; 2+ messages in thread
From: patchwork-bot+netdevbpf @ 2022-01-21 6:00 UTC (permalink / raw)
To: Eric Dumazet; +Cc: davem, kuba, netdev, edumazet, gal
Hello:
This patch was applied to netdev/net.git (master)
by Jakub Kicinski <kuba@kernel.org>:
On Thu, 20 Jan 2022 04:45:30 -0800 you wrote:
> From: Eric Dumazet <edumazet@google.com>
>
> Without it, splice users can hit the warning
> added in commit 79074a72d335 ("net: Flush deferred skb free on socket destroy")
>
> Fixes: f35f821935d8 ("tcp: defer skb freeing after socket lock is released")
> Fixes: 79074a72d335 ("net: Flush deferred skb free on socket destroy")
> Suggested-by: Jakub Kicinski <kuba@kernel.org>
> Signed-off-by: Eric Dumazet <edumazet@google.com>
> Cc: Gal Pressman <gal@nvidia.com>
>
> [...]
Here is the summary with links:
- [net] tcp: add a missing sk_defer_free_flush() in tcp_splice_read()
https://git.kernel.org/netdev/net/c/ebdc1a030962
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-01-21 6:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-20 12:45 [PATCH net] tcp: add a missing sk_defer_free_flush() in tcp_splice_read() Eric Dumazet
2022-01-21 6:00 ` patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).