tcp: allow MSG_ZEROCOPY transmission also in CLOSE_WAIT state
Subsystems (3)
PATCH 1/1 tcp: allow MSG_ZEROCOPY transmission also in CLOSE_WAIT state
From: Willem de Bruijn <[email protected]>
TCP transmission with MSG_ZEROCOPY fails if the peer closes its end of the connection and so transitions this socket to CLOSE_WAIT state.
Transmission in close wait state is acceptable. Other similar tests in the stack (e.g., in FastOpen) accept both states. Relax this test, too.
---
This is a narrow fix. Alexey Kodanev suggested a while ago that the entire check might be removed, also opening up more cases for zerocopy with fastopen. For net-next, I will take another look at that and also at adding a tcp_data_sending_states() helper to avoid open coding this test everywhere.
--- net/ipv4/tcp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/ipv4/tcp.c +1 -1
@@ -1186,7 +1186,7 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t size) flags = msg->msg_flags;if (flags &MSG_ZEROCOPY && size &&sock_flag (sk,SOCK_ZEROCOPY )) { -if (sk->sk_state !=TCP_ESTABLISHED ) { +if ((1 << sk->sk_state) & ~(TCPF_ESTABLISHED |TCPF_CLOSE_WAIT )) { err = -EINVAL ; goto out_err; }
Signature · 1 line
2.20.1.97.g81188d93c3-goog
Quoted 9 lines · Willem de Bruijn
From: Willem de Bruijn <[email protected]>
TCP transmission with
MSG_ZEROCOPYfails if the peer closes its end of the connection and so transitions this socket toCLOSE_WAITstate.Transmission in close wait state is acceptable. Other similar tests in the stack (e.g., in FastOpen) accept both states. Relax this test, too.
Quoted 9 lines
Fixes f214f915e7db ("tcp: enable MSG_ZEROCOPY")Reported-by Marek Majkowski <[email protected]>Signed-off-by Willem de Bruijn <[email protected]>CC Yuchung Cheng <[email protected]>CC Neal Cardwell <[email protected]>CC Soheil Hassas Yeganeh <[email protected]>CC Alexey Kodanev <[email protected]>
Thank you for the fix!
Quoted 27 lines
---
This is a narrow fix. Alexey Kodanev suggested a while ago that the entire check might be removed, also opening up more cases for zerocopy with fastopen. For net-next, I will take another look at that and also at adding a
tcp_data_sending_states()helper to avoid open coding this test everywhere.--- net/ipv4/tcp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)net/ipv4/tcp.c +1
-2@@ -1186,7 +1186,7 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t size) flags = msg->msg_flags;if (flags &MSG_ZEROCOPY && size &&sock_flag (sk,SOCK_ZEROCOPY )) { -if (sk->sk_state !=TCP_ESTABLISHED ) { +if ((1 << sk->sk_state) & ~(TCPF_ESTABLISHED |TCPF_CLOSE_WAIT )) { err = -EINVAL ; goto out_err; } --2.20.1.97.g81188d93c3-goog
Eric Dumazet
Reviewed-byQuoted 21 lines · Soheil Hassas Yeganeh
Quoted 9 lines · Willem de Bruijn
From: Willem de Bruijn <[email protected]>
TCP transmission with
MSG_ZEROCOPYfails if the peer closes its end of the connection and so transitions this socket toCLOSE_WAITstate.Transmission in close wait state is acceptable. Other similar tests in the stack (e.g., in FastOpen) accept both states. Relax this test, too.
Quoted 9 lines
Fixes f214f915e7db ("tcp: enable MSG_ZEROCOPY")Reported-by Marek Majkowski <[email protected]>Signed-off-by Willem de Bruijn <[email protected]>CC Yuchung Cheng <[email protected]>CC Neal Cardwell <[email protected]>CC Soheil Hassas Yeganeh <[email protected]>CC Alexey Kodanev <[email protected]>
Quoted 3 lines
Thank you for the fix!
David Miller
maintainerFrom: Willem de Bruijn <[email protected]>
Date: Thu, 10 Jan 2019 14:40:33 -0500
Quoted 5 lines
From: Willem de Bruijn <[email protected]>
TCP transmission with
MSG_ZEROCOPYfails if the peer closes its end of the connection and so transitions this socket toCLOSE_WAITstate.
Quoted 8 lines
Transmission in close wait state is acceptable. Other similar tests in the stack (e.g., in FastOpen) accept both states. Relax this test, too.
Fixes f214f915e7db ("tcp: enable MSG_ZEROCOPY")Reported-by Marek Majkowski <[email protected]>Signed-off-by Willem de Bruijn <[email protected]>
Applied and queued up for -stable.