hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SUNRPC: Take the transport send lock before binding+connecting 

Before trying to bind a port, ensure we grab the send lock to
ensure that we don't change the port while another task is busy
transmitting requests.
The connect code already takes the send lock in xprt_connect(),
but it is harmless to take it before that.

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
This commit is contained in:
Trond Myklebust 2019-03-10 12:22:39 -04:00
parent 009a82f643
commit 4d6c671ace
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/sunrpc/clnt.c
View File

@ -1867,6 +1867,9 @@ call_bind(struct rpc_task *task)
dprint_status(task); dprint_status(task);
task->tk_action = call_bind_status; task->tk_action = call_bind_status;
if (!xprt_prepare_transmit(task))
return;
task->tk_timeout = xprt->bind_timeout; task->tk_timeout = xprt->bind_timeout;
xprt->ops->rpcbind(task); xprt->ops->rpcbind(task);
} }
@ -1911,6 +1914,8 @@ call_bind_status(struct rpc_task *task)
task->tk_rebind_retry--; task->tk_rebind_retry--;
rpc_delay(task, 3*HZ); rpc_delay(task, 3*HZ);
goto retry_timeout; goto retry_timeout;
case -EAGAIN:
goto retry_timeout;
case -ETIMEDOUT: case -ETIMEDOUT:
dprintk("RPC: %5u rpcbind request timed out\n", dprintk("RPC: %5u rpcbind request timed out\n",
task->tk_pid); task->tk_pid);
@ -1952,7 +1957,7 @@ call_bind_status(struct rpc_task *task)
retry_timeout: retry_timeout:
task->tk_status = 0; task->tk_status = 0;
task->tk_action = call_encode; task->tk_action = call_bind;
rpc_check_timeout(task); rpc_check_timeout(task);
} }
@ -1986,6 +1991,8 @@ call_connect(struct rpc_task *task)
rpc_exit(task, -ENOTCONN); rpc_exit(task, -ENOTCONN);
return; return;
} }
if (!xprt_prepare_transmit(task))
return;
xprt_connect(task); xprt_connect(task);
} }