From patchwork Wed Mar 29 14:13:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13192536 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 1B56AC74A5B for ; Wed, 29 Mar 2023 14:15:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0933B6B00A0; Wed, 29 Mar 2023 10:15:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0401A6B00A1; Wed, 29 Mar 2023 10:15:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DD3B26B00A2; Wed, 29 Mar 2023 10:15:20 -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 C1A3C6B00A0 for ; Wed, 29 Mar 2023 10:15:20 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 6A4BEA0677 for ; Wed, 29 Mar 2023 14:15:20 +0000 (UTC) X-FDA: 80622133200.03.F33C606 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf20.hostedemail.com (Postfix) with ESMTP id 70EA01C0006 for ; Wed, 29 Mar 2023 14:15:18 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=FSA3Hbcl; spf=pass (imf20.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=1680099318; 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=I/S0tdHFgU2wYUbqRS8y7qqDbwCo5raKog1zVTXoTHk=; b=HXahDIjT/dVRXC/8002oavIajmpLiQ5g8tW+OCvnQCcUL3LOWyx75dF/UMIkvIzfie056y lQGSnngQIkfEKpqcc8JhJ4p/maC5UE51hZBsk1+Y2j/tsNT6I7sq6KvAA9ajXEj9K5H1JC 6vgF9+mXZguySNv9NcRNXnjNydht8X4= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=FSA3Hbcl; spf=pass (imf20.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=1680099318; a=rsa-sha256; cv=none; b=AT4M6rv7s9YfpEvBEM0/GBX+DI+45Gc51bzy8ZGt2FKv+QrW23Glm1nCaU01Patq8qPRJo UIN5H74ix5U92GGt01ewfsXmOraJGW2+8eozlxq375ArXjmt77TM7Z9MHIeGFyhNi+qIbe S1tkUsZffY+HQDK9BJgb994ObNTAt8k= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680099317; 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=I/S0tdHFgU2wYUbqRS8y7qqDbwCo5raKog1zVTXoTHk=; b=FSA3HbclTG/VUq/4IdV1ol7z1lsRggUH8Ffx/3rAGIpyfJ5SgzEnXNlZKIya4Ye4/d1x7r tzanLLn1mDy6UF/PdYemBcqRZ85CwaP4bw2AaK9jVa6DajEz91qejUu7/5o33IyXJIaelY gLa336/tBv2/PDdVtZl4kJzaT51WN/4= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-96-tJwSygBLMUeAppTVp53tcA-1; Wed, 29 Mar 2023 10:15:14 -0400 X-MC-Unique: tJwSygBLMUeAppTVp53tcA-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0E7F23C0ED4B; Wed, 29 Mar 2023 14:15:13 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 151BA492B01; Wed, 29 Mar 2023 14:15:10 +0000 (UTC) From: David Howells To: Matthew Wilcox , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: David Howells , Al Viro , Christoph Hellwig , Jens Axboe , Jeff Layton , Christian Brauner , Chuck Lever III , Linus Torvalds , netdev@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [RFC PATCH v2 27/48] splice, net: Use sendmsg(MSG_SPLICE_PAGES) rather than ->sendpage() Date: Wed, 29 Mar 2023 15:13:33 +0100 Message-Id: <20230329141354.516864-28-dhowells@redhat.com> In-Reply-To: <20230329141354.516864-1-dhowells@redhat.com> References: <20230329141354.516864-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 70EA01C0006 X-Stat-Signature: 5zmxxj1ererctr4of166qyyxyn95i78z X-Rspam-User: X-HE-Tag: 1680099318-251017 X-HE-Meta: U2FsdGVkX1/yvtMDG/kPICK4E8na70dw+f6C3Wyq8nGtYwPv+/IgSxaUwZcyOjGZpBYKD/oigVeeE8mL68YtuMLSq+gqgc7QTXu1pm8D8EIsrV/CxF32ZVv3M6dovFicTS8X4i+CGlwGBp+XcrPqAUW9QDdd6AyYO2g0lKPBKFb4izK00cnzISjql4JrTK818a5lOBN8aEujttd9zi0gLsyJNkuC86c/OwncOHFqfIfQsQux7A2XfXVR8XSck3Tl0xZX72BlgoArdEBj5ZT8tMxskA/ka3kB65SlRoFrvZOJ5byZjJLMPn1wJFcUXSY9df5bx1DexXEilPc8wafYmWbbLy1PRdOX0KpasQ/eJ24fmFaV44CKU5Va43jrusY58MQovNy3AediCgxAh6C3VZjr+gVZ23m+KGkYIP7NRuKhexCvzxZv4SoY1y542OA7IWQ0Oz+dvDUpm/omAvWNgLCgkmbnfHqPmYG4BnS3ZeM+MLrrwA6o5VDomdpMzjdWxVrvBc5Hj4whhP8QULiTYyxRHi64LoFy7lnEesh+qhfaAuRqO//l+zUncTwJcyzHUZgG7CHR5x7x1ge+ylf4Eu16B32GZN2AT7DUHbC1u+qp8E4yiB3br9JduMaXwEigtwxKA5zwSIj9vDBSrm1K/cmQrRwlphFg9uuDGVM3sSMWJfli1SBfSQCytOvFcD7gunNugNiXIN5zi1YNbabtOUpdsRDzaXV0BWrUI075sZTyj+CZuJaij6IXhGOl6xkD3vwEi0Xo7qvPt2RXKEwCdF2jAfl+Eb5tXI3M7xqkp0unnZIc69U6p60OpoUus+/IvNRv7GRZ4Wf3RAGeq+Guh3ca3EOQIg3eU6C1eUcPZe9RFLqlk4wkHBr90Pgj9WYoC8FL0JbD4bQEcQrFBwrRdpWg7XPetABksh8+uH8wxQ7i/j93/AXK+0hONnGjKWknZ4797Vy0Z/5YQ0m0MSN FH71OS7S IQt9ExYdwiKxL4sqCNXVc9GfMlLU7oPj0gOxbRaorzuIg82GNOGt2Jua5wPUbWt46rT2U/e4gtWoZc9SSmpps0GdVCiIzrt6HjHGwk6OYG57/WCaSJQGOj7M2RlqZbuV3ZGfDzmi0wdDfHaYGuSJ5+yT7goSbdeQ0GakKaktSiFv0ayQnRJyvrCHpsxiazu0Ap8kAqCNskbxES81UtQNBptG7KThCK50ZHCpU3v3CLbSUdKPWVwbhAaFVLWqLqm3vNcnj2i8ALLGpUHANi4IhaFNxdBeFHPZxtWe0hdfjZWEXPozIzMwPzbwCQi4aldhqSP1BEFrDQKE0WZvSGC7iMPcbMAQ4AdWAbx/mkdT8dLEu3Dc0dtcnpdTqSUzjI9h6HQtDpsAZTFZD2mXkru6z5su8/Py67KoJsEpYcajAxhmqKe283S/6t81DR3kqj1HMKFpc 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: Use sendmsg(MSG_SPLICE_PAGES) rather than ->sendpage() to splice data from a pipe to a socket. This paves the way for passing in multiple pages at once from a pipe and the handling of multipage folios. Signed-off-by: David Howells cc: "David S. Miller" cc: Eric Dumazet cc: Jakub Kicinski cc: Paolo Abeni cc: Jens Axboe cc: Matthew Wilcox cc: netdev@vger.kernel.org --- fs/splice.c | 42 +++++++++++++++++++++++------------------- include/linux/fs.h | 2 -- include/linux/splice.h | 2 ++ net/socket.c | 26 ++------------------------ 4 files changed, 27 insertions(+), 45 deletions(-) diff --git a/fs/splice.c b/fs/splice.c index f46dd1fb367b..23ead122d631 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include @@ -410,29 +411,32 @@ const struct pipe_buf_operations nosteal_pipe_buf_ops = { }; EXPORT_SYMBOL(nosteal_pipe_buf_ops); +#ifdef CONFIG_NET /* * Send 'sd->len' bytes to socket from 'sd->file' at position 'sd->pos' * using sendpage(). Return the number of bytes sent. */ -static int pipe_to_sendpage(struct pipe_inode_info *pipe, - struct pipe_buffer *buf, struct splice_desc *sd) +static int pipe_to_sendmsg(struct pipe_inode_info *pipe, + struct pipe_buffer *buf, struct splice_desc *sd) { - struct file *file = sd->u.file; - loff_t pos = sd->pos; - int more; - - if (!likely(file->f_op->sendpage)) - return -EINVAL; + struct socket *sock = sock_from_file(sd->u.file); + struct bio_vec bvec; + struct msghdr msg = { + .msg_flags = MSG_SPLICE_PAGES, + }; - more = (sd->flags & SPLICE_F_MORE) ? MSG_MORE : 0; + if (sd->flags & SPLICE_F_MORE) + msg.msg_flags |= MSG_MORE; if (sd->len < sd->total_len && pipe_occupancy(pipe->head, pipe->tail) > 1) - more |= MSG_SENDPAGE_NOTLAST; + msg.msg_flags |= MSG_MORE; - return file->f_op->sendpage(file, buf->page, buf->offset, - sd->len, &pos, more); + bvec_set_page(&bvec, buf->page, sd->len, buf->offset); + iov_iter_bvec(&msg.msg_iter, ITER_SOURCE, &bvec, 1, sd->len); + return sock_sendmsg(sock, &msg); } +#endif static void wakeup_pipe_writers(struct pipe_inode_info *pipe) { @@ -614,7 +618,7 @@ static void splice_from_pipe_end(struct pipe_inode_info *pipe, struct splice_des * Description: * This function does little more than loop over the pipe and call * @actor to do the actual moving of a single struct pipe_buffer to - * the desired destination. See pipe_to_file, pipe_to_sendpage, or + * the desired destination. See pipe_to_file, pipe_to_sendmsg, or * pipe_to_user. * */ @@ -795,8 +799,9 @@ iter_file_splice_write(struct pipe_inode_info *pipe, struct file *out, EXPORT_SYMBOL(iter_file_splice_write); +#ifdef CONFIG_NET /** - * generic_splice_sendpage - splice data from a pipe to a socket + * splice_to_socket - splice data from a pipe to a socket * @pipe: pipe to splice from * @out: socket to write to * @ppos: position in @out @@ -808,13 +813,12 @@ EXPORT_SYMBOL(iter_file_splice_write); * is involved. * */ -ssize_t generic_splice_sendpage(struct pipe_inode_info *pipe, struct file *out, - loff_t *ppos, size_t len, unsigned int flags) +ssize_t splice_to_socket(struct pipe_inode_info *pipe, struct file *out, + loff_t *ppos, size_t len, unsigned int flags) { - return splice_from_pipe(pipe, out, ppos, len, flags, pipe_to_sendpage); + return splice_from_pipe(pipe, out, ppos, len, flags, pipe_to_sendmsg); } - -EXPORT_SYMBOL(generic_splice_sendpage); +#endif static int warn_unsupported(struct file *file, const char *op) { diff --git a/include/linux/fs.h b/include/linux/fs.h index c85916e9f7db..f3ccc243851e 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2740,8 +2740,6 @@ extern ssize_t generic_file_splice_read(struct file *, loff_t *, struct pipe_inode_info *, size_t, unsigned int); extern ssize_t iter_file_splice_write(struct pipe_inode_info *, struct file *, loff_t *, size_t, unsigned int); -extern ssize_t generic_splice_sendpage(struct pipe_inode_info *pipe, - struct file *out, loff_t *, size_t len, unsigned int flags); extern long do_splice_direct(struct file *in, loff_t *ppos, struct file *out, loff_t *opos, size_t len, unsigned int flags); diff --git a/include/linux/splice.h b/include/linux/splice.h index 8f052c3dae95..e6153feda86c 100644 --- a/include/linux/splice.h +++ b/include/linux/splice.h @@ -87,6 +87,8 @@ extern long do_splice(struct file *in, loff_t *off_in, extern long do_tee(struct file *in, struct file *out, size_t len, unsigned int flags); +extern ssize_t splice_to_socket(struct pipe_inode_info *pipe, struct file *out, + loff_t *ppos, size_t len, unsigned int flags); /* * for dynamic pipe sizing diff --git a/net/socket.c b/net/socket.c index dfb912bbed62..2cd5c2bcdde8 100644 --- a/net/socket.c +++ b/net/socket.c @@ -57,6 +57,7 @@ #include #include #include +#include #include #include #include @@ -126,8 +127,6 @@ static long compat_sock_ioctl(struct file *file, unsigned int cmd, unsigned long arg); #endif static int sock_fasync(int fd, struct file *filp, int on); -static ssize_t sock_sendpage(struct file *file, struct page *page, - int offset, size_t size, loff_t *ppos, int more); static ssize_t sock_splice_read(struct file *file, loff_t *ppos, struct pipe_inode_info *pipe, size_t len, unsigned int flags); @@ -162,8 +161,7 @@ static const struct file_operations socket_file_ops = { .mmap = sock_mmap, .release = sock_close, .fasync = sock_fasync, - .sendpage = sock_sendpage, - .splice_write = generic_splice_sendpage, + .splice_write = splice_to_socket, .splice_read = sock_splice_read, .show_fdinfo = sock_show_fdinfo, }; @@ -1062,26 +1060,6 @@ int kernel_recvmsg(struct socket *sock, struct msghdr *msg, } EXPORT_SYMBOL(kernel_recvmsg); -static ssize_t sock_sendpage(struct file *file, struct page *page, - int offset, size_t size, loff_t *ppos, int more) -{ - struct socket *sock; - int flags; - int ret; - - sock = file->private_data; - - flags = (file->f_flags & O_NONBLOCK) ? MSG_DONTWAIT : 0; - /* more is a combination of MSG_MORE and MSG_SENDPAGE_NOTLAST */ - flags |= more; - - ret = kernel_sendpage(sock, page, offset, size, flags); - - if (trace_sock_send_length_enabled()) - call_trace_sock_send_length(sock->sk, ret, 0); - return ret; -} - static ssize_t sock_splice_read(struct file *file, loff_t *ppos, struct pipe_inode_info *pipe, size_t len, unsigned int flags)