Revert "SUNRPC: Reduce thread wake-up rate when receiving large RPC messages"

I noticed that a handful of NFSv3 fstests were taking an
unexpectedly long time to run. Troubleshooting showed that the
server's TCP window closed and never re-opened, which caused the
client to trigger an RPC retransmit timeout after 180 seconds.

The client's recovery action was to establish a fresh connection
and retransmit the timed-out requests. This worked, but it adds a
long delay.

I tracked the problem to the commit that attempted to reduce the
rate at which the network layer delivers TCP socket data_ready
callbacks. Under most circumstances this change worked as expected,
but for NFSv3, which has no session or other type of throttling, it
can overwhelm the receiver on occasion.

I'm sure I could tweak the lowat settings, but the small benefit
doesn't seem worth the bother. Just revert it.

Fixes: 2b877fc53e97 ("SUNRPC: Reduce thread wake-up rate when receiving large RPC messages")
Cc: Jakub Kicinski <kuba@kernel.org>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index 95397677673bb0cb4a2ffc5402d196b3227818ac..cb3bd12f5818bad13226d9b91be2881c55f56bc2 100644 (file)
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -1083,9 +1083,6 @@ static void svc_tcp_fragment_received(struct svc_sock *svsk)
        /* If we have more data, signal svc_xprt_enqueue() to try again */
        svsk->sk_tcplen = 0;
        svsk->sk_marker = xdr_zero;
-
-       smp_wmb();
-       tcp_set_rcvlowat(svsk->sk_sk, 1);
 }
 
 /**
@@ -1175,17 +1172,10 @@ err_incomplete:
                goto err_delete;
        if (len == want)
                svc_tcp_fragment_received(svsk);
-       else {
-               /* Avoid more ->sk_data_ready() calls until the rest
-                * of the message has arrived. This reduces service
-                * thread wake-ups on large incoming messages. */
-               tcp_set_rcvlowat(svsk->sk_sk,
-                                svc_sock_reclen(svsk) - svsk->sk_tcplen);
-
+       else
                trace_svcsock_tcp_recv_short(&svsk->sk_xprt,
                                svc_sock_reclen(svsk),
                                svsk->sk_tcplen - sizeof(rpc_fraghdr));
-       }
        goto err_noclose;
 error:
        if (len != -EAGAIN)