From patchwork Tue Apr 11 16:08:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 8027 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2690367vqo; Tue, 11 Apr 2023 09:11:29 -0700 (PDT) X-Google-Smtp-Source: AKy350atJ2RBb2yhOMWmbD3n9/HMhMEoZzMucwi440nkZz+tsLbR0MV5Hxg5lxrAebpaLwHuHHpG X-Received: by 2002:a17:906:3e5a:b0:94a:a419:f382 with SMTP id t26-20020a1709063e5a00b0094aa419f382mr5345442eji.12.1681229489732; Tue, 11 Apr 2023 09:11:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681229489; cv=none; d=google.com; s=arc-20160816; b=0xFf9ut9IpIdJA7OVBxEY0KQnsWmWQq31D0nQJSz+DwRuCCFo9gnsO+FDpPHcdh3VH 4xp6vM4w1qpVU/8W/7YBvcgomfQSXR+VP+/yskUWYacgurxd+aiBcYbKYurch2Wwvtuv QpZgvQV7q3db9EeqJjqF3ryaWX8c8BG9RX8hw5t8FjCt9jG3kH41lcf0dZavVg0X6zq1 wAFZp3wxh7MMo1oNT05nOlKD3naXt3lapaD+vt89Xl0PuKRnwUE2+Dpv6o6ns4urUeYI rDvqaHMKh3T+Cz2jzt/SsZRKzsTBWzfXlCXvQPrIg4jcqdB6jvA0XzvaHZOmc/W/P2DS Q9yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=vRGdhz3m7ACabuyRR5keSdTSASLOPiAnVwOIfnt3Q7w=; b=my6FFgEM5W8dyNqo1j8msGIVIj7lxVhbcQaWdM4FxyK82C1E+dnBQTVnB/tarMTxBb NH9S7vGbACLMVlHxiU+HAE1gHPG8jfsWEQ/NTkOGEuhrum2xRCWgL/xLINmCge8bzk7i 4FixC+BTX78i49uFpZhFE5fCHlXbf6c6OSzsb55Qf6nMs/PMCT7eccVQQn54GIgwRSlb XWFzWpzbiK4EgkxCiq8Ob28V/693gSbeWKIRTyoMbFqh3BvaBfXoQlf0ZmsPTG9OsBjP U4DYwqkcpu4ghlcb8rzY4Ds77JeG/HXJRAQWJlOTx0Oampr/PlXaenLN/j0/PpfmBEh+ bjjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=atxxC7QG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id rf20-20020a1709076a1400b0094a9d261016si1645376ejc.365.2023.04.11.09.11.04; Tue, 11 Apr 2023 09:11:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=atxxC7QG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229762AbjDKQKG (ORCPT + 99 others); Tue, 11 Apr 2023 12:10:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39270 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229909AbjDKQKA (ORCPT ); Tue, 11 Apr 2023 12:10:00 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D93652D53 for ; Tue, 11 Apr 2023 09:09:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1681229350; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=vRGdhz3m7ACabuyRR5keSdTSASLOPiAnVwOIfnt3Q7w=; b=atxxC7QG5qIZk3f2hkM0SmdyxKvUB0hEsbbI7F69ArnH1WDc61TWf5ig9usw1AFb3eme0a CwSQx/DgXJ2jQijMO51fLooQK7YmQqNerb5J6mPAucwSJjEUvF+WVSWRPYq/z4tFwRY5nf c7ujN3DnH3fBlakfvASrYOMszQW9so4= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-438-acUTLrbHP2ai0xnyujexlg-1; Tue, 11 Apr 2023 12:09:09 -0400 X-MC-Unique: acUTLrbHP2ai0xnyujexlg-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9DCD9101A551; Tue, 11 Apr 2023 16:09:07 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4ED7A47CDC; Tue, 11 Apr 2023 16:09:05 +0000 (UTC) From: David Howells To: netdev@vger.kernel.org Cc: David Howells , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Willem de Bruijn , David Ahern , Matthew Wilcox , Al Viro , Christoph Hellwig , Jens Axboe , Jeff Layton , Christian Brauner , Chuck Lever III , Linus Torvalds , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH net-next v6 00/18] splice, net: Replace sendpage with sendmsg(MSG_SPLICE_PAGES), part 1 Date: Tue, 11 Apr 2023 17:08:44 +0100 Message-Id: <20230411160902.4134381-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1762896893504850745?= X-GMAIL-MSGID: =?utf-8?q?1762896893504850745?= 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, then the helper will copy it into its own fragment. This puts the copying in a single place rather than in all the layers above TCP/UDP (such as sunrpc or siw), allowing them to include data in slab pages in a single sendmsg() wrapped around the data pages. 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) Overhaul the page_frag_alloc_align() allocator: (a) Split it out from mm/page_alloc.c into its own file, mm/page_frag_alloc.c. (b) Make it use multipage folios rather than compound pages. (c) Give it per-cpu buckets to allocate from so no locking is required. (d) The netdev_alloc_cache and the napi fragment cache are then cast in terms of this and some private allocators are removed. I'm not sure that the existing allocator is 100% thread safe. (3) 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). (4) 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. (5) Implement MSG_SPLICE_PAGES support in TCP. (6) Make do_tcp_sendpages() just wrap sendmsg() and then fold it in to its various callers. (7) Implement MSG_SPLICE_PAGES support in IP and make udp_sendpage() just a wrapper around sendmsg(). (8) Implement MSG_SPLICE_PAGES support in IP6/UDP6. (9) Implement MSG_SPLICE_PAGES support in AF_UNIX. (10) 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 #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 David Howells (18): net: Declare MSG_SPLICE_PAGES internal sendmsg() flag mm: Move the page fragment allocator from page_alloc.c into its own file mm: Make the page_frag_cache allocator use multipage folios mm: Make the page_frag_cache allocator use per-cpu 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 drivers/infiniband/sw/siw/siw_qp_tx.c | 17 +- drivers/net/ethernet/google/gve/gve.h | 1 - drivers/net/ethernet/google/gve/gve_main.c | 16 -- drivers/net/ethernet/google/gve/gve_rx.c | 2 +- drivers/net/ethernet/mediatek/mtk_wed_wo.c | 19 +- drivers/net/ethernet/mediatek/mtk_wed_wo.h | 2 - drivers/nvme/host/tcp.c | 19 +- drivers/nvme/target/tcp.c | 22 +-- include/linux/gfp.h | 17 +- include/linux/mm_types.h | 13 +- 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 +- mm/Makefile | 2 +- mm/page_alloc.c | 126 ------------ mm/page_frag_alloc.c | 201 +++++++++++++++++++ net/core/skbuff.c | 146 +++++++++++--- net/ipv4/ip_output.c | 153 ++------------- 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 | 51 +++-- net/xfrm/espintcp.c | 10 +- 28 files changed, 534 insertions(+), 625 deletions(-) create mode 100644 mm/page_frag_alloc.c