sunrpc: set the bv_offset of first bvec in svc_tcp_sendmsg
Subsystems (4)
Jeff Layton
maintainerPATCH v2 1/1 sunrpc: set the bv_offset of first bvec in svc_tcp_sendmsg
svc_tcp_sendmsg used to factor in the xdr->page_base when sending pages, but 5df5dd03a8f7 dropped that part of the handling. Fix it by setting the bv_offset of the first bvec.
---
Changes in v2:
- limit the change to just svc_tcp_sendmsg
--- net/sunrpc/svcsock.c | 3 +++ 1 file changed, 3 insertions(+)
net/sunrpc/svcsock.c +3 -0
@@ -1244,6 +1244,9 @@ static int svc_tcp_sendmsg(struct socket *sock, struct xdr_buf *xdr,if (ret != head->iov_len) goto out; +if (xdr_buf_pagecount (xdr)) + xdr->bvec[0 ].bv_offset =offset_in_page (xdr->page_base); + msg.msg_flags =MSG_SPLICE_PAGES ;iov_iter_bvec (&msg.msg_iter,ITER_SOURCE , xdr->bvec,xdr_buf_pagecount (xdr), xdr->page_len);
---
base-commit: 2ccdd1b13c591d306f0401d98dedc4bdcd02b421
change-id: 20230814-sendpage-b04874eed249
Best regards,
Signature · 1 line
Jeff Layton <[email protected]>
Quoted 6 lines · Jeff Layton
svc_tcp_sendmsgused to factor in thexdr->page_basewhen sending pages, but5df5dd03a8f7dropped that part of the handling. Fix it by setting thebv_offsetof the first bvec.Fixes 5df5dd03a8f7 ("sunrpc: Use sendmsg(MSG_SPLICE_PAGES) rather then sendpage")Signed-off-by Jeff Layton <[email protected]>
LGTM. However, nfsd-fixes does not have 5df5dd03a8f7 because the previous nfsd-next was merged into v6.5 before David's MSG_SPLICE_PAGES work was merged.
Unless someone has a better suggestion, I'll rebase nfsd-fixes to v6.5-r6 and apply this fix to send to Linus.
Quoted 30 lines
---
Changes in v2:
- limit the change to justsvc_tcp_sendmsg--- net/sunrpc/svcsock.c | 3 +++ 1 file changed, 3 insertions(+)net/sunrpc/svcsock.c +3
-1@@ -1244,6 +1244,9 @@ static int svc_tcp_sendmsg(struct socket *sock, struct xdr_buf *xdr,if (ret != head->iov_len) goto out; +if (xdr_buf_pagecount (xdr)) + xdr->bvec[0 ].bv_offset =offset_in_page (xdr->page_base); + msg.msg_flags =MSG_SPLICE_PAGES ;iov_iter_bvec (&msg.msg_iter,ITER_SOURCE , xdr->bvec,xdr_buf_pagecount (xdr), xdr->page_len); ---base-commit:
2ccdd1b13c591d306f0401d98dedc4bdcd02b421
change-id: 20230814-sendpage-b04874eed249Best regards,
Signature · 1 line
Jeff Layton <[email protected]>
Signature · 1 line
Chuck Lever
Jeff Layton
maintainerQuoted 8 lines · Chuck Lever
Quoted 6 lines · Jeff Layton
svc_tcp_sendmsgused to factor in thexdr->page_basewhen sending pages, but5df5dd03a8f7dropped that part of the handling. Fix it by setting thebv_offsetof the first bvec.Fixes 5df5dd03a8f7 ("sunrpc: Use sendmsg(MSG_SPLICE_PAGES) rather then sendpage")Signed-off-by Jeff Layton <[email protected]>
Quoted 7 lines
LGTM. However, nfsd-fixes does not have
5df5dd03a8f7because the previous nfsd-next was merged into v6.5 before David'sMSG_SPLICE_PAGESwork was merged.Unless someone has a better suggestion, I'll rebase nfsd-fixes to v6.5-r6 and apply this fix to send to Linus.
ACK. That's probably safer than trying to pull in the big rework at the last minute.
Quoted 32 lines
Quoted 31 lines
---
Changes in v2:
- limit the change to justsvc_tcp_sendmsg--- net/sunrpc/svcsock.c | 3 +++ 1 file changed, 3 insertions(+)net/sunrpc/svcsock.c +3
-1@@ -1244,6 +1244,9 @@ static int svc_tcp_sendmsg(struct socket *sock, struct xdr_buf *xdr,if (ret != head->iov_len) goto out; +if (xdr_buf_pagecount (xdr)) + xdr->bvec[0 ].bv_offset =offset_in_page (xdr->page_base); + msg.msg_flags =MSG_SPLICE_PAGES ;iov_iter_bvec (&msg.msg_iter,ITER_SOURCE , xdr->bvec,xdr_buf_pagecount (xdr), xdr->page_len); ---base-commit:
2ccdd1b13c591d306f0401d98dedc4bdcd02b421
change-id: 20230814-sendpage-b04874eed249Best regards,
Signature · 1 line
Jeff Layton <[email protected]>
Signature · 1 line
Jeff Layton <[email protected]>