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 EEE89C7115A for ; Tue, 17 Jun 2025 11:54:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7415F6B008A; Tue, 17 Jun 2025 07:54:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6F2B16B0092; Tue, 17 Jun 2025 07:54:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5E1396B0096; Tue, 17 Jun 2025 07:54:52 -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 45FF96B008A for ; Tue, 17 Jun 2025 07:54:52 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id F324E1CC838 for ; Tue, 17 Jun 2025 11:54:51 +0000 (UTC) X-FDA: 83564735982.20.40F85A1 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf02.hostedemail.com (Postfix) with ESMTP id 8FA0580002; Tue, 17 Jun 2025 11:54:49 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=tFaXplkY; spf=pass (imf02.hostedemail.com: domain of brauner@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=brauner@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1750161290; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=M830G6MWsfr8Yer9Q+Whdt4JLPiVfTD/TS3CVpERxzY=; b=UjvXZDGdratbpLrGZYhY41yRsghc/gCz5/S17/oy/Io2vDyjSlJ/D0FFNTfaSnm0cD3HI1 riNV06x9gW19T+ugbnvSnQNZwIzkxMrkhVWzZwD62oOBMc6cMjKYcB2cyP7y/ibRr0Q32t UhXobyfqTyG+RfvsI3oJ5OI5zU+ekDA= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=tFaXplkY; spf=pass (imf02.hostedemail.com: domain of brauner@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=brauner@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1750161290; a=rsa-sha256; cv=none; b=b5JdrDe0PLYc6aqTqzAcRS0ijuvAyz8w/dR5mTe82LVBIec4fcItMjuOv9mkliwful0JqH VMD2Rb0dgoJbNhCDGWNyRxsuiHQGchq9F6ZuSpXdjmDb+sdPBjHenhS36TLnSasj8g5Px9 TRvsObABdtO9+HpGd3U8N51DGIh8X8w= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 8187D5C644F; Tue, 17 Jun 2025 11:52:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5FE2BC4CEE3; Tue, 17 Jun 2025 11:54:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750161287; bh=FM4A89teoGTiVHD+mgfi0AiySK9n5DYBMecgMr0uDqg=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=tFaXplkY5nyo20ol4Egr1jKpFof+Bu6EVWj8rd7Q/XVflaJDEuUt2QBZbBOzt+ds9 QqRJ0416pNcF2gR1cOk/fhlCLM2NyYyFsqO7E+6LcmkPsrh7dOxbot5r+EPV6Mf/Eg m8Y6DUqcdfGWwY+D64Xca2p2YAi1GLXZEZrvZUt4zBrfooL7qgslbeGTMTkIs72Kmi ZyPQ8xq03VfK0FOehVNSaD+X4yl6DS92oWcHFB7su60iMijW1l2mzbjqhQKi8Q2XlY I0aiDlWsnalkNnHvD2WZzlIylBsOw4cpNRmvr5us4RCENbN2fbk5X67yCW3LloR+n5 oLveA9uaTcrqQ== Date: Tue, 17 Jun 2025 13:54:21 +0200 From: Christian Brauner To: Jan Kara Cc: Lorenzo Stoakes , Andrew Morton , "Liam R . Howlett" , Jens Axboe , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , David Airlie , Simona Vetter , Eric Van Hensbergen , Latchesar Ionkov , Dominique Martinet , Christian Schoenebeck , David Sterba , David Howells , Marc Dionne , Alexander Viro , Benjamin LaHaise , Miklos Szeredi , Amir Goldstein , Kent Overstreet , "Tigran A . Aivazian" , Kees Cook , Chris Mason , Josef Bacik , Xiubo Li , Ilya Dryomov , Jan Harkes , coda@cs.cmu.edu, Tyler Hicks , Gao Xiang , Chao Yu , Yue Hu , Jeffle Xu , Sandeep Dhavale , Hongbo Li , Namjae Jeon , Sungjong Seo , Yuezhang Mo , Theodore Ts'o , Andreas Dilger , Jaegeuk Kim , OGAWA Hirofumi , Viacheslav Dubeyko , John Paul Adrian Glaubitz , Yangtao Li , Richard Weinberger , Anton Ivanov , Johannes Berg , Mikulas Patocka , David Woodhouse , Dave Kleikamp , Trond Myklebust , Anna Schumaker , Ryusuke Konishi , Konstantin Komarov , Mark Fasheh , Joel Becker , Joseph Qi , Bob Copeland , Mike Marshall , Martin Brandenburg , Steve French , Paulo Alcantara , Ronnie Sahlberg , Shyam Prasad N , Tom Talpey , Bharath SM , Zhihao Cheng , Hans de Goede , Carlos Maiolino , Damien Le Moal , Naohiro Aota , Johannes Thumshirn , Dan Williams , Matthew Wilcox , Vlastimil Babka , Jann Horn , Pedro Falcato , linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, v9fs@lists.linux.dev, linux-fsdevel@vger.kernel.org, linux-afs@lists.infradead.org, linux-aio@kvack.org, linux-unionfs@vger.kernel.org, linux-bcachefs@vger.kernel.org, linux-mm@kvack.org, linux-btrfs@vger.kernel.org, ceph-devel@vger.kernel.org, codalist@coda.cs.cmu.edu, ecryptfs@vger.kernel.org, linux-erofs@lists.ozlabs.org, linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-um@lists.infradead.org, linux-mtd@lists.infradead.org, jfs-discussion@lists.sourceforge.net, linux-nfs@vger.kernel.org, linux-nilfs@vger.kernel.org, ntfs3@lists.linux.dev, ocfs2-devel@lists.linux.dev, linux-karma-devel@lists.sourceforge.net, devel@lists.orangefs.org, linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, linux-xfs@vger.kernel.org, nvdimm@lists.linux.dev Subject: Re: [PATCH 09/10] fs: convert most other generic_file_*mmap() users to .mmap_prepare() Message-ID: <20250617-allenfalls-brummen-3ce2da5794f8@brauner> References: <08db85970d89b17a995d2cffae96fb4cc462377f.1750099179.git.lorenzo.stoakes@oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 8FA0580002 X-Stat-Signature: ogdbntyobxo7exhk5c7rrsf5dqu8u5q7 X-Rspam-User: X-HE-Tag: 1750161289-819973 X-HE-Meta: U2FsdGVkX1/de5yIwH2LITnyhqVRpLyI9ngkspxbd7UeNT7POSQWw7pIJP4S3t2IYDWb07DMkcRwNsKD/dIOIvJ1MLdp4oClaBy15SGeAZ4AsRT3irWzzxNRkpkWU1B7NlGsyXFHdpfGMHO4qyB0vE32Tg2fBSmCzmrCC0Tub/HTxSJwlFYSQaiPpSRWRBxnnLfFXZutWBJnoB9FbA0UgdKaarGRYU0YA0WWD582OQ6rGTayevcqh0Dm03siMo90XgLTJOi4iD90M8tRGPBxh1x4Rfq6x+WqeXyqusBIpTS62g4KmlSZFhqAwAV4EZjYUCz8gJNolWK3fUbG6t0LPWs81bJEDSJ2Rus4qTlslulgf7JFAT7S7rzYd6DVp1ofnl/f9v6vitxGTWWORKnloNRnGbf1A5tjhbo9ftgLC6gTQszhy1yXAs0mr0bfqpoTOqbti4vL1Z6rpN5lLnMHhPQE6tfjNZ8a+4CuKaxzcp/uOxiZ28ya5iUrwWDhzl9JDCsyfbRHsRzzuRKU6nlOTeemSFSb2wVpXWZwka8m/jdIVT6rPit141g2yxBL+bKDEPEKMDGVAGU3ZQ9sD95Df8nOyWNS0TIZ9d/NFqj4Zl2OiOPDmdViJhNaocJNmPhjCnDjO+D92DsqNZtVV42RnaxGaj6GsaNV9CUlGjwfgqAUTVXSDO7UnIgB1VALzQbd9ZqjKgIgnKNuUy60Ccedd/FJPFBrQLiuuSofWLcUuf44oZB4yLUpeLS00Lt3sIrvgtYUVrXUNfVP+7Ddj1HPj40NVz7MTTWWFrc2cBrxduZKiRkwklrtRSqEUxFQEMJwb/vM9XxrmMFiZF30Tqotp+UrXa7c84/gJIHDhpugfSig9LsKoPZJdacQ3dJMvChquXz4dG17HoC2n7KYbkwQo4oD3stmocCxGWQms7NrIN2+FzEEQQ0ihFom8DaZqxmXQkIzlADM+NMIMpWwyGa 6qfuFvLq YUdGhXWed3y8SdDJsaHpMfP5fpRFRj52AtigRK9eyjcSRb5l3jbvfKLhDl6OVPXP7ZRzaSerPpG08PUSHpf4bKnfYuHLDUqmaHkhd9XLXMy9XNPm4y/tnQK25UeJmt3L8ra2/d1aYl9VMQupozVc7Ho8ZeGyO36WGdS+tPmC4iHizh0WPSA2YxTzWlT+rf0v/KXuZ/l1p46dsfGY7CFS4v8Jlrna2fxlKKitiiywU4Y7N7HInJXylaTjh+OudGYlE4yQQarctx7JrANSV/TXoaR6C8F3kQ4dGxVNraWqAtKWvrvnItpnXTYgQECk6V2C8KbmWAAiFGSgNbLZJbG68QpQ1ZdELALC2hXT1a+AMEZw+Cb8phsRflHGuweSrlQDQ4VhXawfxwyuw27z7TYszYPsc5qcf13Wi3HxKIvn2YgNgWo82LP8IAxNla4ksdgES7Rnz 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: On Tue, Jun 17, 2025 at 12:23:41PM +0200, Jan Kara wrote: > On Mon 16-06-25 20:33:28, Lorenzo Stoakes wrote: > > Update nearly all generic_file_mmap() and generic_file_readonly_mmap() > > callers to use generic_file_mmap_prepare() and > > generic_file_readonly_mmap_prepare() respectively. > > > > We update blkdev, 9p, afs, erofs, ext2, nfs, ntfs3, smb, ubifs and vboxsf > > file systems this way. > > > > Remaining users we cannot yet update are ecryptfs, fuse and cramfs. The > > former two are nested file systems that must support any underlying file > > ssytem, and cramfs inserts a mixed mapping which currently requires a VMA. > > > > Once all file systems have been converted to mmap_prepare(), we can then > > update nested file systems. > > > > Signed-off-by: Lorenzo Stoakes > > Overall the patch looks good. Just a couple of notes regarding pointless > local variable being created... > > > --- > > block/fops.c | 9 +++++---- > > fs/9p/vfs_file.c | 11 ++++++----- > > fs/afs/file.c | 11 ++++++----- > > fs/erofs/data.c | 16 +++++++++------- > > fs/ext2/file.c | 12 +++++++----- > > fs/nfs/file.c | 13 +++++++------ > > fs/nfs/internal.h | 2 +- > > fs/nfs/nfs4file.c | 2 +- > > fs/ntfs3/file.c | 15 ++++++++------- > > fs/smb/client/cifsfs.c | 12 ++++++------ > > fs/smb/client/cifsfs.h | 4 ++-- > > fs/smb/client/file.c | 14 ++++++++------ > > fs/ubifs/file.c | 8 ++++---- > > fs/vboxsf/file.c | 8 ++++---- > > 14 files changed, 74 insertions(+), 63 deletions(-) > > > > diff --git a/block/fops.c b/block/fops.c > > index 1309861d4c2c..5a0ebc81e489 100644 > > --- a/block/fops.c > > +++ b/block/fops.c > > @@ -911,14 +911,15 @@ static long blkdev_fallocate(struct file *file, int mode, loff_t start, > > return error; > > } > > > > -static int blkdev_mmap(struct file *file, struct vm_area_struct *vma) > > +static int blkdev_mmap_prepare(struct vm_area_desc *desc) > > { > > + struct file *file = desc->file; > > struct inode *bd_inode = bdev_file_inode(file); > > I guess no need to create 'file' variable here since it has only one use in > the line above... Agreed, fixed in-tree. > > -static int afs_file_mmap(struct file *file, struct vm_area_struct *vma) > > +static int afs_file_mmap_prepare(struct vm_area_desc *desc) > > { > > + struct file *file = desc->file; > > struct afs_vnode *vnode = AFS_FS_I(file_inode(file)); > > Same comment about pointless local variable here as well. Same. > > -static int erofs_file_mmap(struct file *file, struct vm_area_struct *vma) > > +static int erofs_file_mmap_prepare(struct vm_area_desc *desc) > > { > > + struct file *file = desc->file; > > + > > if (!IS_DAX(file_inode(file))) > > And here... Same. > > -int cifs_file_strict_mmap(struct file *file, struct vm_area_struct *vma) > > +int cifs_file_strict_mmap_prepare(struct vm_area_desc *desc) > > { > > + struct file *file = desc->file; > > int xid, rc = 0; > > struct inode *inode = file_inode(file); > > Again pointless local variable 'file' here. Same. > > -int cifs_file_mmap(struct file *file, struct vm_area_struct *vma) > > +int cifs_file_mmap_prepare(struct vm_area_desc *desc) > > { > > + struct file *file = desc->file; > > int rc, xid; > > And here (the only use is in cifs_revalidate_file(file)). Same.