From 4ebcf2b47aea7f7ef4bfa09f43fdb3f16194de14 Mon Sep 17 00:00:00 2001 From: Dave Wysochanski Date: Wed, 26 Jun 2019 16:30:24 -0400 Subject: [PATCH 2540/2944] SUNRPC: Fix possible autodisconnect during connect due to old last_used to #32918330 commit 80d3c45fd765fbf4f10981b60ff6b1384bdbc706 upstream Ensure last_used is updated before calling mod_timer inside xprt_schedule_autodisconnect. This avoids a possible xprt_autoclose firing immediately after a successful connect when xprt_unlock_connect calls xprt_schedule_autodisconnect with an old value of last_used. Signed-off-by: Dave Wysochanski Signed-off-by: Trond Myklebust Acked-by: Joseph Qi Signed-off-by: Eryu Guan --- net/sunrpc/xprt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c index 5e7c13a..793f595 100644 --- a/net/sunrpc/xprt.c +++ b/net/sunrpc/xprt.c @@ -692,6 +692,7 @@ void xprt_conditional_disconnect(struct rpc_xprt *xprt, unsigned int cookie) xprt_schedule_autodisconnect(struct rpc_xprt *xprt) __must_hold(&xprt->transport_lock) { + xprt->last_used = jiffies; if (list_empty(&xprt->recv) && xprt_has_timer(xprt)) mod_timer(&xprt->timer, xprt->last_used + xprt->idle_timeout); } @@ -1378,7 +1379,6 @@ void xprt_release(struct rpc_task *task) xprt->ops->release_xprt(xprt, task); if (xprt->ops->release_request) xprt->ops->release_request(task); - xprt->last_used = jiffies; xprt_schedule_autodisconnect(xprt); spin_unlock_bh(&xprt->transport_lock); if (req->rq_buffer) -- 1.8.3.1