[PATCH] RPC: add generic interface for adjusting the congestion window

 A new interface that allows transports to adjust their congestion window
 using the Van Jacobson implementation in xprt.c is provided.

 Test-plan:
 Use WAN simulation to cause sporadic bursty packet loss.  Look for
 significant regression in performance or client stability.

 Signed-off-by: Chuck Lever <cel@netapp.com>
 Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

1 files changed, 5 insertions, 8 deletions

diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index c3658ff027a6..980f26504f48 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -460,8 +460,6 @@ static void xs_udp_data_ready(struct sock *sk, int len)
                 goto out_unlock;
         task = rovr->rq_task;
 
-        dprintk("RPC: %4d received reply\n", task->tk_pid);
-
         if ((copied = rovr->rq_private_buf.buflen) > repsize)
                 copied = repsize;
 
@@ -472,7 +470,9 @@ static void xs_udp_data_ready(struct sock *sk, int len)
         /* Something worked... */
         dst_confirm(skb->dst);
 
-        xprt_complete_rqst(xprt, rovr, copied);
+        xprt_adjust_cwnd(task, copied);
+        xprt_update_rtt(task);
+        xprt_complete_rqst(task, copied);
 
  out_unlock:
         spin_unlock(&xprt->transport_lock);
@@ -634,11 +634,8 @@ static inline void xs_tcp_read_request(struct rpc_xprt *xprt, skb_reader_t *desc
         }
 
 out:
-        if (!(xprt->tcp_flags & XPRT_COPY_DATA)) {
-                dprintk("RPC: %4d received reply complete\n",
-                                req->rq_task->tk_pid);
-                xprt_complete_rqst(xprt, req, xprt->tcp_copied);
-        }
+        if (!(xprt->tcp_flags & XPRT_COPY_DATA))
+                xprt_complete_rqst(req->rq_task, xprt->tcp_copied);
         spin_unlock(&xprt->transport_lock);
         xs_tcp_check_recm(xprt);
 }