SUNRPC: Simplify socket shutdown when not reusing TCP ports
Subsystems (3)
[email protected]
maintainerPATCH 1/2 SUNRPC: Simplify socket shutdown when not reusing TCP ports
From: Trond Myklebust <[email protected]>
If we're not required to reuse the TCP port, then we can just immediately close the socket, and leave the cleanup details to the TCP layer.
--- net/sunrpc/xprtsock.c | 4 ++++ 1 file changed, 4 insertions(+)
net/sunrpc/xprtsock.c +4 -0
@@ -2099,6 +2099,10 @@ static void xs_tcp_shutdown(struct rpc_xprt *xprt)if (sock ==NULL )return ; +if (!xprt->reuseport) { +xs_close (xprt); +return ; + }switch (skst) {default :kernel_sock_shutdown (sock,SHUT_RDWR );
Signature · 1 line
2.31.1
[email protected]
maintainerPATCH 2/2 SUNRPC: Tweak TCP socket shutdown in the RPC client
From: Trond Myklebust <[email protected]>
We only really need to call shutdown() if we're in the ESTABLISHED TCP state, since that is the only case where the client is initiating a close of an established connection.
If the socket is in FIN_WAIT1 or FIN_WAIT2, then we've already initiated socket shutdown and are waiting for the server's reply, so do nothing.
In all other cases where we've already received a FIN from the server, we should be able to just close the socket.
--- net/sunrpc/xprtsock.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
net/sunrpc/xprtsock.c +6 -3
@@ -2104,12 +2104,15 @@ static void xs_tcp_shutdown(struct rpc_xprt *xprt)return ; }switch (skst) { -default : +case TCP_FIN_WAIT1 : +case TCP_FIN_WAIT2 : +break ; +case TCP_ESTABLISHED : +case TCP_CLOSE_WAIT :kernel_sock_shutdown (sock,SHUT_RDWR );trace_rpc_socket_shutdown (xprt, sock);break ; -case TCP_CLOSE : -case TCP_TIME_WAIT : +default :xs_reset_transport (transport); } }
Signature · 1 line
2.31.1