From patchwork Mon May 15 09:33:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 94039 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp6792091vqo; Mon, 15 May 2023 02:47:57 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4gWm4dJ7aa5MJaisC1OOAPq7x0qVvW3KTL+i/w6XVExVFNloQvlH+VwB19GRMyiqHglQaR X-Received: by 2002:a05:6a00:148b:b0:63b:7a55:ae89 with SMTP id v11-20020a056a00148b00b0063b7a55ae89mr46052785pfu.27.1684144076799; Mon, 15 May 2023 02:47:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684144076; cv=none; d=google.com; s=arc-20160816; b=SH6XSOGIWtND0bLDSYC11sah9sg+LfPJzRotVMYUivT/jU9ko8Raj5JXCaWofdbb1l 1i5NSbeIRCX1vMQ81UPQXDuBnEfjlEOH8O7YyRojKULLEzAx0IaA3vW8U0i1Yt9/SPAd Wdcq+BOAAVtSWVWfYg2oD8qkyIbAM+HxU8nFYzBCzm8Y20Db82JDM20XKjZLoJ7R0LPr 2wvSzVka8redRJ94z3Uv0kr/TnoR9BXzWgpV/SesDVKVnUU0q0XE6H60WFfLHXKMrzSn ceoLdTpMJljvNr5D7LiYA/1Ug7q9cpm98T32kqteTJ+CoAAf13JFqRgvhBYYOIVeGhhH zb3A== 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=Eq4mvKSuNDWHa2zwLNq1JuaWByUtKXP1IDBVFXpoW11iMnurctLnPhEDa6EvzDJnMn ZVMTWwsFvvt95jWhjH+WzPiIWtwY2/Xc5lc49OfolLUNFt7Iz2y+ljHJ4FsYDN2ViUOl +/dIB2SJBMFMbjS6w9Op0C1bqeH/Vw64QATuTBgosOVYFDvXQvvgswoIVRclZKwLU8YH N3u07qP3hLdv6B1hj46goFB6dqXrTG+S7rv6rxnGlljfYU5Z+um4hw1/lYe3Jf0UAn3k LYeP9t4H9Ri1GCWa+Fxb4zPTbFPCdLBTqEDlHQnLooX3iTEl2Whk4eO/EfPxqMWJ7TJu n0aw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=QmCtWFz2; 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 j20-20020a633c14000000b0051f8817a307si16630318pga.869.2023.05.15.02.47.44; Mon, 15 May 2023 02:47:56 -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=QmCtWFz2; 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 S240455AbjEOJg1 (ORCPT + 99 others); Mon, 15 May 2023 05:36:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39898 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238384AbjEOJfe (ORCPT ); Mon, 15 May 2023 05:35:34 -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 5917010D5 for ; Mon, 15 May 2023 02:34:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684143282; 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=QmCtWFz2sv4+4ExIDaBlxn9dlcRDT2+WnXn2Sn+ga/JB15WodCzxoJaazbksITpDA1XecD EmpbdVx3VFsgjHkTPcG/dndupWOV1YNlHEQnlJxmcoYaZZfDMmh3Gf/mQKIrdcYFZ1WYRl R9NXjVRySgzEW+xLbR/xMeqVyshqTcQ= 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-675-DqP9KNUYOT-s0mTetspL_g-1; Mon, 15 May 2023 05:34:39 -0400 X-MC-Unique: DqP9KNUYOT-s0mTetspL_g-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6ABAF891750; Mon, 15 May 2023 09:34:38 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.42.28.221]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8BC60C15BA0; Mon, 15 May 2023 09:34:35 +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 v7 11/16] ip, udp: Support MSG_SPLICE_PAGES Date: Mon, 15 May 2023 10:33:40 +0100 Message-Id: <20230515093345.396978-12-dhowells@redhat.com> In-Reply-To: <20230515093345.396978-1-dhowells@redhat.com> References: <20230515093345.396978-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 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?1765953058945144948?= X-GMAIL-MSGID: =?utf-8?q?1765953058945144948?= 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;