From: Trond Myklebust <trond.myklebust@fys.uio.no>
To: Linus Torvalds <torvalds@transmeta.com>
Cc: Linux Kernel <linux-kernel@vger.kernel.org>,
NFS maillist <nfs@lists.sourceforge.net>
Subject: [PATCH] RPC over UDP congestion control updates [3/8]
Date: Tue, 16 Jul 2002 19:59:12 +0200 [thread overview]
Message-ID: <15668.24304.638646.86068@charged.uio.no> (raw)
Improve the response to timeouts. As requests time out, we delay
timing out the remaining requests (in fact we follow exponential
backoff). This is done because we assume either that the round trip
time has been underestimated, or that the network/server is congested,
and we need to back off the resending of new requests.
Cheers,
Trond
diff -u --recursive --new-file linux-2.5.25-rtt2/include/linux/sunrpc/xprt.h linux-2.5.25-rtt3/include/linux/sunrpc/xprt.h
--- linux-2.5.25-rtt2/include/linux/sunrpc/xprt.h Tue Jul 16 11:43:08 2002
+++ linux-2.5.25-rtt3/include/linux/sunrpc/xprt.h Tue Jul 16 15:28:49 2002
@@ -99,6 +99,7 @@
u32 rq_bytes_sent; /* Bytes we have sent */
long rq_xtime; /* when transmitted */
+ int rq_ntimeo;
int rq_nresend;
};
#define rq_svec rq_snd_buf.head
diff -u --recursive --new-file linux-2.5.25-rtt2/net/sunrpc/xprt.c linux-2.5.25-rtt3/net/sunrpc/xprt.c
--- linux-2.5.25-rtt2/net/sunrpc/xprt.c Tue Jul 16 11:47:29 2002
+++ linux-2.5.25-rtt3/net/sunrpc/xprt.c Tue Jul 16 15:28:49 2002
@@ -77,6 +77,8 @@
# define RPCDBG_FACILITY RPCDBG_XPRT
#endif
+#define XPRT_MAX_BACKOFF (8)
+
/*
* Local functions
*/
@@ -932,6 +934,21 @@
}
/*
+ * Exponential backoff for UDP retries
+ */
+static inline int
+xprt_expbackoff(struct rpc_task *task, struct rpc_rqst *req)
+{
+ int backoff;
+
+ req->rq_ntimeo++;
+ backoff = min(rpc_ntimeo(&task->tk_client->cl_rtt), XPRT_MAX_BACKOFF);
+ if (req->rq_ntimeo < (1 << backoff))
+ return 1;
+ return 0;
+}
+
+/*
* RPC receive timeout handler.
*/
static void
@@ -943,9 +960,16 @@
spin_lock(&xprt->sock_lock);
if (req->rq_received)
goto out;
+
+ if (!xprt->nocong) {
+ if (xprt_expbackoff(task, req)) {
+ rpc_add_timer(task, xprt_timer);
+ goto out_unlock;
+ }
+ rpc_inc_timeo(&task->tk_client->cl_rtt);
+ xprt_adjust_cwnd(req->rq_xprt, -ETIMEDOUT);
+ }
req->rq_nresend++;
- rpc_inc_timeo(&task->tk_client->cl_rtt);
- xprt_adjust_cwnd(xprt, -ETIMEDOUT);
dprintk("RPC: %4d xprt_timer (%s request)\n",
task->tk_pid, req ? "pending" : "backlogged");
@@ -954,6 +978,7 @@
out:
task->tk_timeout = 0;
rpc_wake_up_task(task);
+out_unlock:
spin_unlock(&xprt->sock_lock);
}
@@ -1076,16 +1101,9 @@
dprintk("RPC: %4d xmit complete\n", task->tk_pid);
/* Set the task's receive timeout value */
if (!xprt->nocong) {
- int backoff;
task->tk_timeout = rpc_calc_rto(&clnt->cl_rtt,
rpcproc_timer(clnt, task->tk_msg.rpc_proc));
- /* If we are retransmitting, increment the timeout counter */
- backoff = req->rq_nresend;
- if (backoff) {
- if (backoff > 7)
- backoff = 7;
- task->tk_timeout <<= backoff;
- }
+ req->rq_ntimeo = 0;
if (task->tk_timeout > req->rq_timeout.to_maxval)
task->tk_timeout = req->rq_timeout.to_maxval;
} else
reply other threads:[~2002-07-16 18:00 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=15668.24304.638646.86068@charged.uio.no \
--to=trond.myklebust@fys.uio.no \
--cc=linux-kernel@vger.kernel.org \
--cc=nfs@lists.sourceforge.net \
--cc=torvalds@transmeta.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).