From mboxrd@z Thu Jan 1 00:00:00 1970 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 468BDC3DA6E for ; Mon, 8 Jan 2024 15:40:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 336CF6B006E; Mon, 8 Jan 2024 10:40:06 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 2E6CF6B0071; Mon, 8 Jan 2024 10:40:06 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1AE9D6B0072; Mon, 8 Jan 2024 10:40:06 -0500 (EST) 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 08EC36B006E for ; Mon, 8 Jan 2024 10:40:06 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id A8DB2C02F7 for ; Mon, 8 Jan 2024 15:40:05 +0000 (UTC) X-FDA: 81656554770.11.89CD341 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by imf06.hostedemail.com (Postfix) with ESMTP id C91C418000F for ; Mon, 8 Jan 2024 15:40:02 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=ULhnvKw8; spf=pass (imf06.hostedemail.com: domain of gregkh@linuxfoundation.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org; dmarc=pass (policy=none) header.from=linuxfoundation.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1704728403; 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=rZS22O9Jq5pHAiKlcg4x6+h5CJlhUH8MQM878k5tzuA=; b=ux7z7QCGM7uuFWITaBq3IONol/r+8CElGaitpsvmBVUa4BCk4FDxLlQ4LVoqWsUxdQ/UTU 5jD+Lp9E08mnGeeY1ffETSpobdZXqNsgo2gaQwUdh1S1iLn6ZKEPf3NiMYERe0UyHHUEO/ Pzoxf/pkHiMofSxn10IJQNgSe/5Rk7g= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1704728403; a=rsa-sha256; cv=none; b=dK1JitGfE1ewFzt31KcKlMZJl3PMMfVMc2bX7UgJP93/Xjb7x7jOik2GvdCiBPw2zs3IOZ ZDVdJglEYCwBPaKJPRxYt7LCEppTITD9KTkaynNR3yWLlR8bNEu7t0JlELFNKdqXphKxSt Mc26kVDKrYSg8wdIU7dcpXilZCAjERM= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=linuxfoundation.org header.s=korg header.b=ULhnvKw8; spf=pass (imf06.hostedemail.com: domain of gregkh@linuxfoundation.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org; dmarc=pass (policy=none) header.from=linuxfoundation.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by ams.source.kernel.org (Postfix) with ESMTP id 117B9B81846; Mon, 8 Jan 2024 15:40:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 289C6C433CC; Mon, 8 Jan 2024 15:40:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1704728400; bh=hHDHTBjOX0dpobzy7TzDB/Jx0v0+0q5wU4ekBSUNobo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ULhnvKw8NVLSG5dAT1XGxALXSZgcOkC58IXGWIKHJDBkAxiufcgvGbOaH4zET6hdv 2hMktqZY6jcEsLUAKqlCJd8QTbwKwGhNBSn0LY0dnt7alGQSQl1al6/wimGf/oJhV9 e/F4bosdgQqvHhaM4CpTVHHlgiqp5YHUH2T/Jf1c= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Linus Torvalds , David Howells , Jakub Kicinski , Jens Axboe , Christoph Hellwig , Al Viro , Matthew Wilcox , Jan Kara , Jeff Layton , David Hildenbrand , Christian Brauner , Chuck Lever , Boris Pismenny , John Fastabend , linux-mm@kvack.org, Sasha Levin Subject: [PATCH 6.1 065/150] splice, net: Add a splice_eof op to file-ops and socket-ops Date: Mon, 8 Jan 2024 16:35:16 +0100 Message-ID: <20240108153514.230584734@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240108153511.214254205@linuxfoundation.org> References: <20240108153511.214254205@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: 3bqrk564ug418qy63x4pismqxt46rqq9 X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: C91C418000F X-Rspam-User: X-HE-Tag: 1704728402-158930 X-HE-Meta: U2FsdGVkX19y42y5VnHZ8aHzQtm53WwarfPDJULilnQWX6tuWJa3uOJCDftUChXZ139RjdJw8WVn3m5Rgtc91GS6Bzej9JSNZQGKZERc4MwGMbXAAtdfLYc46gtgbvOFndqIzI0ZsLc+zpthwhKgKQvszdFpwh+BpMBFbjNkZkf08WlbGD7UWwY8pwzjFVFfEftbYZf3IAm/0wpwSnbfiWZrgsy7M4SsX6eqOv7bVQEONZ1Rz6ZSjc8Sc6kX9qM+vvikyX6II0IQGHgnqHqUXMfG2oxicRDZS3xfxTiWLbIWSWJEhCH+r7KcAAG/fKkvjtT6AWEzTkHNdPh82a8vThw0RMzIE/p9OFhI7HnleSm9bIT53xuz+iZ0mx9mvSyhWoSNCVaXVjvb3QADemVZybRogsW5MSZjVmi+DqSSRlrIHaN6aINWQm3YZHecx1eOPEi1em+BXDLEBB4q4YkmAOd3dkcs/RQ42LDcArImCoFdl8TLhZzy2RbPLAD9sfTAvoEerMueno2AZJpv+6mZdMpnD+MqYnEzu52TKx2HrEG/v7vHYKEgOBbm9avZXwzIE0yLvpOAOPNOOk+Y0okOlJtE0lgTlW2wVBdAo48B8mx9sDGP8qvXru1ZvFM3vWRhDwrXRrwznQocVRv6fuME6UUzLfGSowRDy8qhIFoDiNQjgdPyMiQ3/3Rh2LhsxGnbbh80q66AvffXRaGygKlhMHOWjttgygHo/S/8Xn+GoVkjCmCGkdh3ugV9IAwP7B7nAQBghVq6q5Ijj9yAUsFi/8aJrLmd0EBlVfKQhKUpjZ5mfd4PfagwBmS4sHs1LHJQLQWpJjv3IsC+ypOJR0zKea96xA8MdvrHMs5Xf1GJWUa1RqRsdf6tATOlTWcGSIZlBedTObJdgIvqyYd8p6RghGrZWOjrbhtGTcqe2vjoT7oM/ot2S9A6wtVoIBrtrv2BhCmTPzHJF8aUKxvhoVV gNnP6Zm0 aP5p/MptzihkihkbWcaeglCjs9b6cWvopbGzaJEO9XBC+3ANJnLmHxbq2F+suOVk6YAV6e/PjFWh0p1QN/1P+KpxIwPvIq3VB/t8L4OtlU8EO9aA= 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: List-Subscribe: List-Unsubscribe: 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: David Howells [ Upstream commit 2bfc66850952b6921b2033b09729ec59eabbc81d ] Add an optional method, ->splice_eof(), to allow splice to indicate the premature termination of a splice to struct file_operations and struct proto_ops. This is called if sendfile() or splice() encounters all of the following conditions inside splice_direct_to_actor(): (1) the user did not set SPLICE_F_MORE (splice only), and (2) an EOF condition occurred (->splice_read() returned 0), and (3) we haven't read enough to fulfill the request (ie. len > 0 still), and (4) we have already spliced at least one byte. A further patch will modify the behaviour of SPLICE_F_MORE to always be passed to the actor if either the user set it or we haven't yet read sufficient data to fulfill the request. Suggested-by: Linus Torvalds Link: https://lore.kernel.org/r/CAHk-=wh=V579PDYvkpnTobCLGczbgxpMgGmmhqiTyE34Cpi5Gg@mail.gmail.com/ Signed-off-by: David Howells Reviewed-by: Jakub Kicinski cc: Jens Axboe cc: Christoph Hellwig cc: Al Viro cc: Matthew Wilcox cc: Jan Kara cc: Jeff Layton cc: David Hildenbrand cc: Christian Brauner cc: Chuck Lever cc: Boris Pismenny cc: John Fastabend cc: linux-mm@kvack.org Signed-off-by: Jakub Kicinski Stable-dep-of: a0002127cd74 ("udp: move udp->no_check6_tx to udp->udp_flags") Signed-off-by: Sasha Levin --- fs/splice.c | 31 ++++++++++++++++++++++++++++++- include/linux/fs.h | 1 + include/linux/net.h | 1 + include/linux/splice.h | 1 + include/net/sock.h | 1 + net/socket.c | 10 ++++++++++ 6 files changed, 44 insertions(+), 1 deletion(-) diff --git a/fs/splice.c b/fs/splice.c index 5969b7a1d353a..c4ae54deac42c 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -764,6 +764,17 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, return out->f_op->splice_write(pipe, out, ppos, len, flags); } +/* + * Indicate to the caller that there was a premature EOF when reading from the + * source and the caller didn't indicate they would be sending more data after + * this. + */ +static void do_splice_eof(struct splice_desc *sd) +{ + if (sd->splice_eof) + sd->splice_eof(sd); +} + /* * Attempt to initiate a splice from a file to a pipe. */ @@ -864,7 +875,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd, ret = do_splice_to(in, &pos, pipe, len, flags); if (unlikely(ret <= 0)) - goto out_release; + goto read_failure; read_len = ret; sd->total_len = read_len; @@ -904,6 +915,15 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd, file_accessed(in); return bytes; +read_failure: + /* + * If the user did *not* set SPLICE_F_MORE *and* we didn't hit that + * "use all of len" case that cleared SPLICE_F_MORE, *and* we did a + * "->splice_in()" that returned EOF (ie zero) *and* we have sent at + * least 1 byte *then* we will also do the ->splice_eof() call. + */ + if (ret == 0 && !more && len > 0 && bytes) + do_splice_eof(sd); out_release: /* * If we did an incomplete transfer we must release @@ -932,6 +952,14 @@ static int direct_splice_actor(struct pipe_inode_info *pipe, sd->flags); } +static void direct_file_splice_eof(struct splice_desc *sd) +{ + struct file *file = sd->u.file; + + if (file->f_op->splice_eof) + file->f_op->splice_eof(file); +} + /** * do_splice_direct - splices data directly between two files * @in: file to splice from @@ -957,6 +985,7 @@ long do_splice_direct(struct file *in, loff_t *ppos, struct file *out, .flags = flags, .pos = *ppos, .u.file = out, + .splice_eof = direct_file_splice_eof, .opos = opos, }; long ret; diff --git a/include/linux/fs.h b/include/linux/fs.h index b6af6abc7a77f..4a1911dcf834b 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2177,6 +2177,7 @@ struct file_operations { int (*flock) (struct file *, int, struct file_lock *); ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, loff_t *, size_t, unsigned int); ssize_t (*splice_read)(struct file *, loff_t *, struct pipe_inode_info *, size_t, unsigned int); + void (*splice_eof)(struct file *file); int (*setlease)(struct file *, long, struct file_lock **, void **); long (*fallocate)(struct file *file, int mode, loff_t offset, loff_t len); diff --git a/include/linux/net.h b/include/linux/net.h index 18d942bbdf6e0..25baca60f6cba 100644 --- a/include/linux/net.h +++ b/include/linux/net.h @@ -209,6 +209,7 @@ struct proto_ops { int offset, size_t size, int flags); ssize_t (*splice_read)(struct socket *sock, loff_t *ppos, struct pipe_inode_info *pipe, size_t len, unsigned int flags); + void (*splice_eof)(struct socket *sock); int (*set_peek_off)(struct sock *sk, int val); int (*peek_len)(struct socket *sock); diff --git a/include/linux/splice.h b/include/linux/splice.h index a55179fd60fc3..41a70687be853 100644 --- a/include/linux/splice.h +++ b/include/linux/splice.h @@ -38,6 +38,7 @@ struct splice_desc { struct file *file; /* file to read/write */ void *data; /* cookie */ } u; + void (*splice_eof)(struct splice_desc *sd); /* Unexpected EOF handler */ loff_t pos; /* file position */ loff_t *opos; /* sendfile: output position */ size_t num_spliced; /* number of bytes already spliced */ diff --git a/include/net/sock.h b/include/net/sock.h index d8ed62a8e1a3e..9de9f070537cc 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -1279,6 +1279,7 @@ struct proto { size_t len, int flags, int *addr_len); int (*sendpage)(struct sock *sk, struct page *page, int offset, size_t size, int flags); + void (*splice_eof)(struct socket *sock); int (*bind)(struct sock *sk, struct sockaddr *addr, int addr_len); int (*bind_add)(struct sock *sk, diff --git a/net/socket.c b/net/socket.c index 6f39f7b0cc85c..639d76f20384e 100644 --- a/net/socket.c +++ b/net/socket.c @@ -130,6 +130,7 @@ static ssize_t sock_sendpage(struct file *file, struct page *page, static ssize_t sock_splice_read(struct file *file, loff_t *ppos, struct pipe_inode_info *pipe, size_t len, unsigned int flags); +static void sock_splice_eof(struct file *file); #ifdef CONFIG_PROC_FS static void sock_show_fdinfo(struct seq_file *m, struct file *f) @@ -164,6 +165,7 @@ static const struct file_operations socket_file_ops = { .sendpage = sock_sendpage, .splice_write = generic_splice_sendpage, .splice_read = sock_splice_read, + .splice_eof = sock_splice_eof, .show_fdinfo = sock_show_fdinfo, }; @@ -1091,6 +1093,14 @@ static ssize_t sock_splice_read(struct file *file, loff_t *ppos, return sock->ops->splice_read(sock, ppos, pipe, len, flags); } +static void sock_splice_eof(struct file *file) +{ + struct socket *sock = file->private_data; + + if (sock->ops->splice_eof) + sock->ops->splice_eof(sock); +} + static ssize_t sock_read_iter(struct kiocb *iocb, struct iov_iter *to) { struct file *file = iocb->ki_filp; -- 2.43.0