SUNRPC: Fix backchannel RPC soft lockups
commit6221f1d9b6
upstream. Currently, after the forward channel connection goes away, backchannel operations are causing soft lockups on the server because call_transmit_status's SOFTCONN logic ignores ENOTCONN. Such backchannel Calls are aggressively retried until the client reconnects. Backchannel Calls should use RPC_TASK_NOCONNECT rather than RPC_TASK_SOFTCONN. If there is no forward connection, the server is not capable of establishing a connection back to the client, thus that backchannel request should fail before the server attempts to send it. Commit58255a4e3c
("NFSD: NFSv4 callback client should use RPC_TASK_SOFTCONN") was merged several years before RPC_TASK_NOCONNECT was available. Because setup_callback_client() explicitly sets NOPING, the NFSv4.0 callback connection depends on the first callback RPC to initiate a connection to the client. Thus NFSv4.0 needs to continue to use RPC_TASK_SOFTCONN. Suggested-by: Trond Myklebust <trondmy@hammerspace.com> Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Cc: <stable@vger.kernel.org> # v4.20+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
d62d85260a
commit
7e69c9e6bb
|
@ -1241,6 +1241,7 @@ nfsd4_run_cb_work(struct work_struct *work)
|
||||||
container_of(work, struct nfsd4_callback, cb_work);
|
container_of(work, struct nfsd4_callback, cb_work);
|
||||||
struct nfs4_client *clp = cb->cb_clp;
|
struct nfs4_client *clp = cb->cb_clp;
|
||||||
struct rpc_clnt *clnt;
|
struct rpc_clnt *clnt;
|
||||||
|
int flags;
|
||||||
|
|
||||||
if (cb->cb_need_restart) {
|
if (cb->cb_need_restart) {
|
||||||
cb->cb_need_restart = false;
|
cb->cb_need_restart = false;
|
||||||
|
@ -1269,7 +1270,8 @@ nfsd4_run_cb_work(struct work_struct *work)
|
||||||
}
|
}
|
||||||
|
|
||||||
cb->cb_msg.rpc_cred = clp->cl_cb_cred;
|
cb->cb_msg.rpc_cred = clp->cl_cb_cred;
|
||||||
rpc_call_async(clnt, &cb->cb_msg, RPC_TASK_SOFT | RPC_TASK_SOFTCONN,
|
flags = clp->cl_minorversion ? RPC_TASK_NOCONNECT : RPC_TASK_SOFTCONN;
|
||||||
|
rpc_call_async(clnt, &cb->cb_msg, RPC_TASK_SOFT | flags,
|
||||||
cb->cb_ops ? &nfsd4_cb_ops : &nfsd4_cb_probe_ops, cb);
|
cb->cb_ops ? &nfsd4_cb_ops : &nfsd4_cb_probe_ops, cb);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1028,6 +1028,8 @@ static void svc_delete_xprt(struct svc_xprt *xprt)
|
||||||
|
|
||||||
dprintk("svc: svc_delete_xprt(%p)\n", xprt);
|
dprintk("svc: svc_delete_xprt(%p)\n", xprt);
|
||||||
xprt->xpt_ops->xpo_detach(xprt);
|
xprt->xpt_ops->xpo_detach(xprt);
|
||||||
|
if (xprt->xpt_bc_xprt)
|
||||||
|
xprt->xpt_bc_xprt->ops->close(xprt->xpt_bc_xprt);
|
||||||
|
|
||||||
spin_lock_bh(&serv->sv_lock);
|
spin_lock_bh(&serv->sv_lock);
|
||||||
list_del_init(&xprt->xpt_list);
|
list_del_init(&xprt->xpt_list);
|
||||||
|
|
|
@ -242,6 +242,8 @@ static void
|
||||||
xprt_rdma_bc_close(struct rpc_xprt *xprt)
|
xprt_rdma_bc_close(struct rpc_xprt *xprt)
|
||||||
{
|
{
|
||||||
dprintk("svcrdma: %s: xprt %p\n", __func__, xprt);
|
dprintk("svcrdma: %s: xprt %p\n", __func__, xprt);
|
||||||
|
|
||||||
|
xprt_disconnect_done(xprt);
|
||||||
xprt->cwnd = RPC_CWNDSHIFT;
|
xprt->cwnd = RPC_CWNDSHIFT;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -2714,6 +2714,7 @@ static int bc_send_request(struct rpc_rqst *req)
|
||||||
|
|
||||||
static void bc_close(struct rpc_xprt *xprt)
|
static void bc_close(struct rpc_xprt *xprt)
|
||||||
{
|
{
|
||||||
|
xprt_disconnect_done(xprt);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in New Issue