Skip to contentSkip to conversation

SUNRPC: Fix possible autodisconnect during connect due to stale last_used

PATCH In review Dave Wysochanski 2 participants 4 messages Jun 26, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 SUNRPC: Fix possible autodisconnect during connect due to stale last_used

When a connection is successful ensure last_used is updated before calling xprt_schedule_autodisconnect inside xprt_unlock_connect. This avoids a possible xprt_autoclose firing immediately after connect sequence due to an old value of last_used given to mod_timer in xprt_schedule_autodisconnect.

---
 net/sunrpc/xprt.c | 1 +
 1 file changed, 1 insertion(+)
net/sunrpc/xprt.c +1 -0
index f6c82b1..fceaede 100644
@@ -800,6 +800,7 @@ void xprt_unlock_connect(struct rpc_xprt *xprt, void *cookie)
 		goto out;
 	xprt->snd_task =NULL;
 	xprt->ops->release_xprt(xprt, NULL);
+	xprt->last_used = jiffies;
 	xprt_schedule_autodisconnect(xprt);
 out:
 	spin_unlock_bh(&xprt->transport_lock);
Signature · 1 line
1.8.3.1
#1 lore raw
Quoted 26 lines · Dave Wysochanski

When a connection is successful ensure last_used is updated before calling
xprt_schedule_autodisconnect inside xprt_unlock_connect. This avoids a
possible xprt_autoclose firing immediately after connect sequence due to
an old value of last_used given to mod_timer in xprt_schedule_autodisconnect.

---
 net/sunrpc/xprt.c | 1 +
 1 file changed, 1 insertion(+)
net/sunrpc/xprt.c +1 -0
index f6c82b1..fceaede 100644
@@ -800,6 +800,7 @@ void xprt_unlock_connect(struct rpc_xprt *xprt,
 void *cookie)
 		goto out;
 	xprt->snd_task =NULL;
 	xprt->ops->release_xprt(xprt, NULL);
+	xprt->last_used = jiffies;
 	xprt_schedule_autodisconnect(xprt);
 out:
Quoted 1 line

spin_unlock_bh(&xprt->transport_lock);

Let's just move that line into xprt_schedule_autodisconnect(), since in practice this means all callers are doing the same thing.

Signature · 3 lines
Trond Myklebust
Linux NFS client maintainer, Hammerspace
[email protected]
#2 lore raw
Quoted 26 lines · Trond Myklebust
Quoted 25 lines · Dave Wysochanski

When a connection is successful ensure last_used is updated before calling
xprt_schedule_autodisconnect inside xprt_unlock_connect. This avoids
a
possible xprt_autoclose firing immediately after connect sequence due
to
an old value of last_used given to mod_timer in xprt_schedule_autodisconnect.

---
 net/sunrpc/xprt.c | 1 +
 1 file changed, 1 insertion(+)
net/sunrpc/xprt.c +0 -0
index f6c82b1..fceaede 100644
@@ -800,6 +800,7 @@ void xprt_unlock_connect(struct rpc_xprt *xprt,
 void *cookie)
 		goto out;
 	xprt->snd_task =NULL;
 	xprt->ops->release_xprt(xprt, NULL);
Quoted 10 lines
Quoted 4 lines
net/sunrpc/xprt.c +1 -0
+	xprt->last_used = jiffies;
 	xprt_schedule_autodisconnect(xprt);
 out:

spin_unlock_bh(&xprt->transport_lock);

Let's just move that line into xprt_schedule_autodisconnect(), since in
practice this means all callers are doing the same thing.

Will do and resubmit - thanks!

#3 lore raw

PATCH 1/1 SUNRPC: Fix possible autodisconnect during connect due to old last_used

In reply to Trond Myklebust

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.

---
 net/sunrpc/xprt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/sunrpc/xprt.c +1 -1
index f6c82b1..871b904 100644
@@ -750,6 +750,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 (RB_EMPTY_ROOT(&xprt->recv_queue) && xprt_has_timer(xprt))
 		mod_timer(&xprt->timer, xprt->last_used + xprt->idle_timeout);
 }
@@ -1774,7 +1775,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)
Signature · 1 line
1.8.3.1