mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 02:39:48 +00:00
SUNRPC: Fix socket waits for write buffer space
[ Upstream commit 7496b59f58
]
The socket layer requires that we use the socket lock to protect changes
to the sock->sk_write_pending field and others.
Reported-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
b9c5ac0a15
commit
7a506fabcf
1 changed files with 42 additions and 18 deletions
|
@ -754,12 +754,12 @@ xs_stream_start_connect(struct sock_xprt *transport)
|
|||
/**
|
||||
* xs_nospace - handle transmit was incomplete
|
||||
* @req: pointer to RPC request
|
||||
* @transport: pointer to struct sock_xprt
|
||||
*
|
||||
*/
|
||||
static int xs_nospace(struct rpc_rqst *req)
|
||||
static int xs_nospace(struct rpc_rqst *req, struct sock_xprt *transport)
|
||||
{
|
||||
struct rpc_xprt *xprt = req->rq_xprt;
|
||||
struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt);
|
||||
struct rpc_xprt *xprt = &transport->xprt;
|
||||
struct sock *sk = transport->inet;
|
||||
int ret = -EAGAIN;
|
||||
|
||||
|
@ -770,16 +770,6 @@ static int xs_nospace(struct rpc_rqst *req)
|
|||
|
||||
/* Don't race with disconnect */
|
||||
if (xprt_connected(xprt)) {
|
||||
/* wait for more buffer space */
|
||||
sk->sk_write_pending++;
|
||||
xprt_wait_for_buffer_space(xprt);
|
||||
} else
|
||||
ret = -ENOTCONN;
|
||||
|
||||
spin_unlock(&xprt->transport_lock);
|
||||
|
||||
/* Race breaker in case memory is freed before above code is called */
|
||||
if (ret == -EAGAIN) {
|
||||
struct socket_wq *wq;
|
||||
|
||||
rcu_read_lock();
|
||||
|
@ -787,8 +777,42 @@ static int xs_nospace(struct rpc_rqst *req)
|
|||
set_bit(SOCKWQ_ASYNC_NOSPACE, &wq->flags);
|
||||
rcu_read_unlock();
|
||||
|
||||
sk->sk_write_space(sk);
|
||||
}
|
||||
/* wait for more buffer space */
|
||||
set_bit(SOCK_NOSPACE, &sk->sk_socket->flags);
|
||||
sk->sk_write_pending++;
|
||||
xprt_wait_for_buffer_space(xprt);
|
||||
} else
|
||||
ret = -ENOTCONN;
|
||||
|
||||
spin_unlock(&xprt->transport_lock);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int xs_sock_nospace(struct rpc_rqst *req)
|
||||
{
|
||||
struct sock_xprt *transport =
|
||||
container_of(req->rq_xprt, struct sock_xprt, xprt);
|
||||
struct sock *sk = transport->inet;
|
||||
int ret = -EAGAIN;
|
||||
|
||||
lock_sock(sk);
|
||||
if (!sock_writeable(sk))
|
||||
ret = xs_nospace(req, transport);
|
||||
release_sock(sk);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int xs_stream_nospace(struct rpc_rqst *req)
|
||||
{
|
||||
struct sock_xprt *transport =
|
||||
container_of(req->rq_xprt, struct sock_xprt, xprt);
|
||||
struct sock *sk = transport->inet;
|
||||
int ret = -EAGAIN;
|
||||
|
||||
lock_sock(sk);
|
||||
if (!sk_stream_memory_free(sk))
|
||||
ret = xs_nospace(req, transport);
|
||||
release_sock(sk);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
@ -878,7 +902,7 @@ static int xs_local_send_request(struct rpc_rqst *req)
|
|||
case -ENOBUFS:
|
||||
break;
|
||||
case -EAGAIN:
|
||||
status = xs_nospace(req);
|
||||
status = xs_stream_nospace(req);
|
||||
break;
|
||||
default:
|
||||
dprintk("RPC: sendmsg returned unrecognized error %d\n",
|
||||
|
@ -954,7 +978,7 @@ static int xs_udp_send_request(struct rpc_rqst *req)
|
|||
/* Should we call xs_close() here? */
|
||||
break;
|
||||
case -EAGAIN:
|
||||
status = xs_nospace(req);
|
||||
status = xs_sock_nospace(req);
|
||||
break;
|
||||
case -ENETUNREACH:
|
||||
case -ENOBUFS:
|
||||
|
@ -1069,7 +1093,7 @@ static int xs_tcp_send_request(struct rpc_rqst *req)
|
|||
/* Should we call xs_close() here? */
|
||||
break;
|
||||
case -EAGAIN:
|
||||
status = xs_nospace(req);
|
||||
status = xs_stream_nospace(req);
|
||||
break;
|
||||
case -ECONNRESET:
|
||||
case -ECONNREFUSED:
|
||||
|
|
Loading…
Reference in a new issue