From: Trond Myklebust <trondmy@gmail.com>
To: Anna Schumaker <Anna.Schumaker@netapp.com>
Cc: linux-nfs@vger.kernel.org
Subject: [PATCH v3 10/29] SUNRPC: Ensure that the transport layer respect major timeouts
Date: Sun, 7 Apr 2019 13:58:53 -0400 [thread overview]
Message-ID: <20190407175912.23528-11-trond.myklebust@hammerspace.com> (raw)
In-Reply-To: <20190407175912.23528-10-trond.myklebust@hammerspace.com>
Ensure that when in the transport layer, we don't sleep past
a major timeout.
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
---
net/sunrpc/xprt.c | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
index 36af1a1929af..642cc0f64e44 100644
--- a/net/sunrpc/xprt.c
+++ b/net/sunrpc/xprt.c
@@ -73,6 +73,15 @@ static void xprt_destroy(struct rpc_xprt *xprt);
static DEFINE_SPINLOCK(xprt_list_lock);
static LIST_HEAD(xprt_list);
+static unsigned long xprt_request_timeout(const struct rpc_rqst *req)
+{
+ unsigned long timeout = jiffies + req->rq_timeout;
+
+ if (time_before(timeout, req->rq_majortimeo))
+ return timeout;
+ return req->rq_majortimeo;
+}
+
/**
* xprt_register_transport - register a transport implementation
* @transport: transport to register
@@ -212,7 +221,7 @@ int xprt_reserve_xprt(struct rpc_xprt *xprt, struct rpc_task *task)
task->tk_status = -EAGAIN;
if (RPC_IS_SOFT(task))
rpc_sleep_on_timeout(&xprt->sending, task, NULL,
- jiffies + req->rq_timeout);
+ xprt_request_timeout(req));
else
rpc_sleep_on(&xprt->sending, task, NULL);
return 0;
@@ -279,7 +288,7 @@ int xprt_reserve_xprt_cong(struct rpc_xprt *xprt, struct rpc_task *task)
task->tk_status = -EAGAIN;
if (RPC_IS_SOFT(task))
rpc_sleep_on_timeout(&xprt->sending, task, NULL,
- jiffies + req->rq_timeout);
+ xprt_request_timeout(req));
else
rpc_sleep_on(&xprt->sending, task, NULL);
return 0;
@@ -795,7 +804,7 @@ void xprt_connect(struct rpc_task *task)
if (!xprt_connected(xprt)) {
task->tk_rqstp->rq_connect_cookie = xprt->connect_cookie;
rpc_sleep_on_timeout(&xprt->pending, task, NULL,
- jiffies + task->tk_rqstp->rq_timeout);
+ xprt_request_timeout(task->tk_rqstp));
if (test_bit(XPRT_CLOSING, &xprt->state))
return;
@@ -1087,7 +1096,7 @@ void xprt_wait_for_reply_request_def(struct rpc_task *task)
struct rpc_rqst *req = task->tk_rqstp;
rpc_sleep_on_timeout(&req->rq_xprt->pending, task, xprt_timer,
- jiffies + req->rq_timeout);
+ xprt_request_timeout(req));
}
EXPORT_SYMBOL_GPL(xprt_wait_for_reply_request_def);
--
2.20.1
next prev parent reply other threads:[~2019-04-07 18:01 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-07 17:58 [PATCH v3 00/29] Fix up soft mounts for NFSv4.x Trond Myklebust
2019-04-07 17:58 ` [PATCH v3 01/29] SUNRPC: Fix up task signalling Trond Myklebust
2019-04-07 17:58 ` [PATCH v3 02/29] SUNRPC: Refactor rpc_restart_call/rpc_restart_call_prepare Trond Myklebust
2019-04-07 17:58 ` [PATCH v3 03/29] SUNRPC: Refactor xprt_request_wait_receive() Trond Myklebust
2019-04-07 17:58 ` [PATCH v3 04/29] SUNRPC: Refactor rpc_sleep_on() Trond Myklebust
2019-04-07 17:58 ` [PATCH v3 05/29] SUNRPC: Remove unused argument 'action' from rpc_sleep_on_priority() Trond Myklebust
2019-04-07 17:58 ` [PATCH v3 06/29] SUNRPC: Add function rpc_sleep_on_timeout() Trond Myklebust
2019-04-07 17:58 ` [PATCH v3 07/29] SUNRPC: Fix up tracking of timeouts Trond Myklebust
2019-04-07 17:58 ` [PATCH v3 08/29] SUNRPC: Simplify queue timeouts using timer_reduce() Trond Myklebust
2019-04-07 17:58 ` [PATCH v3 09/29] SUNRPC: Declare RPC timers as TIMER_DEFERRABLE Trond Myklebust
2019-04-07 17:58 ` Trond Myklebust [this message]
2019-04-07 17:58 ` [PATCH v3 11/29] SUNRPC: Add tracking of RPC level errors Trond Myklebust
2019-04-07 17:58 ` [PATCH v3 12/29] SUNRPC: Make "no retrans timeout" soft tasks behave like softconn for timeouts Trond Myklebust
2019-04-07 17:58 ` [PATCH v3 13/29] SUNRPC: Start the first major timeout calculation at task creation Trond Myklebust
2019-04-07 17:58 ` [PATCH v3 14/29] SUNRPC: Ensure to ratelimit the "server not responding" syslog messages Trond Myklebust
2019-04-07 17:58 ` [PATCH v3 15/29] SUNRPC: Add the 'softerr' rpc_client flag Trond Myklebust
2019-04-07 17:58 ` [PATCH v3 16/29] NFS: Consider ETIMEDOUT to be a fatal error Trond Myklebust
2019-04-07 17:59 ` [PATCH v3 17/29] NFS: Move internal constants out of uapi/linux/nfs_mount.h Trond Myklebust
2019-04-07 17:59 ` [PATCH v3 18/29] NFS: Add a mount option "softerr" to allow clients to see ETIMEDOUT errors Trond Myklebust
2019-04-07 17:59 ` [PATCH v3 19/29] NFS: Don't interrupt file writeout due to fatal errors Trond Myklebust
2019-04-07 17:59 ` [PATCH v3 20/29] NFS: Don't call generic_error_remove_page() while holding locks Trond Myklebust
2019-04-07 17:59 ` [PATCH v3 21/29] NFS: Don't inadvertently clear writeback errors Trond Myklebust
2019-04-07 17:59 ` [PATCH v3 22/29] NFS: Replace custom error reporting mechanism with generic one Trond Myklebust
2019-04-07 17:59 ` [PATCH v3 23/29] NFS: Fix up NFS I/O subrequest creation Trond Myklebust
2019-04-07 17:59 ` [PATCH v3 24/29] NFS: Remove unused argument from nfs_create_request() Trond Myklebust
2019-04-07 17:59 ` [PATCH v3 25/29] pNFS: Add tracking to limit the number of pNFS retries Trond Myklebust
2019-04-07 17:59 ` [PATCH v3 26/29] NFS: Allow signal interruption of NFS4ERR_DELAYed operations Trond Myklebust
2019-04-07 17:59 ` [PATCH v3 27/29] NFS: Ensure that all nfs lock contexts have a valid open context Trond Myklebust
2019-04-07 17:59 ` [PATCH v3 28/29] NFS: Add a helper to return a pointer to the open context of a struct nfs_page Trond Myklebust
2019-04-07 17:59 ` [PATCH v3 29/29] NFS: Remove redundant open context from nfs_page Trond Myklebust
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=20190407175912.23528-11-trond.myklebust@hammerspace.com \
--to=trondmy@gmail.com \
--cc=Anna.Schumaker@netapp.com \
--cc=linux-nfs@vger.kernel.org \
/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).