xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SUNRPC/xprtrdma: Fix reconnection locking

Browse Source 
[ Upstream commit f99fa50880f5300fbbb3c0754ddc7f8738d24fe7 ]

The xprtrdma client code currently relies on the task that initiated the
connect to hold the XPRT_LOCK for the duration of the connection
attempt. If the task is woken early, due to some other event, then that
lock could get released early.
Avoid races by using the same mechanism that the socket code uses of
transferring lock ownership to the RDMA connect worker itself. That
frees us to call rpcrdma_xprt_disconnect() directly since we're now
guaranteed exclusion w.r.t. other callers.

Fixes: 4cf44be6f1 ("xprtrdma: Fix recursion into rpcrdma_xprt_disconnect()")
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Trond Myklebust
2021-07-26 08:03:12 -04:00
committed by Greg Kroah-Hartman
parent f3d3016127
commit f19abe0463
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/sunrpc/xprt.c
View File

@@ -844,6 +844,7 @@ out:
spin_unlock(&xprt->transport_lock); spin_unlock(&xprt->transport_lock);
return ret; return ret;
} }
EXPORT_SYMBOL_GPL(xprt_lock_connect);
void xprt_unlock_connect(struct rpc_xprt *xprt, void *cookie) void xprt_unlock_connect(struct rpc_xprt *xprt, void *cookie)
{ {
@@ -860,6 +861,7 @@ out:
spin_unlock(&xprt->transport_lock); spin_unlock(&xprt->transport_lock);
wake_up_bit(&xprt->state, XPRT_LOCKED); wake_up_bit(&xprt->state, XPRT_LOCKED);
} }
EXPORT_SYMBOL_GPL(xprt_unlock_connect);
/** /**
* xprt_connect - schedule a transport connect operation * xprt_connect - schedule a transport connect operation

11
net/sunrpc/xprtrdma/transport.c
View File

@@ -249,12 +249,9 @@ xprt_rdma_connect_worker(struct work_struct *work)
xprt->stat.connect_start; xprt->stat.connect_start;
xprt_set_connected(xprt); xprt_set_connected(xprt);
rc = -EAGAIN; rc = -EAGAIN;
} else { } else
/* Force a call to xprt_rdma_close to clean up */ rpcrdma_xprt_disconnect(r_xprt);
spin_lock(&xprt->transport_lock); xprt_unlock_connect(xprt, r_xprt);
set_bit(XPRT_CLOSE_WAIT, &xprt->state);
spin_unlock(&xprt->transport_lock);
}
xprt_wake_pending_tasks(xprt, rc); xprt_wake_pending_tasks(xprt, rc);
} }
@@ -487,6 +484,8 @@ xprt_rdma_connect(struct rpc_xprt *xprt, struct rpc_task *task)
struct rpcrdma_ep *ep = r_xprt->rx_ep; struct rpcrdma_ep *ep = r_xprt->rx_ep;
unsigned long delay; unsigned long delay;
WARN_ON_ONCE(!xprt_lock_connect(xprt, task, r_xprt));
delay = 0; delay = 0;
if (ep && ep->re_connect_status != 0) { if (ep && ep->re_connect_status != 0) {
delay = xprt_reconnect_delay(xprt); delay = xprt_reconnect_delay(xprt);