From patchwork Thu May 18 13:07:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 95863 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp481545vqo; Thu, 18 May 2023 06:11:40 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4AjXPiYIhuggS3huKJWNYrC+fQTlH8VI3lDQcrsUg8lqSK2O4VBe6WRXabah0WCGN4yTDd X-Received: by 2002:a17:902:e5ce:b0:1ad:e3a8:3bf with SMTP id u14-20020a170902e5ce00b001ade3a803bfmr3105534plf.21.1684415499849; Thu, 18 May 2023 06:11:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684415499; cv=none; d=google.com; s=arc-20160816; b=YeBnPCSJBOLbWar9dLoDQAG8b7iEHWrXlQ1gPJNV5Yky9gVzPkQhuPwLd/MQCRkEo8 Kq8bDopK8W08Aqv1+KecKKq0yb2aMi5GHtlCsY3TZ4/+2ChkSNLWFCun1sOLqLPNcttE fILdxvCgk+wJldGfBpIZ7LQwgM6OlfBE9GUb+Wq6ywzJIZf/adJUU1N8rKjS2cycDXym KmTpnzG4ARBo5/+tC/s9tqt91m/xJ41s2p73FdezIj2aOK5OLipnCf9lAaVN0u+wY/6S CEbSPB9LSjYhNSdNnqLhsh9CqT2w4lBIvO+xk2/rnwOTcuOiBlTqXUdNTRYh7edqOd5U tR7A== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Di14zlocOEDECmKOzgXOEyS4sjRLATonTy1WJdIXAUU=; b=ymuBREOEy0C7iG5JEFQob3D/fyFZGGEIhOiIInWqx+M3mKYamzys1Vt5x6sOrAtryf ISRTlFRgbOzJcPw0h3gvUazt1OsfP00+TYqyg5TPM7Bj94upQIKQnCOS+zR9po+NflYA eAYD6aQNehnCH8gy5owfpg1FGLc0D3WejlTmpJctK8N2D/EKpe1tCHyK0W6dpFMLi8tB n4WeBFOPiu53S3hvLAFCcUhqzTvb1KSV8crh19DeTN2K9UkVJv7Ie1GAjEy63lZEUFOG XpnY93n4zEUtU5KjcUCKjFNBcrQ5GpJu2YRAOMF5FIv0kxadJc+oLh3SIjJJ/IZtcmSN PoRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=IZPfQphn; 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 jj2-20020a170903048200b001ab259969e7si1279098plb.31.2023.05.18.06.11.21; Thu, 18 May 2023 06:11:39 -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=IZPfQphn; 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 S231493AbjERNJw (ORCPT + 99 others); Thu, 18 May 2023 09:09:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41492 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231351AbjERNJS (ORCPT ); Thu, 18 May 2023 09:09:18 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A3028173D for ; Thu, 18 May 2023 06:08:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684415295; 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=Di14zlocOEDECmKOzgXOEyS4sjRLATonTy1WJdIXAUU=; b=IZPfQphnxvTxMtTbxTtjCHZJUQrTcR7Dv8VJuWWvOzvw7GkbZ4AOnljsqz4quz8vfHCiSd IN64I9ELnjCxoQUPnlclu6phuNyXDseh9aygXcQoh6glXYz0YyStdNpRhmFNeqQzXVluGr QrA5KqJZ2DQRwHgCcl2bNMEfxpEO4iE= 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-255-IupZrLRDOgiU6UQOydG1Gw-1; Thu, 18 May 2023 09:08:12 -0400 X-MC-Unique: IupZrLRDOgiU6UQOydG1Gw-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2621484AF2F; Thu, 18 May 2023 13:08:11 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.42.28.221]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0967F40C2063; Thu, 18 May 2023 13:08:07 +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 v9 11/16] ip, udp: Support MSG_SPLICE_PAGES Date: Thu, 18 May 2023 14:07:08 +0100 Message-Id: <20230518130713.1515729-12-dhowells@redhat.com> In-Reply-To: <20230518130713.1515729-1-dhowells@redhat.com> References: <20230518130713.1515729-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE 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?1766237667124973668?= X-GMAIL-MSGID: =?utf-8?q?1766237667124973668?= 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 --- Notes: ver #6) - Use common helper. net/ipv4/ip_output.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index 52fc840898d8..c7db973b5d29 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -1048,6 +1048,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 +1215,15 @@ static int __ip_append_data(struct sock *sk, err = -EFAULT; goto error; } + } else if (flags & MSG_SPLICE_PAGES) { + struct msghdr *msg = from; + + err = skb_splice_from_iter(skb, &msg->msg_iter, copy, + sk->sk_allocation); + if (err < 0) + goto error; + copy = err; + wmem_alloc_delta += copy; } else if (!zc) { int i = skb_shinfo(skb)->nr_frags;