From patchwork Wed Jun 7 18:19:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13271090 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 2E055C7EE2E for ; Wed, 7 Jun 2023 18:19:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BB3B36B0075; Wed, 7 Jun 2023 14:19:47 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B63A0900005; Wed, 7 Jun 2023 14:19:47 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A2C32900004; Wed, 7 Jun 2023 14:19:47 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 91AE36B0075 for ; Wed, 7 Jun 2023 14:19:47 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 60B92AEFCD for ; Wed, 7 Jun 2023 18:19:47 +0000 (UTC) X-FDA: 80876765214.23.09DE128 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf28.hostedemail.com (Postfix) with ESMTP id 9053CC0011 for ; Wed, 7 Jun 2023 18:19:45 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=izEH8nlj; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf28.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.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=1686161985; 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=OL+TnlQNDjtbdgR92AyZlN3k/q2TbFv+1S0kh3gXGzs=; b=yS1fpqGhVhcs2PMPBhSynkONpZ0XXBzQV96VimwthrFVDO+a2ucbYxeh/y2gQPQQgJXjJR U+z2H+ffcYeCG8Ul5a+DwR31kcF1J4I2T1y2jD0LiHQ7+8TmNFcwcD1BiF5xkqhQhdMY7q pE0rFKTvNbfpOLupROHt+7R0alezLU8= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=izEH8nlj; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf28.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686161985; a=rsa-sha256; cv=none; b=0WckHQA/EbkivhLwlSqOES95BI6ssvSxOBUodkfCr5gIvz7s/uEblT7K96Nzuuseqa6HWr 2bxPnLAk5wZo2U4KTBns8FjuvWpZhBZAXlOk+3bfJ7pFTzD2lFFV37xqXNusZc5QYTupDA j4+x37yCaotW0faZGey4dunNgXG76Eg= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1686161984; 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=OL+TnlQNDjtbdgR92AyZlN3k/q2TbFv+1S0kh3gXGzs=; b=izEH8nlj8wOMl1gqQZlQtLJeGyEg8CgqGO6RG59FTRsbUTINJdkKc1DNpO6NwyKT4uFBOY aEnnsmYPOmuDLB9OSvH4KUBcLPZreNK9HOWVluLuVfrFy5d6nHJtTohb0KkZRjouVjrMLt uqipZLzfygiENb2gLMVIhAVXP71hriQ= 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-480-BNnBFgYAMHmHweMCL8Mjlg-1; Wed, 07 Jun 2023 14:19:41 -0400 X-MC-Unique: BNnBFgYAMHmHweMCL8Mjlg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 525B5811E7F; Wed, 7 Jun 2023 18:19:40 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.42.28.182]) by smtp.corp.redhat.com (Postfix) with ESMTP id C4BF82166B25; Wed, 7 Jun 2023 18:19:37 +0000 (UTC) From: David Howells To: netdev@vger.kernel.org, Linus Torvalds Cc: David Howells , Chuck Lever , Boris Pismenny , John Fastabend , Jakub Kicinski , "David S. Miller" , Eric Dumazet , Paolo Abeni , Willem de Bruijn , David Ahern , Matthew Wilcox , Jens Axboe , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Christoph Hellwig , Al Viro , Jan Kara , Jeff Layton , David Hildenbrand , Christian Brauner , linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org Subject: [PATCH net-next v6 04/14] splice, net: Add a splice_eof op to file-ops and socket-ops Date: Wed, 7 Jun 2023 19:19:10 +0100 Message-ID: <20230607181920.2294972-5-dhowells@redhat.com> In-Reply-To: <20230607181920.2294972-1-dhowells@redhat.com> References: <20230607181920.2294972-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Rspamd-Queue-Id: 9053CC0011 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: tngp5y5de3a8e1eztkzpwazdpe6ppmdm X-HE-Tag: 1686161985-496479 X-HE-Meta: U2FsdGVkX1/4uVMvQWIkmbaMy96HmWIaOEQBNKmcwCyBDKuvI2MGuBcThWIOEZv8a6wFlO1bftOIJQELpfXGi37K77tgcUr867he5YASpK44A6y6ZFiWfzjw4BUzGld2cJNs5Bl2r94d7eBYq2+yxgDvg/46/KE+FEb6mjE1aMx8Ly9vyExLKt84zeUTl4b9gtYKILw273033KAWKwX9abqdiZWGt7h41q2CYEI7jk9pkdgGOp+3vDC2Yfa/RtyR9oexlMSGA6esOiQyjJK1SKOOI9gWC6icVgqRTf/NPUA6wYET4tyY3sQNlH5xG/oZtJYqNgR13GcGYS/giuX2HYv8FMLcD8ORYG6Kx9PR8zydxRA+p8f4KR1OZaAQXVpFhYo+Yo8wmLuMiwzwFzUfvm4u/Hb5xjWcsSmQzFCAG+AgMOX7R39eR71xI8qlcYMeu1uZIESlfbviQQbWBVGosUe4ja/32h5h3PuMQJenK1UmyDu+Daf4mcuk8yYqOlYXHT50l+9l/ENSaz5sN+NW3l8VfmdewmtdDPs0ZnINgYbfSkefb+tMeQF+5m/otAKkGRIZ+UNDb7WGXQQgCw3FYSokJ/zIdH2DF5swj6AK1PUACSz1qElAn4pZUy0a9B6TfFzohy2wLUfY9WU3+aiwFkGwnoLwh1SAdFXo3RjeekyZi3kewnE83+HAaR6UDHnBgyVpxSj7Gop/VRQ9Ilom1CDjZmS4yS9gmFl6e1h7fdqeOQIZidPsFeAUsLwsGrxL3TejEVCQ8O0GiMmTj1VcwVFKjfv5UWv5x9duGJCGy+zctQVGyIACAImUzmD6JLrR3Gst5i9r6SXJKBdx0I8vFegf/Ay0TG2+8xS6LuIUhKzNlhdmyORwEqA6SfofmmqBGFv942cc9IsYvDB/wLzZiT7ryDln0bUOQVHVzH1FcWKxCTndAPVOZpHAgMbSG8crabCbmyC5ZQ093eTZ77n xSPXzLlu faj3ujy4sEP4dEHip+ThLUqQ6QXEGqULu8IzCmu2yJNkbpDeREC7BuS3aubPLhiShHMIZS+JQ3dWMCGpOg5w13cNU3tYGKofSLRfZadsnzpoLrQ2EuckSPUH8e2MNusv/2mmC32pgUBYngSS1lHXx2QzKeb2Z/HBrBzDsEUMHJJ1Z4eyRiNGOpB/RZrPSMpMDsy0hgKdRTRD0p1M7je8SZt1fwBtb1tzIwGxiCZAthq0X+x5264W38bi6C85M4E/O/hd/7hJSHx7c0Y7O8GzztUCSnL9+uQ7PqK1M8c0OKUho5LOqZqxpkPpALBVq3QMQku39zoqKnwKR+u/0b9ht/0qLTzM28NLAbEK9SsHDuxPwG6WbDQZXC3WDJc429IrpyN7gvDTs0dmek/VswJB+032RocpGi734IgNaPs468nA8Zs98aHPAyqVlNJAfIg1KyOhryPQwyy0yxaxfjt/ZB3TJZkuawTMgBUPSLnddmv8rqb1GcN5K2npp9RpGH08VJe+qUcMR5I8/6NwsiMentkaD07xq+gllewxCgCcSPVHx4B8P8Z2xNCuGrKxlBciWCocdZtR+AylpnzUwZ8HUF0Mb97Dl2+Wy6jD6bIxe19bffrkILcxadRvYYPPKGfo75Xf8vsDJ3HW6Ih8RXElbAmIsKF1FWUlklK0jpbfJ0xxpz/+ZV3A1BDkYdTy6+KHr3Ak5wCMaBzVIXliTGyVa0vDJ8xKNDhq7LPlV0m+CEaNKrzY= 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: 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: Eric Dumazet cc: "David S. Miller" cc: Paolo Abeni cc: linux-fsdevel@vger.kernel.org cc: linux-block@vger.kernel.org cc: linux-mm@kvack.org cc: netdev@vger.kernel.org --- 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 e337630aed64..67dbd85db207 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -969,6 +969,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. */ @@ -1068,7 +1079,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; @@ -1108,6 +1119,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 @@ -1136,6 +1156,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 @@ -1161,6 +1189,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 df92f4b3d122..de2cb1132f07 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1796,6 +1796,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 b73ad8e3c212..8defc8f1d82e 100644 --- a/include/linux/net.h +++ b/include/linux/net.h @@ -210,6 +210,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 991ae318b6eb..4fab18a6e371 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 b418425d7230..ae2d74a0bc4c 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -1271,6 +1271,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 c4d9104418c8..b778fc03c6e0 100644 --- a/net/socket.c +++ b/net/socket.c @@ -130,6 +130,7 @@ static int sock_fasync(int fd, struct file *filp, int on); 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) @@ -163,6 +164,7 @@ static const struct file_operations socket_file_ops = { .fasync = sock_fasync, .splice_write = splice_to_socket, .splice_read = sock_splice_read, + .splice_eof = sock_splice_eof, .show_fdinfo = sock_show_fdinfo, }; @@ -1076,6 +1078,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;