Simplify the RPC client socket transmit code
Subsystems (3)
cover Simplify the RPC client socket transmit code
Simplify the RPC socket transmission code by switching to using the iov_iter functionality. The main gain is that we avoid the need to take the socket lock on each call to sendpage(): in the common case of a 1MB WRITE rpc call using 4k page sizes, that means we go from 256 calls to sendpage(), each of which takes the socket lock and releases it, to just 1 call to sock_sendmsg().
Trond Myklebust (4):
SUNRPC: Convert xs_send_kvec() to use iov_iter_kvec()
SUNRPC: Convert socket page send code to use iov_iter()
SUNRPC: Further cleanups of xs_sendpages()
SUNRPC: Remove the redundant 'zerocopy' argument to xs_sendpages()
net/sunrpc/xprt.c | 1 + net/sunrpc/xprtsock.c | 106 +++++++++++++++--------------------------- 2 files changed, 38 insertions(+), 69 deletions(-)
Signature · 1 line
2.20.1
PATCH 1/4 SUNRPC: Convert xs_send_kvec() to use iov_iter_kvec()
Prepare to the socket transmission code to use iov_iter.
--- net/sunrpc/xprtsock.c | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-)
net/sunrpc/xprtsock.c +23 -15
@@ -726,21 +726,21 @@ xs_stream_reset_connect(struct sock_xprt *transport)#define XS_SENDMSG_FLAGS (MSG_DONTWAIT | MSG_NOSIGNAL) -static int xs_send_kvec (struct socket *sock,struct sockaddr *addr,int addrlen,struct kvec *vec,unsigned int base,int more) +static int xs_sendmsg (struct socket *sock,struct msghdr *msg,size_t seek) { -struct msghdr msg = { - .msg_name = addr, - .msg_namelen = addrlen, - .msg_flags =XS_SENDMSG_FLAGS | (more ?MSG_MORE :0 ), - }; -struct kvec iov = { - .iov_base = vec->iov_base + base, - .iov_len = vec->iov_len - base, - }; +if (seek) +iov_iter_advance (&msg->msg_iter, seek); +return sock_sendmsg (sock, msg); +} -if (iov.iov_len !=0 ) -return kernel_sendmsg (sock, &msg, &iov,1 , iov.iov_len); -return kernel_sendmsg (sock, &msg,NULL ,0 ,0 ); +static int xs_send_kvec (struct socket *sock,struct msghdr *msg,struct kvec *vec,size_t seek) +{ +if (!vec) { +iov_iter_kvec (&msg->msg_iter,WRITE ,NULL ,0 ,0 ); +return sock_sendmsg (sock, msg); + } +iov_iter_kvec (&msg->msg_iter,WRITE , vec,1 , vec->iov_len); +return xs_sendmsg (sock, msg, seek); }static int xs_send_pagedata (struct socket *sock,struct xdr_buf *xdr,unsigned int base,int more,bool zerocopy,int *sent_p)
@@ -794,6 +794,11 @@ static int xs_send_pagedata(struct socket *sock, struct xdr_buf *xdr, unsigned i*/ static int xs_sendpages (struct socket *sock,struct sockaddr *addr,int addrlen,struct xdr_buf *xdr,unsigned int base,bool zerocopy,int *sent_p) { +struct msghdr msg = { + .msg_name = addr, + .msg_namelen = addrlen, + .msg_flags =XS_SENDMSG_FLAGS |MSG_MORE , + };unsigned int remainder = xdr->len - base;int err =0 ;int sent =0 ;
@@ -809,7 +814,9 @@ static int xs_sendpages(struct socket *sock, struct sockaddr *addr, int addrlen,if (base < xdr->head[0 ].iov_len || addr !=NULL ) {unsigned int len = xdr->head[0 ].iov_len - base; remainder -= len; - err =xs_send_kvec (sock, addr, addrlen, &xdr->head[0 ], base, remainder !=0 ); +if (remainder ==0 ) + msg.msg_flags &= ~MSG_MORE ; + err =xs_send_kvec (sock, &msg, &xdr->head[0 ], base);if (remainder ==0 || err != len) goto out; *sent_p += err;
@@ -830,7 +837,8 @@ static int xs_sendpages(struct socket *sock, struct sockaddr *addr, int addrlen,if (base >= xdr->tail[0 ].iov_len)return 0 ; - err =xs_send_kvec (sock,NULL ,0 , &xdr->tail[0 ], base,0 ); + msg.msg_flags &= ~MSG_MORE ; + err =xs_send_kvec (sock, &msg, &xdr->tail[0 ], base); out:if (err >0 ) { *sent_p += err;
Signature · 1 line
2.20.1
PATCH 2/4 SUNRPC: Convert socket page send code to use iov_iter()
Simplify the page send code using iov_iter and bvecs.
--- net/sunrpc/xprt.c | 1 + net/sunrpc/xprtsock.c | 49 ++++++++++++------------------------------- 2 files changed, 14 insertions(+), 36 deletions(-)
net/sunrpc/xprt.c +1 -0
@@ -1723,6 +1723,7 @@ void xprt_release(struct rpc_task *task) xprt->ops->buf_free (task);xprt_inject_disconnect (xprt);xdr_free_bvec (&req->rq_rcv_buf); +xdr_free_bvec (&req->rq_snd_buf);if (req->rq_cred !=NULL )put_rpccred (req->rq_cred); task->tk_rqstp =NULL ;
net/sunrpc/xprtsock.c +13 -36
72 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH 3/4 SUNRPC: Further cleanups of xs_sendpages()
Now that we send the pages using a struct msghdr, instead of using sendpage(), we no longer need to 'prime the socket' with an address for unconnected UDP messages.
--- net/sunrpc/xprtsock.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)
net/sunrpc/xprtsock.c +1 -10
@@ -735,10 +735,6 @@ static int xs_sendmsg(struct socket *sock, struct msghdr *msg, size_t seek)static int xs_send_kvec (struct socket *sock,struct msghdr *msg,struct kvec *vec,size_t seek) { -if (!vec) { -iov_iter_kvec (&msg->msg_iter,WRITE ,NULL ,0 ,0 ); -return sock_sendmsg (sock, msg); - }iov_iter_kvec (&msg->msg_iter,WRITE , vec,1 , vec->iov_len);return xs_sendmsg (sock, msg, seek); }
@@ -781,12 +777,7 @@ static int xs_sendpages(struct socket *sock, struct sockaddr *addr, int addrlen,if (unlikely (!sock))return -ENOTSOCK ; -if (base !=0 ) { - addr =NULL ; - addrlen =0 ; - } - -if (base < xdr->head[0 ].iov_len || addr !=NULL ) { +if (base < xdr->head[0 ].iov_len) {unsigned int len = xdr->head[0 ].iov_len - base; remainder -= len;if (remainder ==0 )
Signature · 1 line
2.20.1
PATCH 4/4 SUNRPC: Remove the redundant 'zerocopy' argument to xs_sendpages()
--- net/sunrpc/xprtsock.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-)
net/sunrpc/xprtsock.c +4 -12
@@ -760,11 +760,10 @@ static int xs_send_pagedata(struct socket *sock, struct msghdr *msg, struct xdr_* @addrlen: UDP only -- length of destination address * @xdr: buffer containing this request * @base: starting position in the buffer -* @zerocopy: true if it is safe to use sendpage() * @sent_p: return the total number of bytes successfully queued for sending * */ -static int xs_sendpages (struct socket *sock,struct sockaddr *addr,int addrlen,struct xdr_buf *xdr,unsigned int base,bool zerocopy,int *sent_p) +static int xs_sendpages (struct socket *sock,struct sockaddr *addr,int addrlen,struct xdr_buf *xdr,unsigned int base,int *sent_p) {struct msghdr msg = { .msg_name = addr,
@@ -919,7 +918,7 @@ static int xs_local_send_request(struct rpc_rqst *req) req->rq_xtime =ktime_get (); status =xs_sendpages (transport->sock,NULL ,0 , xdr, transport->xmit.offset, - true, &sent); + &sent);dprintk ("RPC: %s(%u) = %d\n" , __func__, xdr->len - transport->xmit.offset, status);
@@ -986,7 +985,7 @@ static int xs_udp_send_request(struct rpc_rqst *req) req->rq_xtime =ktime_get (); status =xs_sendpages (transport->sock,xs_addr (xprt), xprt->addrlen, - xdr,0 , true, &sent); + xdr,0 , &sent);dprintk ("RPC: xs_udp_send_request(%u) = %d\n" , xdr->len, status);
@@ -1050,7 +1049,6 @@ static int xs_tcp_send_request(struct rpc_rqst *req)struct rpc_xprt *xprt = req->rq_xprt; struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt);struct xdr_buf *xdr = &req->rq_snd_buf; -bool zerocopy = true;bool vm_wait = false;int status;int sent;
@@ -1067,12 +1065,6 @@ static int xs_tcp_send_request(struct rpc_rqst *req)xs_pktdump ("packet data:" , req->rq_svec->iov_base, req->rq_svec->iov_len); -/* Don't use zero copy if this is a resend. If the RPC call -* completes while the socket holds a reference to the pages, -* then we may end up resending corrupted data. -*/ -if (req->rq_task->tk_flags &RPC_TASK_SENT ) - zerocopy = false;if (test_bit (XPRT_SOCK_UPD_TIMEOUT , &transport->sock_state))xs_tcp_set_socket_timeouts (xprt, transport->sock);
@@ -1085,7 +1077,7 @@ static int xs_tcp_send_request(struct rpc_rqst *req) sent =0 ; status =xs_sendpages (transport->sock,NULL ,0 , xdr, transport->xmit.offset, - zerocopy, &sent); + &sent);dprintk ("RPC: xs_tcp_send_request(%u) = %d\n" , xdr->len - transport->xmit.offset, status);
Signature · 1 line
2.20.1