Message ID | 20210709154306.2276391-1-mailtalalahmad@gmail.com |
---|---|
State | New |
Headers | show |
Series | [net] tcp: call sk_wmem_schedule before sk_mem_charge in zerocopy path | expand |
Hello: This patch was applied to netdev/net.git (refs/heads/master): On Fri, 9 Jul 2021 11:43:06 -0400 you wrote: > From: Talal Ahmad <talalahmad@google.com> > > sk_wmem_schedule makes sure that sk_forward_alloc has enough > bytes for charging that is going to be done by sk_mem_charge. > > In the transmit zerocopy path, there is sk_mem_charge but there was > no call to sk_wmem_schedule. This change adds that call. > > [...] Here is the summary with links: - [net] tcp: call sk_wmem_schedule before sk_mem_charge in zerocopy path https://git.kernel.org/netdev/net/c/358ed6242070 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index d5ab5f243640..8cb44040ec68 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -1375,6 +1375,9 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t size) } pfrag->offset += copy; } else { + if (!sk_wmem_schedule(sk, copy)) + goto wait_for_space; + err = skb_zerocopy_iter_stream(sk, skb, msg, copy, uarg); if (err == -EMSGSIZE || err == -EEXIST) { tcp_mark_push(tp, skb);