From patchwork Thu Apr 6 09:42:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13203060 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 89A43C7618D for ; Thu, 6 Apr 2023 09:43:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2AB4A6B0093; Thu, 6 Apr 2023 05:43:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 25B5D6B0095; Thu, 6 Apr 2023 05:43:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0FBE46B0096; Thu, 6 Apr 2023 05:43:41 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id F07276B0093 for ; Thu, 6 Apr 2023 05:43:40 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id C717940EED for ; Thu, 6 Apr 2023 09:43:40 +0000 (UTC) X-FDA: 80650479000.23.B853223 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf14.hostedemail.com (Postfix) with ESMTP id 09A1310001C for ; Thu, 6 Apr 2023 09:43:38 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=CG+o9E2w; spf=pass (imf14.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1680774219; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=DWLW7zv5E95PcNMvzADLtZC4cFCYwscW+4auTp2qbuU=; b=vhJI4/9GBmyq5d9ig/k1LfWli3HeR3bVcX4gRIKrKR6sALRz2pZuXpFh55ErElW+9nLBqi qGeuzvDC4rqMA76j27xNEmwoxLWkLFd1JweAivpbcigs+2N2Pb1DIOitdNwzDLwnNn8iFl Fb+84zaEVKvlFulZyVMLsxIelJgnnzs= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=CG+o9E2w; spf=pass (imf14.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1680774219; a=rsa-sha256; cv=none; b=3ssn1zOdChqUP7uMPbGR7sSiMW7OmC0lXNHDieoUzRMF+f6JcaIP62swxeqGYAV5jkE0vQ MC3vQjSl42JWONKkUlf7FcL2wZ06CtMkfeycZfgB035oReuDUl2S1LS3p4tQYSxxkqzD7z Hw3Sn8Y0CkUt9d1nm8BaDlkK86tLjro= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680774218; 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: in-reply-to:in-reply-to:references:references; bh=DWLW7zv5E95PcNMvzADLtZC4cFCYwscW+4auTp2qbuU=; b=CG+o9E2w7pGI6SvEHXiiNl7yNDxDm+mQhNEu9/RWPrzsmENiRoJrrMta+ZVrph6N0yWhtq 5BGdfdUpJogwThO0PPaB+GtC5WGGw/d1JHFTQ3VWC17SDE0jK3whv9zp9s3IYrlODSkozP RIndp7lbNnXl8XMOQ9aXkin27gdGWAY= 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-44-vEeTLutcMDW3WDa_hFgwtA-1; Thu, 06 Apr 2023 05:43:31 -0400 X-MC-Unique: vEeTLutcMDW3WDa_hFgwtA-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0F9C2800B23; Thu, 6 Apr 2023 09:43:31 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id F03781121314; Thu, 6 Apr 2023 09:43:28 +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 , 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, David Ahern Subject: [PATCH net-next v5 13/19] ip, udp: Support MSG_SPLICE_PAGES Date: Thu, 6 Apr 2023 10:42:39 +0100 Message-Id: <20230406094245.3633290-14-dhowells@redhat.com> In-Reply-To: <20230406094245.3633290-1-dhowells@redhat.com> References: <20230406094245.3633290-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 09A1310001C X-Stat-Signature: fhegwosqarnzwkonmz9o385z3h6dos9g X-Rspam-User: X-HE-Tag: 1680774218-465566 X-HE-Meta: U2FsdGVkX1+Uj8hQLi2BDaHv0/PuSaEVttTRkLYfO80B12sVIg90jEOiXsOjl2LT3Hn72JFi3QHsAbDMSnFqhtVvsXj8Mnbuo3VnogEKlf16FD+w1Exe3ZMdqNA67oHVQp85LmEbPDOvCcUYOf1HDz8njSdwVK7pNzjd0oU5W7lq77GUDxy8p1rnofepo4hhcrJq8eoCRWZIIyGOt8taW16XXYy+avwjNYR8kFLLb121JkZ7UBHkyYq5ekIqPlFfc+xGAg2h7oHhJAkZAdGz0cdeHOKMnVXk42GUiQJNH6ZJsm1nbdp30imZlRiQvCBwVt0Ck99IXNJFhxPwSuLqouIcT/b82gI9YTqsKXkEu+IHqSSiwPVY3bOCj2B52i6dCvHWIQqPUq8Zu7PXTSmccIqfT1L3k32T84z2uu0bwPlgroXIOe0sBdf4Q6v6A1qyKxPJyumSGCK9F7caKKTENLwulN46DHG0eCJMn2CN/zmIz3RVG0orfh3/D9jNy7OE8D33kWRUQZ5RLJ65VaNI6Wa9DUYiBQw5Ofed74XzmWLmQxUObEKHOprnCJ9ngA833JB8EY0emwJV9sIDNLDMQUu2R+51iM3VP2kTp2aSsWugE+0f/rokPp6yl2IMzd7HcKkBn8sWa8KrnFJiY6WZSK/Nh20VxumgK0qleHROWU70TmYvYPk4nxVVdUHldqesK3DcgCu4e0qgLaS6vGFS2aW4CDRHh+Ouu0Jzzt9S+MVZKhJoC7du5iFWP6XCZzwjHXv4pQ1AapOeB3qTCf9y1QrjI1jJk042+G5WO432JJmvYLmavX5bU+mrXkhiJmQ7PWc4l7J3f/9J6gSQUSMtNDLEGYABtazAUrAejrSC+FNtXkxKA62Fxsl4MD/PYR49+59y6Cr/aOJd46dskPCjCBTW/b4JAI162QwYiMBJMAv3bBkSdP9l2W6cXAe2AXuzkEntCg1DzVhxz2j5/HP 56yFKSd5 RLmlYQ8co1gwgqfw2EOIhEClP2DQkUeb2WFlk97cLRl/rPf+Zm+VcSBACbj6GZxTfv12HyaLqP+97bFjmlKBBF7iFlTKcGs591+Rilx59IjoDIc3xvg61G+j6uVfw7piieKEIaw2aUPJ5wZPazzVSFDcEqPDnch99IuASYiS5VVnLdfczmORo8sLpcrd/2z9sg788hNE8O++Smh3f8AkS0yq/SeOCvkUrAGUMh5z3J6q6eFJ1zkamE/MbSI6fDoPGcVSkgKsY0ajHL3BsTsBeHUo7eRrqxIT7LPuQp04Laanx1eLOge2q9znT8rObtG+Iu2JouhrPFH3sWd5nfLgIowmDZzHnCVRaGICcK6ESfq/apzIWMhy1pImcgF+mPFd5MpPL16IWgMdw13Bm++ayoiOk4ATWGjwhlPQBZrsb2/WsP0ivf/pL8K99jmzboLefR4he7l1/gXNnpwux/OtTPxO08tEVTZBq2vSAkm7+zJCsSXI+Kd+S86jJ3TEc6SYWp1v2gllwCgdo0krcjA5JaYshHA== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Make IP/UDP sendmsg() support MSG_SPLICE_PAGES. This causes pages to be spliced from the source iterator. This allows ->sendpage() to be replaced by something that can handle multiple multipage folios in a single transaction. Signed-off-by: David Howells cc: Willem de Bruijn cc: David Ahern cc: "David S. Miller" cc: Eric Dumazet cc: Jakub Kicinski cc: Paolo Abeni cc: Jens Axboe cc: Matthew Wilcox cc: netdev@vger.kernel.org --- net/ipv4/ip_output.c | 47 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index 22a90a9392eb..c6c318eb3d37 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -957,6 +957,41 @@ csum_page(struct page *page, int offset, int copy) return csum; } +/* + * Add (or copy) data pages for MSG_SPLICE_PAGES. + */ +static int __ip_splice_pages(struct sock *sk, struct sk_buff *skb, + void *from, int *pcopy) +{ + struct msghdr *msg = from; + struct page *page = NULL, **pages = &page; + ssize_t copy = *pcopy; + size_t off; + int err; + + copy = iov_iter_extract_pages(&msg->msg_iter, &pages, copy, 1, 0, &off); + if (copy <= 0) + return copy ?: -EIO; + + err = skb_append_pagefrags(skb, page, off, copy); + if (err < 0) { + iov_iter_revert(&msg->msg_iter, copy); + return err; + } + + if (skb->ip_summed == CHECKSUM_NONE) { + __wsum csum; + + csum = csum_page(page, off, copy); + skb->csum = csum_block_add(skb->csum, csum, skb->len); + } + + skb_len_add(skb, copy); + refcount_add(copy, &sk->sk_wmem_alloc); + *pcopy = copy; + return 0; +} + static int __ip_append_data(struct sock *sk, struct flowi4 *fl4, struct sk_buff_head *queue, @@ -1048,6 +1083,14 @@ static int __ip_append_data(struct sock *sk, skb_zcopy_set(skb, uarg, &extra_uref); } } + } else if ((flags & MSG_SPLICE_PAGES) && length) { + if (inet->hdrincl) + return -EPERM; + if (rt->dst.dev->features & NETIF_F_SG) + /* We need an empty buffer to attach stuff to */ + paged = true; + else + flags &= ~MSG_SPLICE_PAGES; } cork->length += length; @@ -1207,6 +1250,10 @@ static int __ip_append_data(struct sock *sk, err = -EFAULT; goto error; } + } else if (flags & MSG_SPLICE_PAGES) { + err = __ip_splice_pages(sk, skb, from, ©); + if (err < 0) + goto error; } else if (!zc) { int i = skb_shinfo(skb)->nr_frags;