| Message ID | 20230522121125.2595254-1-dhowells@redhat.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | splice, net: Replace sendpage with sendmsg(MSG_SPLICE_PAGES), part 1 | expand |
Hello: This series was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Mon, 22 May 2023 13:11:09 +0100 you wrote: > Here's the first tranche of patches towards providing a MSG_SPLICE_PAGES > internal sendmsg flag that is intended to replace the ->sendpage() op with > calls to sendmsg(). MSG_SPLICE_PAGES is a hint that tells the protocol > that it should splice the pages supplied if it can and copy them if not. > > This will allow splice to pass multiple pages in a single call and allow > certain parts of higher protocols (e.g. sunrpc, iwarp) to pass an entire > message in one go rather than having to send them piecemeal. This should > also make it easier to handle the splicing of multipage folios. > > [...] Here is the summary with links: - [net-next,v10,01/16] net: Declare MSG_SPLICE_PAGES internal sendmsg() flag https://git.kernel.org/netdev/net-next/c/b841b901c452 - [net-next,v10,02/16] net: Pass max frags into skb_append_pagefrags() https://git.kernel.org/netdev/net-next/c/96449f902407 - [net-next,v10,03/16] net: Add a function to splice pages into an skbuff for MSG_SPLICE_PAGES https://git.kernel.org/netdev/net-next/c/2e910b95329c - [net-next,v10,04/16] tcp: Support MSG_SPLICE_PAGES https://git.kernel.org/netdev/net-next/c/270a1c3de47e - [net-next,v10,05/16] tcp: Convert do_tcp_sendpages() to use MSG_SPLICE_PAGES https://git.kernel.org/netdev/net-next/c/c5c37af6ecad - [net-next,v10,06/16] tcp_bpf: Inline do_tcp_sendpages as it's now a wrapper around tcp_sendmsg https://git.kernel.org/netdev/net-next/c/ebf2e8860eea - [net-next,v10,07/16] espintcp: Inline do_tcp_sendpages() https://git.kernel.org/netdev/net-next/c/7f8816ab4bae - [net-next,v10,08/16] tls: Inline do_tcp_sendpages() https://git.kernel.org/netdev/net-next/c/e117dcfd646e - [net-next,v10,09/16] siw: Inline do_tcp_sendpages() https://git.kernel.org/netdev/net-next/c/c2ff29e99a76 - [net-next,v10,10/16] tcp: Fold do_tcp_sendpages() into tcp_sendpage_locked() https://git.kernel.org/netdev/net-next/c/5367f9bbb86a - [net-next,v10,11/16] ip, udp: Support MSG_SPLICE_PAGES https://git.kernel.org/netdev/net-next/c/7da0dde68486 - [net-next,v10,12/16] ip6, udp6: Support MSG_SPLICE_PAGES https://git.kernel.org/netdev/net-next/c/6d8192bd69bb - [net-next,v10,13/16] udp: Convert udp_sendpage() to use MSG_SPLICE_PAGES https://git.kernel.org/netdev/net-next/c/7ac7c987850c - [net-next,v10,14/16] ip: Remove ip_append_page() https://git.kernel.org/netdev/net-next/c/c49cf2663291 - [net-next,v10,15/16] af_unix: Support MSG_SPLICE_PAGES https://git.kernel.org/netdev/net-next/c/a0dbf5f818f9 - [net-next,v10,16/16] unix: Convert unix_stream_sendpage() to use MSG_SPLICE_PAGES https://git.kernel.org/netdev/net-next/c/57d44a354a43 You are awesome, thank you!
Here's the first tranche of patches towards providing a MSG_SPLICE_PAGES internal sendmsg flag that is intended to replace the ->sendpage() op with calls to sendmsg(). MSG_SPLICE_PAGES is a hint that tells the protocol that it should splice the pages supplied if it can and copy them if not. This will allow splice to pass multiple pages in a single call and allow certain parts of higher protocols (e.g. sunrpc, iwarp) to pass an entire message in one go rather than having to send them piecemeal. This should also make it easier to handle the splicing of multipage folios. A helper, skb_splice_from_iter() is provided to do the work of splicing or copying data from an iterator. If a page is determined to be unspliceable (such as being in the slab), then the helper will give an error. Note that this facility is not made available to userspace and does not provide any sort of callback. This set consists of the following parts: (1) Define the MSG_SPLICE_PAGES flag and prevent sys_sendmsg() from being able to set it. (2) Add an extra argument to skb_append_pagefrags() so that something other than MAX_SKB_FRAGS can be used (sysctl_max_skb_frags for example). (3) Add the skb_splice_from_iter() helper to handle splicing pages into skbuffs for MSG_SPLICE_PAGES that can be shared by TCP, IP/UDP and AF_UNIX. (4) Implement MSG_SPLICE_PAGES support in TCP. (5) Make do_tcp_sendpages() just wrap sendmsg() and then fold it in to its various callers. (6) Implement MSG_SPLICE_PAGES support in IP and make udp_sendpage() just a wrapper around sendmsg(). (7) Implement MSG_SPLICE_PAGES support in IP6/UDP6. (8) Implement MSG_SPLICE_PAGES support in AF_UNIX. (9) Make AF_UNIX copy unspliceable pages. I've pushed the patches here also: https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git/log/?h=sendpage-1 The follow-on patches are on branch iov-sendpage on the same tree. David Changes ======= ver #10) - Rebase. - Fix patch subject to refer to unix_stream_sendpage() not udp_sendpage(). ver #9) - Fix a merge conflict with commit eea96a3e2c909. ver #8) - Order local variables in reverse xmas tree order. - Remove duplicate coalescence check. - Warn if sendpage_ok() fails. ver #7) - Rebase after merge window. - In ____sys_sendmsg(), clear internal flags before setting msg_flags. - Clear internal flags in uring io_send{,_zc}(). - Export skb_splice_from_iter(). - Missed changing a "zc = 1" in tcp_sendmsg_locked(). - Remove now-unused csum_page() from UDP. - Add a patch to make AF_UNIX sendpage() just a wrapper around sendmsg(). - Return an error if !sendpage_ok() rather than copying for now. - Drop the page frag allocator patches for the moment. ver #6) - Removed a couple of leftover page pointer declarations. - In TCP, set zc to 0/MSG_ZEROCOPY/MSG_SPLICE_PAGES rather than 0/1/2. - Add a max-frags argument to skb_append_pagefrags(). - Extract the AF_UNIX helper out into a common helper and use it for IP/UDP and TCP too. - udp_sendpage() shouldn't lock the socket around udp_sendmsg(). - udp_sendpage() should only set MSG_MORE if MSG_SENDPAGE_NOTLAST is set. - In siw, don't clear MSG_SPLICE_PAGES on the last page. ver #5) - Dropped the samples patch as it causes lots of failures in the patchwork 32-bit builds due to apparent libc userspace header issues. - Made the pagefrag alloc patches alter the Google gve driver too. - Rearranged the patches to put the support in IP before altering UDP. ver #4) - Added some sample socket-I/O programs into samples/net/. - Fix a missing page-get in AF_KCM. - Init the sgtable and mark the end in AF_ALG when calling netfs_extract_iter_to_sg(). - Add a destructor func for page frag caches prior to generalising it and making it per-cpu. ver #3) - Dropped the iterator-of-iterators patch. - Only expunge MSG_SPLICE_PAGES in sys_send[m]msg, not sys_recv[m]msg. - Split MSG_SPLICE_PAGES code in __ip_append_data() out into helper functions. - Implement MSG_SPLICE_PAGES support in __ip6_append_data() using the above helper functions. - Rename 'xlength' to 'initial_length'. - Minimise the changes to sunrpc for the moment. - Don't give -EOPNOTSUPP if NETIF_F_SG not available, just copy instead. - Implemented MSG_SPLICE_PAGES support in the TLS, Chelsio-TLS and AF_KCM code. ver #2) - Overhauled the page_frag_alloc() allocator: large folios and per-cpu. - Got rid of my own zerocopy allocator. - Use iov_iter_extract_pages() rather poking in iter->bvec. - Made page splicing fall back to page copying on a page-by-page basis. - Made splice_to_socket() pass 16 pipe buffers at a time. - Made AF_ALG/hash use finup/digest where possible in sendmsg. - Added an iterator-of-iterators, ITER_ITERLIST. - Made sunrpc use the iterator-of-iterators. - Converted more drivers. Link: https://lore.kernel.org/r/20230316152618.711970-1-dhowells@redhat.com/ # v1 Link: https://lore.kernel.org/r/20230329141354.516864-1-dhowells@redhat.com/ # v2 Link: https://lore.kernel.org/r/20230331160914.1608208-1-dhowells@redhat.com/ # v3 Link: https://lore.kernel.org/r/20230405165339.3468808-1-dhowells@redhat.com/ # v4 Link: https://lore.kernel.org/r/20230406094245.3633290-1-dhowells@redhat.com/ # v5 Link: https://lore.kernel.org/r/20230411160902.4134381-1-dhowells@redhat.com/ # v6 Link: https://lore.kernel.org/r/20230515093345.396978-1-dhowells@redhat.com/ # v7 Link: https://lore.kernel.org/r/20230518113453.1350757-1-dhowells@redhat.com/ # v8 David Howells (16): net: Declare MSG_SPLICE_PAGES internal sendmsg() flag net: Pass max frags into skb_append_pagefrags() net: Add a function to splice pages into an skbuff for MSG_SPLICE_PAGES tcp: Support MSG_SPLICE_PAGES tcp: Convert do_tcp_sendpages() to use MSG_SPLICE_PAGES tcp_bpf: Inline do_tcp_sendpages as it's now a wrapper around tcp_sendmsg espintcp: Inline do_tcp_sendpages() tls: Inline do_tcp_sendpages() siw: Inline do_tcp_sendpages() tcp: Fold do_tcp_sendpages() into tcp_sendpage_locked() ip, udp: Support MSG_SPLICE_PAGES ip6, udp6: Support MSG_SPLICE_PAGES udp: Convert udp_sendpage() to use MSG_SPLICE_PAGES ip: Remove ip_append_page() af_unix: Support MSG_SPLICE_PAGES unix: Convert unix_stream_sendpage() to use MSG_SPLICE_PAGES drivers/infiniband/sw/siw/siw_qp_tx.c | 17 +- include/linux/skbuff.h | 5 +- include/linux/socket.h | 3 + include/net/ip.h | 2 - include/net/tcp.h | 2 - include/net/tls.h | 2 +- io_uring/net.c | 2 + net/core/skbuff.c | 92 ++++++++++- net/ipv4/ip_output.c | 164 +++----------------- net/ipv4/tcp.c | 214 ++++++-------------------- net/ipv4/tcp_bpf.c | 20 ++- net/ipv4/udp.c | 51 +----- net/ipv6/ip6_output.c | 17 ++ net/socket.c | 2 + net/tls/tls_main.c | 24 +-- net/unix/af_unix.c | 183 +++++----------------- net/xfrm/espintcp.c | 10 +- 17 files changed, 278 insertions(+), 532 deletions(-)