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 63DDEC678D5 for ; Wed, 8 Mar 2023 14:38:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F33CC6B007E; Wed, 8 Mar 2023 09:38:24 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E93F86B0080; Wed, 8 Mar 2023 09:38:24 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CE6566B0081; Wed, 8 Mar 2023 09:38:24 -0500 (EST) 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 BAD3C6B007E for ; Wed, 8 Mar 2023 09:38:24 -0500 (EST) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 8F2991A0A8C for ; Wed, 8 Mar 2023 14:38:24 +0000 (UTC) X-FDA: 80545986528.20.3DD3B19 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf18.hostedemail.com (Postfix) with ESMTP id C2C571C0011 for ; Wed, 8 Mar 2023 14:38:21 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="SPMR90V/"; spf=pass (imf18.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.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=1678286301; 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=gNjp2803YzC3zT/XJu0Jjeq/3mtCoxBl7OitHcYTUso=; b=zW7vgrJR5LkM/zv4CkGAEhjrjYBhMhxdlPCBlNjMbL4hjthTOZ9sqT/Xz6b/HGsnUMzmKC DU0smJdmFvwXnZnGoCEtXs1cmRxeQMhUJq/p0v3saFkW/O5idsWaqlfaOma7f6qDvPFLQu ydb9R+GvagwWNDgNaN4MzkZxI/JNWRg= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="SPMR90V/"; spf=pass (imf18.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.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=1678286301; a=rsa-sha256; cv=none; b=Vvk1YghR2DMu5D3H9noj0xsqT3bUoFx6EDjK34HVUmyJdpAL0A845RPw24HZAVfVysArWx wVNB+af9HJyHLVTy3tPh5Lh/YHkny0tEz3IdRHpw9tMIYSITnoVxCWoSMoUvAxJaNuKm+X 9O7KIDUnWV3Y0RLv0wOdf25ZWJtkLRs= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678286301; 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=gNjp2803YzC3zT/XJu0Jjeq/3mtCoxBl7OitHcYTUso=; b=SPMR90V/xvUSygVImf226vX8gIcj2bpHN4PcEgbapj8oRj1EuYaphikKq63MEyVptpsa6V Mp2+paRoj4qkkpUNvbUNgzAO2A/JvpFcYydmcw+0XWjYU4rYGIo06IGiJJuajs10ODLcgT 0DA36ouBa+r8NidGAy00XiN/I1BHlro= 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-617-gep4CwD9MCiui4WOcwo1DA-1; Wed, 08 Mar 2023 09:38:15 -0500 X-MC-Unique: gep4CwD9MCiui4WOcwo1DA-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 31D8C882821; Wed, 8 Mar 2023 14:38:14 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id BB8352166B2A; Wed, 8 Mar 2023 14:38:11 +0000 (UTC) From: David Howells To: Jens Axboe , Al Viro , Christoph Hellwig Cc: David Howells , Matthew Wilcox , Jan Kara , Jeff Layton , David Hildenbrand , Jason Gunthorpe , Logan Gunthorpe , Hillf Danton , Linus Torvalds , linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Christoph Hellwig , John Hubbard , Miklos Szeredi , Arnd Bergmann , Greg Kroah-Hartman Subject: [PATCH v16 05/13] tty, proc, kernfs, random: Use direct_splice_read() Date: Wed, 8 Mar 2023 14:37:46 +0000 Message-Id: <20230308143754.1976726-6-dhowells@redhat.com> In-Reply-To: <20230308143754.1976726-1-dhowells@redhat.com> References: <20230308143754.1976726-1-dhowells@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Rspamd-Queue-Id: C2C571C0011 X-Stat-Signature: fe5man6hye59ne8ixknubeo77treh67w X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1678286301-216764 X-HE-Meta: U2FsdGVkX1+4wTNlZcleNqSAP32sml37eYdJ0L6ZvRM8dp2WXaGtCHtrlmk+BGtb6Kq+rpc2f8/h+r9pASw8VrxeTBGsEl2A0MwFHisIPfg200epRHGwfHM293kUbV1ZvQcEGs2xHPVPlDPIOzctjGJbP8Avme5n+VCM3MnJ2Wh7XYto01P+B2Da5JvOJ8R5auzXYEe9ywWHC3fNSr9Ea8/BAG3b9EHt/qSt0OLGAmIPldYOhD7ZPu23skr/DWTBW4YJ4X5xz2bvdX6ruldkDzWUuEFpzuOfhnW4FekeOHBJA0Xkdkfn2seY+7BHzG7fKoSCQEW2UyRT9AMnwThilCg171LKcf71sNo1sYij6y/GpMsMf8FCYMWOlD4XiXScWIQoba00IKa0mj4zIXCPtz8HeXQGYLz8/LvvR5tdYaqVRQmQxPOzUlvaame6XN2q5VZPU/gS/o4bgruBZA4U9REG0pTzA2XZh9TXv3FSwVEzaQuINb8JFkA0Awy9h0r6LUHkYjHV3fNXGetUWwpZrFc7zntYNjL2CCoQ56NPfLOrEY3PGwCXBmIj40eHwRZODx6IBOqz9DRs8NZqhz1oAT+JN+CsyonhEguEniX4+x5f1NQa7jUiPdD6y6HPozHZOFNoCJhTqOvJLT/8npurqSACO6RwI3zuuhUonQZVHki6eGAr7IRyGFuo2Ebl32IdnHP1ocK1ChNqnD4Q1c4EYJc8kbjfMIO5bot7xmJzaNVsqDegUm7SKTaivIshSe0b3YneeQXQQr22t6q+piHS27SW946QqsB996eZtVTwvFt4ZB5UOuIVA+Au5uZJQLFNjlK8HuRKOg+lWhoaz3p4oFPzQrFvTDl8nYWTSFj2T0hVbsGjGF2BAGjfy5Ean1hI91F3K3K2+aHSLii2mPhyeX+1D+yqMlaFTlA5Btqh67+x41Dh+O6DQ/E9dAu2T3T6737TCJQPFaFcKNLmG81 /60fh4DM MQUtfAecetdY3RcWq6MmRPGSeCiH2qmzxVAFrDI0W2zAB1iCqU3YtbquL/rD/7oYpEgwFYSb2HEnMRkrnUhPdaco+27OFTcbv9BvGY9+JmR2PwX5xIYkRHJKem842pAlXZTfjIzMUYmX84IoYKtvZ16MX/ZrbB9iu9eRyI3AtDhysPzpBEOfEzEB2tzeyXXbFwMyMskRqHXtVf3olgjGfU6zARt4/Z84li1dgFnlXD2N8fwP3rwbwIMMz6QCokMcNoLbSnVgLioLvj0y98VCo86VdaQwFj6RQYX63CmZ48tXSAzBOJ/nbnSxS4QGOPrDK+5uxDs2IJobcK2YjdULJ4X1ruFUMq69Np/e83PtX1X4s+pY9MerGZ/DDpv8QYSeczI2LB5OiOQB7/apprVbmtmXjVqCV9r3O6yj9kSUZEoWf7heRB6ALp87hitysqrz2bbRzaKSpmillaElCoj5luVarphwH8gmfh2dXxdDus+6ahIptye69yvtbY/bnDS/HFSeIup0W5R6Sv7CeJhHYEvjmUcnHQWS5QW69OO0+27GK5tBzRU4xWvB0eg== 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 direct_splice_read() for tty, procfs, kernfs and random files rather than going through generic_file_splice_read() as they just copy the file into the output buffer and don't splice pages. This avoids the need for them to have a ->read_folio() to satisfy filemap_splice_read(). Signed-off-by: David Howells cc: Christoph Hellwig cc: Jens Axboe cc: Al Viro cc: John Hubbard cc: David Hildenbrand cc: Matthew Wilcox cc: Miklos Szeredi cc: Arnd Bergmann cc: Greg Kroah-Hartman cc: linux-block@vger.kernel.org cc: linux-fsdevel@vger.kernel.org cc: linux-mm@kvack.org --- drivers/char/random.c | 4 ++-- drivers/tty/tty_io.c | 4 ++-- fs/kernfs/file.c | 2 +- fs/proc/inode.c | 4 ++-- fs/proc/proc_sysctl.c | 2 +- fs/proc_namespace.c | 6 +++--- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/char/random.c b/drivers/char/random.c index ce3ccd172cc8..792713616ba8 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -1546,7 +1546,7 @@ const struct file_operations random_fops = { .compat_ioctl = compat_ptr_ioctl, .fasync = random_fasync, .llseek = noop_llseek, - .splice_read = generic_file_splice_read, + .splice_read = direct_splice_read, .splice_write = iter_file_splice_write, }; @@ -1557,7 +1557,7 @@ const struct file_operations urandom_fops = { .compat_ioctl = compat_ptr_ioctl, .fasync = random_fasync, .llseek = noop_llseek, - .splice_read = generic_file_splice_read, + .splice_read = direct_splice_read, .splice_write = iter_file_splice_write, }; diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c index 36fb945fdad4..9d117e579dfb 100644 --- a/drivers/tty/tty_io.c +++ b/drivers/tty/tty_io.c @@ -466,7 +466,7 @@ static const struct file_operations tty_fops = { .llseek = no_llseek, .read_iter = tty_read, .write_iter = tty_write, - .splice_read = generic_file_splice_read, + .splice_read = direct_splice_read, .splice_write = iter_file_splice_write, .poll = tty_poll, .unlocked_ioctl = tty_ioctl, @@ -481,7 +481,7 @@ static const struct file_operations console_fops = { .llseek = no_llseek, .read_iter = tty_read, .write_iter = redirected_tty_write, - .splice_read = generic_file_splice_read, + .splice_read = direct_splice_read, .splice_write = iter_file_splice_write, .poll = tty_poll, .unlocked_ioctl = tty_ioctl, diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c index e4a50e4ff0d2..9d23b8141db7 100644 --- a/fs/kernfs/file.c +++ b/fs/kernfs/file.c @@ -1011,7 +1011,7 @@ const struct file_operations kernfs_file_fops = { .release = kernfs_fop_release, .poll = kernfs_fop_poll, .fsync = noop_fsync, - .splice_read = generic_file_splice_read, + .splice_read = direct_splice_read, .splice_write = iter_file_splice_write, }; diff --git a/fs/proc/inode.c b/fs/proc/inode.c index f495fdb39151..711f12706469 100644 --- a/fs/proc/inode.c +++ b/fs/proc/inode.c @@ -591,7 +591,7 @@ static const struct file_operations proc_iter_file_ops = { .llseek = proc_reg_llseek, .read_iter = proc_reg_read_iter, .write = proc_reg_write, - .splice_read = generic_file_splice_read, + .splice_read = direct_splice_read, .poll = proc_reg_poll, .unlocked_ioctl = proc_reg_unlocked_ioctl, .mmap = proc_reg_mmap, @@ -617,7 +617,7 @@ static const struct file_operations proc_reg_file_ops_compat = { static const struct file_operations proc_iter_file_ops_compat = { .llseek = proc_reg_llseek, .read_iter = proc_reg_read_iter, - .splice_read = generic_file_splice_read, + .splice_read = direct_splice_read, .write = proc_reg_write, .poll = proc_reg_poll, .unlocked_ioctl = proc_reg_unlocked_ioctl, diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c index 5851eb5bc726..e49f99657d1c 100644 --- a/fs/proc/proc_sysctl.c +++ b/fs/proc/proc_sysctl.c @@ -869,7 +869,7 @@ static const struct file_operations proc_sys_file_operations = { .poll = proc_sys_poll, .read_iter = proc_sys_read, .write_iter = proc_sys_write, - .splice_read = generic_file_splice_read, + .splice_read = direct_splice_read, .splice_write = iter_file_splice_write, .llseek = default_llseek, }; diff --git a/fs/proc_namespace.c b/fs/proc_namespace.c index 846f9455ae22..492abbbeff5e 100644 --- a/fs/proc_namespace.c +++ b/fs/proc_namespace.c @@ -324,7 +324,7 @@ static int mountstats_open(struct inode *inode, struct file *file) const struct file_operations proc_mounts_operations = { .open = mounts_open, .read_iter = seq_read_iter, - .splice_read = generic_file_splice_read, + .splice_read = direct_splice_read, .llseek = seq_lseek, .release = mounts_release, .poll = mounts_poll, @@ -333,7 +333,7 @@ const struct file_operations proc_mounts_operations = { const struct file_operations proc_mountinfo_operations = { .open = mountinfo_open, .read_iter = seq_read_iter, - .splice_read = generic_file_splice_read, + .splice_read = direct_splice_read, .llseek = seq_lseek, .release = mounts_release, .poll = mounts_poll, @@ -342,7 +342,7 @@ const struct file_operations proc_mountinfo_operations = { const struct file_operations proc_mountstats_operations = { .open = mountstats_open, .read_iter = seq_read_iter, - .splice_read = generic_file_splice_read, + .splice_read = direct_splice_read, .llseek = seq_lseek, .release = mounts_release, };