SUNRPC: Replace internal use of SOCKWQ_ASYNC_NOSPACE

[ Upstream commit 2790a624d43084de590884934969e19c7a82316a ]

The socket's SOCKWQ_ASYNC_NOSPACE can be cleared by various actors in
the socket layer, so replace it with our own flag in the transport
sock_state field.

Reported-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Stable-dep-of: 4db9ad82a6c8 ("sunrpc: clear XPRT_SOCK_UPD_TIMEOUT when reset transport")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/include/linux/sunrpc/xprtsock.h b/include/linux/sunrpc/xprtsock.h
index 689062afdd610da7c4a277909625fcae7cf9a83d..3eb0079669c5032fa203f05d48e0ceff1b611055 100644 (file)
--- a/include/linux/sunrpc/xprtsock.h
+++ b/include/linux/sunrpc/xprtsock.h
@@ -90,5 +90,6 @@ struct sock_xprt {
 #define XPRT_SOCK_WAKE_PENDING (6)
 #define XPRT_SOCK_WAKE_DISCONNECT      (7)
 #define XPRT_SOCK_CONNECT_SENT (8)
+#define XPRT_SOCK_NOSPACE      (9)
 
 #endif /* _LINUX_SUNRPC_XPRTSOCK_H */

diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 5601217febaa3f2b28a60efcd8d802731f04f7ff..06ea4fb2d4532fde071e689bddefeebbde74fe0e 100644 (file)
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -779,14 +779,8 @@ static int xs_nospace(struct rpc_rqst *req, struct sock_xprt *transport)
 
        /* Don't race with disconnect */
        if (xprt_connected(xprt)) {
-               struct socket_wq *wq;
-
-               rcu_read_lock();
-               wq = rcu_dereference(sk->sk_wq);
-               set_bit(SOCKWQ_ASYNC_NOSPACE, &wq->flags);
-               rcu_read_unlock();
-
                /* wait for more buffer space */
+               set_bit(XPRT_SOCK_NOSPACE, &transport->sock_state);
                set_bit(SOCK_NOSPACE, &sk->sk_socket->flags);
                sk->sk_write_pending++;
                xprt_wait_for_buffer_space(xprt);
@@ -1148,6 +1142,7 @@ static void xs_sock_reset_state_flags(struct rpc_xprt *xprt)
        clear_bit(XPRT_SOCK_WAKE_ERROR, &transport->sock_state);
        clear_bit(XPRT_SOCK_WAKE_WRITE, &transport->sock_state);
        clear_bit(XPRT_SOCK_WAKE_DISCONNECT, &transport->sock_state);
+       clear_bit(XPRT_SOCK_NOSPACE, &transport->sock_state);
 }
 
 static void xs_run_error_worker(struct sock_xprt *transport, unsigned int nr)
@@ -1511,7 +1506,6 @@ static void xs_tcp_state_change(struct sock *sk)
 
 static void xs_write_space(struct sock *sk)
 {
-       struct socket_wq *wq;
        struct sock_xprt *transport;
        struct rpc_xprt *xprt;
 
@@ -1522,15 +1516,10 @@ static void xs_write_space(struct sock *sk)
        if (unlikely(!(xprt = xprt_from_sock(sk))))
                return;
        transport = container_of(xprt, struct sock_xprt, xprt);
-       rcu_read_lock();
-       wq = rcu_dereference(sk->sk_wq);
-       if (!wq || test_and_clear_bit(SOCKWQ_ASYNC_NOSPACE, &wq->flags) == 0)
-               goto out;
-
+       if (!test_and_clear_bit(XPRT_SOCK_NOSPACE, &transport->sock_state))
+               return;
        xs_run_error_worker(transport, XPRT_SOCK_WAKE_WRITE);
        sk->sk_write_pending--;
-out:
-       rcu_read_unlock();
 }
 
 /**
@@ -1874,7 +1863,6 @@ static int xs_local_finish_connecting(struct rpc_xprt *xprt,
                sk->sk_user_data = xprt;
                sk->sk_data_ready = xs_data_ready;
                sk->sk_write_space = xs_udp_write_space;
-               sock_set_flag(sk, SOCK_FASYNC);
                sk->sk_error_report = xs_error_report;
 
                xprt_clear_connected(xprt);
@@ -2072,7 +2060,6 @@ static void xs_udp_finish_connecting(struct rpc_xprt *xprt, struct socket *sock)
                sk->sk_user_data = xprt;
                sk->sk_data_ready = xs_data_ready;
                sk->sk_write_space = xs_udp_write_space;
-               sock_set_flag(sk, SOCK_FASYNC);
 
                xprt_set_connected(xprt);
 
@@ -2237,7 +2224,6 @@ static int xs_tcp_finish_connecting(struct rpc_xprt *xprt, struct socket *sock)
                sk->sk_data_ready = xs_data_ready;
                sk->sk_state_change = xs_tcp_state_change;
                sk->sk_write_space = xs_tcp_write_space;
-               sock_set_flag(sk, SOCK_FASYNC);
                sk->sk_error_report = xs_error_report;
 
                /* socket options */