sock: remove zerocopy sockopt restriction on closed tcp state
Subsystems (4)
PATCH 1/1 sock: remove zerocopy sockopt restriction on closed tcp state
From: Willem de Bruijn <[email protected]>
Socket option SO_ZEROCOPY determines whether the kernel ignores or processes flag MSG_ZEROCOPY on subsequent send calls. This to avoid changing behavior for legacy processes.
Limiting the state change to closed sockets is annoying with passive sockets and not necessary for correctness. Once created, zerocopy skbs are processed based on their private state, not this socket flag.
Remove the constraint.
--- Documentation/networking/msg_zerocopy.rst | 5 ----- net/core/sock.c | 2 -- 2 files changed, 7 deletions(-)
Documentation/networking/msg_zerocopy.rst +0 -5
@@ -72,11 +72,6 @@ this flag, a process must first signal intent by setting a socket option: if (setsockopt(fd, SOL_SOCKET, SO_ZEROCOPY, &one, sizeof(one))) error(1, errno, "setsockopt zerocopy"); -Setting the socket option only works when the socket is in its initial -(TCP_CLOSED) state. Trying to set the option for a socket returned by accept(), -for example, will lead to an EBUSY error. In this case, the option should be set -to the listening socket and it will be inherited by the accepted sockets. - Transmission ------------
net/core/sock.c +0 -2
@@ -1052,8 +1052,6 @@ int sock_setsockopt(struct socket *sock, int level, int optname,if (sk->sk_family ==PF_INET || sk->sk_family ==PF_INET6 ) {if (sk->sk_protocol !=IPPROTO_TCP ) ret = -ENOTSUPP ; -else if (sk->sk_state !=TCP_CLOSE ) - ret = -EBUSY ; }else if (sk->sk_family !=PF_RDS ) { ret = -ENOTSUPP ; }
Signature · 1 line
2.16.2.804.g6dcf76e118-goog
From: Willem de Bruijn <[email protected]>
Date: Wed, 14 Mar 2018 12:49:19 -0400
Quoted 6 lines
From: Willem de Bruijn <[email protected]>
Socket option
SO_ZEROCOPYdetermines whether the kernel ignores or processes flagMSG_ZEROCOPYon subsequent send calls. This to avoid changing behavior for legacy processes.
Quoted 7 lines
Limiting the state change to closed sockets is annoying with passive sockets and not necessary for correctness. Once created, zerocopy skbs are processed based on their private state, not this socket flag.
Remove the constraint.
Signed-off-by Willem de Bruijn <[email protected]>
Applied, thanks Willem.