Commit 0fdea1e8 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

SUNRPC: Ensure that we wait for connections to complete before retrying 



Commit 718ba5b8, moved the responsibility for unlocking the socket to
xs_tcp_setup_socket, meaning that the socket will be unlocked before we
know that it has finished trying to connect. The following patch is based on
an initial patch by Russell King to ensure that we delay clearing the
XPRT_CONNECTING flag until we either know that we failed to initiate
a connection attempt, or the connection attempt itself failed.

Fixes: 718ba5b8 ("SUNRPC: Add helpers to prevent socket create from racing")
Reported-by: default avatarRussell King <linux@arm.linux.org.uk>
Reported-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Tested-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Tested-by: default avatarBenjamin Coddington <bcodding@redhat.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 17a9618e

include/linux/sunrpc/xprtsock.h

+3 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ struct sock_xprt { 
	/*

	 * Connection of transports

	 */

	unsigned long		sock_state;

	struct delayed_work	connect_worker;

	struct sockaddr_storage	srcaddr;

	unsigned short		srcport;
@@ -76,6 +77,8 @@ struct sock_xprt { 
 */

#define TCP_RPC_REPLY		(1UL << 6)



#define XPRT_SOCK_CONNECTING	1U



#endif /* __KERNEL__ */



#endif /* _LINUX_SUNRPC_XPRTSOCK_H */

net/sunrpc/xprtsock.c

+8 −3
Original line number Diff line number Diff line
@@ -1438,6 +1438,7 @@ out: 
static void xs_tcp_state_change(struct sock *sk)

{

	struct rpc_xprt *xprt;

	struct sock_xprt *transport;



	read_lock_bh(&sk->sk_callback_lock);

	if (!(xprt = xprt_from_sock(sk)))
@@ -1449,13 +1450,12 @@ static void xs_tcp_state_change(struct sock *sk) 
			sock_flag(sk, SOCK_ZAPPED),

			sk->sk_shutdown);



	transport = container_of(xprt, struct sock_xprt, xprt);

	trace_rpc_socket_state_change(xprt, sk->sk_socket);

	switch (sk->sk_state) {

	case TCP_ESTABLISHED:

		spin_lock(&xprt->transport_lock);

		if (!xprt_test_and_set_connected(xprt)) {

			struct sock_xprt *transport = container_of(xprt,

					struct sock_xprt, xprt);



			/* Reset TCP record info */

			transport->tcp_offset = 0;
@@ -1464,6 +1464,8 @@ static void xs_tcp_state_change(struct sock *sk) 
			transport->tcp_flags =

				TCP_RCV_COPY_FRAGHDR | TCP_RCV_COPY_XID;

			xprt->connect_cookie++;

			clear_bit(XPRT_SOCK_CONNECTING, &transport->sock_state);

			xprt_clear_connecting(xprt);



			xprt_wake_pending_tasks(xprt, -EAGAIN);

		}
@@ -1499,6 +1501,9 @@ static void xs_tcp_state_change(struct sock *sk) 
		smp_mb__after_atomic();

		break;

	case TCP_CLOSE:

		if (test_and_clear_bit(XPRT_SOCK_CONNECTING,

					&transport->sock_state))

			xprt_clear_connecting(xprt);

		xs_sock_mark_closed(xprt);

	}

 out:
@@ -2182,6 +2187,7 @@ static int xs_tcp_finish_connecting(struct rpc_xprt *xprt, struct socket *sock) 
	/* Tell the socket layer to start connecting... */

	xprt->stat.connect_count++;

	xprt->stat.connect_start = jiffies;

	set_bit(XPRT_SOCK_CONNECTING, &transport->sock_state);

	ret = kernel_connect(sock, xs_addr(xprt), xprt->addrlen, O_NONBLOCK);

	switch (ret) {

	case 0:
@@ -2243,7 +2249,6 @@ static void xs_tcp_setup_socket(struct work_struct *work) 
	case -EINPROGRESS:

	case -EALREADY:

		xprt_unlock_connect(xprt, transport);

		xprt_clear_connecting(xprt);

		return;

	case -EINVAL:

		/* Happens, for instance, if the user specified a link

CRA Git | Maintained and supported by SUSTech CRA and CCSE