Message ID | 20230522121125.2595254-12-dhowells@redhat.com (mailing list archive) |
---|---|
State | New |
Headers | show
Return-Path: <owner-linux-mm@kvack.org> 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 90920C77B73 for <linux-mm@archiver.kernel.org>; Mon, 22 May 2023 12:12:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2CF1190000C; Mon, 22 May 2023 08:12:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 27F73900003; Mon, 22 May 2023 08:12:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 11FE590000C; Mon, 22 May 2023 08:12:21 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id F091B900003 for <linux-mm@kvack.org>; Mon, 22 May 2023 08:12:20 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id D23FC1609F4 for <linux-mm@kvack.org>; Mon, 22 May 2023 12:12:20 +0000 (UTC) X-FDA: 80817778440.02.83AB299 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf17.hostedemail.com (Postfix) with ESMTP id 1F1BE40015 for <linux-mm@kvack.org>; Mon, 22 May 2023 12:12:18 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=cul1hH2Z; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf17.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1684757539; 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=Di14zlocOEDECmKOzgXOEyS4sjRLATonTy1WJdIXAUU=; b=ql5QlqLjgsH2Uu7n8C5u7JwzxbpdqPGSxH+IUnFMDl2nPEzvI1sXMcgaplBLNHylF+kT9e xKDJkhY/PdOPKTwFAj09+kKI3CpQYR56o8KGImI4TCRHvM1OY/OL+BhbhWttk7KRJxMOWx 2jBqPqsp9NYTr0uIYH6rjphgCKm2T5I= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=cul1hH2Z; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf17.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684757539; a=rsa-sha256; cv=none; b=NXclWgAv0AmNEPht6jq9q/Ma20XK7qTJO7HWjH8z6zGATyNnIgAto/tmExq2cOwpFV7gkl f2sw3me8bUZydsaJJsGHfeDaNZ/8Xcx+PWu1ne38HRngxzfI04U4DaB7rvDP2f/DndA5eF hK+JwZF/eM8FW5PxffziLH3Du7J4eSE= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684757538; 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=cul1hH2ZjcACPvgRvbC7yUyba812B7cG0nlVmVZxlpIWux6lQdyw1drqQXvTRCrNx8qBKI VWtv1Q5ELX1Oo5k6013eHW/2PwmW9oIlK21QVZHjdHNgF6zRrQ39P7VPMsSaLcpch2xaPr 0Vv+/6Q6EGDHvvameWjEzSZ/XJ5mUhU= 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-389-i0ekLMi1P3uITGz1Ox_XFQ-1; Mon, 22 May 2023 08:12:11 -0400 X-MC-Unique: i0ekLMi1P3uITGz1Ox_XFQ-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 2602780349B; Mon, 22 May 2023 12:12:10 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.39.192.68]) by smtp.corp.redhat.com (Postfix) with ESMTP id 856907B7C; Mon, 22 May 2023 12:12:07 +0000 (UTC) From: David Howells <dhowells@redhat.com> To: netdev@vger.kernel.org Cc: David Howells <dhowells@redhat.com>, "David S. Miller" <davem@davemloft.net>, Eric Dumazet <edumazet@google.com>, Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>, Willem de Bruijn <willemdebruijn.kernel@gmail.com>, David Ahern <dsahern@kernel.org>, Matthew Wilcox <willy@infradead.org>, Al Viro <viro@zeniv.linux.org.uk>, Christoph Hellwig <hch@infradead.org>, Jens Axboe <axboe@kernel.dk>, Jeff Layton <jlayton@kernel.org>, Christian Brauner <brauner@kernel.org>, Chuck Lever III <chuck.lever@oracle.com>, Linus Torvalds <torvalds@linux-foundation.org>, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH net-next v10 11/16] ip, udp: Support MSG_SPLICE_PAGES Date: Mon, 22 May 2023 13:11:20 +0100 Message-Id: <20230522121125.2595254-12-dhowells@redhat.com> In-Reply-To: <20230522121125.2595254-1-dhowells@redhat.com> References: <20230522121125.2595254-1-dhowells@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Rspamd-Queue-Id: 1F1BE40015 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: 8spymjftuuw3sou39kfu4c4h58x5gt36 X-HE-Tag: 1684757538-741142 X-HE-Meta: U2FsdGVkX19Br/l4ZSjjv5AqhX0IGZZ8rFOs+5D892nS2gy8AfSDQ7WyPZdXiGpmSpS0yMDyMVojMCDOcMKhqwP27urko2dw+fGOtlK+OQ2bro1k377qHCqYIi2anHv7PqbAGpoBlBIh+D7Lml9NvgjFuj8HmrIcSP1PCqtuLt3U69HG8DvfYNGKKeolgPbJnOC+TIEJ6mYXd/MNSF3B2x+VfTeczhwnOtxqmSzcJCwNtdBCYFbz6kRrXXMnCRKK3CAXe1qAzGDrLQr2mBryyDUWvujYDQUUdrD4JkdvNmXq94ilLz1CxltQLK7xXm91p4r/FVwaI51RA+xkvo5Y7J7QpIx5TxdQTaLh4ZvonDObA4CU71SyN9qiPsdnjvGuDZhq5BlrP1SSm8NdYVCmACAd4qGQy3GySI1UgpE5yeR9JEdQxsPa7SP+5h45Pzw39O2UAvMYZ+IcovO7Bt1LyXlpGQBOT5thAPnvN+j4eUHnmx/Und1SfgSF4MqXjFDskEAP4L3WX2Aq1Gox50pFRcG66X50XSzcyR3UkpqVZ3n5MTB9caxO91BO2Nel0oYB+bt0jhdXRg+vvnQtw4DTGvxS+nyYRk5XivcjLw0RWJgOAHEt7vHYjlnclpiyHj+rnXKAcdSXnMIex2p2k92dP27wfBx6TZqoJhiuA2Z0I9XAhlb+oTHSaTxjkjLvfSSXJ1LrikokrLONQL/9qiyYbir6a+VyomhLoUGJ9w7nApuDrkPWLegxGxmvMLq1vYaBtKY35evMaliQexDKlcLJjPwzyZM30nsOKQ0oOJQvgkjnNi+AnU+OetMivBCCXMfqaXHlZSHuIo6J9bnK71jMEyxlpVpxovjuITyWUfNFPmI3ZrVY45JocyZ3kf8NdTSr6DBuY6/Cq6XHEmySLsR+4sRyHvxzxE1YwePJGImTweYOMq9Ur82YBrDRU/xzRGKoX0aA6sapxQ8CFf027CE a34yPayH MhEOLCbDm4v/XauPpc7s8/lvDfxixVZ8EvB47CJQ/B6Z7cOnZTyJ/fSOrIEcEmYdKXD02b79lYyWzgK1voXeZugX26lLHmXwpC6eDFu9IWF9/bhCjQNCh/AYIh4kPxZP//5NjCeh0ZPT+6fhpPH024qs3n9zH0K9lIj6ayJBaVWMmyVv02D91onRE6MxuSyboKcZJTkUH/7QMF0btvXX66mJ/yFRw9XApg9pWawCSeWD3/g3DcxqHF3KfZaZNCTHVR/RMw5MOyYHSkd7VyZ3dezmdw0J+zVPCV6Uwt2ZrJD/I/EabKzdQAn+c91b4qrR3Neyoxrle0vd0O550lLq28quRNVGyKH6g+cTL04siMLPFdULwTYylEig9zukKPHmHbIFXK0TKw/GunDXdnCwirXZ+PX25pmM/J5z2cnKQorkvEShZuDQwSvNGbQEPgP4kT+3pEzOs7+tc5POtyoQQ4zC0K1OFIkjTYVTQ0xqHxF9ohxJl0uAzSP129wBn6f3l9QjdpPWNA1XQHq0= 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: <linux-mm.kvack.org> |
Series |
splice, net: Replace sendpage with sendmsg(MSG_SPLICE_PAGES), part 1
|
expand
|
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;
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 <dhowells@redhat.com> cc: Willem de Bruijn <willemdebruijn.kernel@gmail.com> cc: David Ahern <dsahern@kernel.org> cc: "David S. Miller" <davem@davemloft.net> cc: Eric Dumazet <edumazet@google.com> cc: Jakub Kicinski <kuba@kernel.org> cc: Paolo Abeni <pabeni@redhat.com> cc: Jens Axboe <axboe@kernel.dk> cc: Matthew Wilcox <willy@infradead.org> cc: netdev@vger.kernel.org --- Notes: ver #6) - Use common helper. net/ipv4/ip_output.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)