Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

SUNRPC: fix NFS client over TCP hangs due to packet loss (Bug 16494)

Browse source 
When reusing a TCP connection, ensure that it's aborted if a previous
shutdown attempt has been made on that connection so that the RPC over
TCP recovery mechanism succeeds.

Signed-off-by: Andy Chittenden <andyc.bluearc@gmail.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Andy Chittenden 2010-08-10 10:19:53 -04:00 committed by Trond Myklebust
parent f6cec0ae58
commit 669502ff31
1 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
net/sunrpc/xprtsock.c
View file

@ -1305,10 +1305,11 @@ static void xs_tcp_state_change(struct sock *sk)
if (!(xprt = xprt_from_sock(sk))) if (!(xprt = xprt_from_sock(sk)))
goto out; goto out;
dprintk("RPC: xs_tcp_state_change client %p...\n", xprt); dprintk("RPC: xs_tcp_state_change client %p...\n", xprt);
dprintk("RPC: state %x conn %d dead %d zapped %d\n", dprintk("RPC: state %x conn %d dead %d zapped %d sk_shutdown %d\n",
sk->sk_state, xprt_connected(xprt), sk->sk_state, xprt_connected(xprt),
sock_flag(sk, SOCK_DEAD), sock_flag(sk, SOCK_DEAD),
sock_flag(sk, SOCK_ZAPPED)); sock_flag(sk, SOCK_ZAPPED),
sk->sk_shutdown);
switch (sk->sk_state) { switch (sk->sk_state) {
case TCP_ESTABLISHED: case TCP_ESTABLISHED:
@ -1779,10 +1780,25 @@ static void xs_tcp_reuse_connection(struct rpc_xprt *xprt, struct sock_xprt *tra
{ {
unsigned int state = transport->inet->sk_state; unsigned int state = transport->inet->sk_state;
if (state == TCP_CLOSE && transport->sock->state == SS_UNCONNECTED) if (state == TCP_CLOSE && transport->sock->state == SS_UNCONNECTED) {
return; /* we don't need to abort the connection if the socket
if ((1 << state) & (TCPF_ESTABLISHED|TCPF_SYN_SENT)) * hasn't undergone a shutdown
return; */
if (transport->inet->sk_shutdown == 0)
return;
dprintk("RPC: %s: TCP_CLOSEd and sk_shutdown set to %d\n",
__func__, transport->inet->sk_shutdown);
}
if ((1 << state) & (TCPF_ESTABLISHED|TCPF_SYN_SENT)) {
/* we don't need to abort the connection if the socket
* hasn't undergone a shutdown
*/
if (transport->inet->sk_shutdown == 0)
return;
dprintk("RPC: %s: ESTABLISHED/SYN_SENT "
"sk_shutdown set to %d\n",
__func__, transport->inet->sk_shutdown);
}
xs_abort_connection(xprt, transport); xs_abort_connection(xprt, transport);
} }