sock: remove zerocopy sockopt restriction on closed tcp state

wdebruij · davem330 · commit ced68234b6a2 · 2018-03-14T12:51:28.000-04:00
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.

Signed-off-by: Willem de Bruijn &lt;willemb@google.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/Documentation/networking/msg_zerocopy.rst b/Documentation/networking/msg_zerocopy.rst
@@ -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
 ------------
 
diff --git a/net/core/sock.c b/net/core/sock.c
@@ -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;
 		}

Original file line number	Diff line number	Diff line change
`@@ -1052,8 +1052,6 @@ int sock_setsockopt(struct socket *sock, int level, int optname,`
`1052`	`1052`	`if (sk->sk_family == PF_INET \|\| sk->sk_family == PF_INET6) {`
`1053`	`1053`	`if (sk->sk_protocol != IPPROTO_TCP)`
`1054`	`1054`	`ret = -ENOTSUPP;`
`1055`		`- else if (sk->sk_state != TCP_CLOSE)`
`1056`		`- ret = -EBUSY;`
`1057`	`1055`	`} else if (sk->sk_family != PF_RDS) {`
`1058`	`1056`	`ret = -ENOTSUPP;`
`1059`	`1057`	`}`