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 0C70EC71136 for ; Tue, 17 Jun 2025 10:23:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 697B26B0088; Tue, 17 Jun 2025 06:23:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 648926B00A1; Tue, 17 Jun 2025 06:23:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5110C6B009C; Tue, 17 Jun 2025 06:23:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 39B9E6B0088 for ; Tue, 17 Jun 2025 06:23:46 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id DBD0C140889 for ; Tue, 17 Jun 2025 10:23:45 +0000 (UTC) X-FDA: 83564506410.18.296092C Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by imf09.hostedemail.com (Postfix) with ESMTP id 973A6140004 for ; Tue, 17 Jun 2025 10:23:43 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=0vtO1r83; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=MFXM112g; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=0vtO1r83; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=MFXM112g; spf=pass (imf09.hostedemail.com: domain of jack@suse.cz designates 195.135.223.131 as permitted sender) smtp.mailfrom=jack@suse.cz; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1750155824; 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=mgKx+Rhufud+xyv84CkP5jQpT6pJPjmkPqgzNgofRZY=; b=bVr5O1KiYxK1XFRV+fYCQYBH0KadJpHFUguE/307eo2ePoYHaZpof59e9Rlc2EZ2Lu0Ag4 Rg5TfMWmgYhyKJsKfRECbVuJLx+LzB/5D1m6NKT2M3Zi03SpbGtRshhj7jjZeNXJTZXyeN rYghIANgZIwnSmba0kZ+C72DYKSqVGE= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=0vtO1r83; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=MFXM112g; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=0vtO1r83; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=MFXM112g; spf=pass (imf09.hostedemail.com: domain of jack@suse.cz designates 195.135.223.131 as permitted sender) smtp.mailfrom=jack@suse.cz; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1750155824; a=rsa-sha256; cv=none; b=r7KYjrlgSmIqDaGvu0NP2knSb1VYFMzTF2rZbz/dxkDjzUJQ5fapq4NXumTtz2WqZGSOS4 25T8lrw2nKju+C3PNfx8prMVm2jDEOZ9e9bTZmyxXIWNmkIangle65UICIoy4lK8f6lw4A QpR4S5gGBjYNoZD3wyJD6chCGG5HAyo= Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id C87AF1F454; Tue, 17 Jun 2025 10:23:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1750155821; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=mgKx+Rhufud+xyv84CkP5jQpT6pJPjmkPqgzNgofRZY=; b=0vtO1r83WRAKyen/sl74pMYrwEeINd06w3kouKw4XtQ9dQRPADLJ6CM5JYXunqVAkAUnGT 9C9SJGFB86ITz6p0vbKmlWMotVPtFVkgbtgpanOBzpBUJ5FoTXmS1oeJ2zbY4BlWg4Kjqe 3fQ7eXKJ56YE6xUi6J3Ype8YfurulIE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1750155821; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=mgKx+Rhufud+xyv84CkP5jQpT6pJPjmkPqgzNgofRZY=; b=MFXM112gzLzycqzUCeXn0pDIkj1ZAFT7HH7Jay35zGiLu/sJ0s7oopW+e62NvCfn15BsWZ ycahuii9UnS1A+BA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1750155821; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=mgKx+Rhufud+xyv84CkP5jQpT6pJPjmkPqgzNgofRZY=; b=0vtO1r83WRAKyen/sl74pMYrwEeINd06w3kouKw4XtQ9dQRPADLJ6CM5JYXunqVAkAUnGT 9C9SJGFB86ITz6p0vbKmlWMotVPtFVkgbtgpanOBzpBUJ5FoTXmS1oeJ2zbY4BlWg4Kjqe 3fQ7eXKJ56YE6xUi6J3Ype8YfurulIE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1750155821; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=mgKx+Rhufud+xyv84CkP5jQpT6pJPjmkPqgzNgofRZY=; b=MFXM112gzLzycqzUCeXn0pDIkj1ZAFT7HH7Jay35zGiLu/sJ0s7oopW+e62NvCfn15BsWZ ycahuii9UnS1A+BA== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id A778213AE1; Tue, 17 Jun 2025 10:23:41 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id IFuHKC1CUWhdHAAAD6G6ig (envelope-from ); Tue, 17 Jun 2025 10:23:41 +0000 Received: by quack3.suse.cz (Postfix, from userid 1000) id 5CF2BA29F0; Tue, 17 Jun 2025 12:23:41 +0200 (CEST) Date: Tue, 17 Jun 2025 12:23:41 +0200 From: Jan Kara To: Lorenzo Stoakes Cc: 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 , Christian Brauner , Jan Kara , 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: References: <08db85970d89b17a995d2cffae96fb4cc462377f.1750099179.git.lorenzo.stoakes@oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <08db85970d89b17a995d2cffae96fb4cc462377f.1750099179.git.lorenzo.stoakes@oracle.com> X-Rspamd-Queue-Id: 973A6140004 X-Rspamd-Server: rspam03 X-Rspam-User: X-Stat-Signature: g4uw967rtfx5q1coyafrg85h6w33ozyw X-HE-Tag: 1750155823-260788 X-HE-Meta: U2FsdGVkX18azrY0/l1y0JAV0K7Ga7ExGNHOPuBppLP+L1gio/VEe1wLFXOWE8vdohF5Aa0nK5r/muDWFHFiHOLBFVFvSqDwolYF9WZwlEoV1nYic1dWJLKuuuaN08FVRR8Ybjoxbix2ve5BPCIPphb/5uAk2grDl+CpEF268AVXHmhuTsunkA2U69jyz23BNwDRdwr5E3cP4If+m6JqIEeC0fwIdlYa1LJs3DAOVgkSQtjN5WG/q1nBY6zhl9YcZjjDzApUXum7VsgQByytBNDRjee9j714VAAa4JQV5JXYdGs0m6zYSh+Sg0v+TGMeQq50e1nHBItKBkBDBfkGOqMj0i4G2A7NlJRn+tW1Kat7l2hIWfcdhR3UDhFQav6X6Qq3iqEcERNbXmFXRVFmGVM3jLLaveLlazVOr+aipME3Yg7hYKkkXIN7VCiVD/Hd4YyDYwutyVZm+s5093OsmY3iaVYHrFGUCI4Ta1FepHf4pGa9gL1b6Po0Sh486ur9XRxyW+m+LrilGpnevf84oGn//ugss3DRv/+M+jivl9Nphy6BpUZHvT2+ZW8t3S2ohlHqY3aucmVZFwSqgabHKUKKZGEfb3kVWkZdj1n2u/MI+nmZ3T8sS6xnDo6x5fJumYLhswXQ02Dz1YS46Ui8nkJyoZSg210VQk887CyBO6UiGCl9Idwqt1vXgYBbnRWCh2vdsu9F5ivgLBxWVJNiNhb0iMTnE2IyRtcTmfC4foN9anjDVYP4co14y2WkP/0hven5F0HckAs+nmTN1UnK2YalhVGhIaNyctid/p+O8BFIeOUm06ZEU/ZcpLI/KaUjIEDNoboHO9PsogWlHtC6WzVx0fTyAdbj5KA8i58zZc79ciuxN6psd90adkrNNwIKtvb3xQXkWBWPlsZgT+qqq2T7EGz7pDKXDB9tXGpiinCMgYUufonDSAQNJIy82p6qpdmvPHt2LDoteMQY6kO CpHqWrRy AXY8EIiyFS2YTSrwbch6tWl2UgNCyNM7xYswwBPqe6IYJPWL9s9tDsYWrFjIhwp01VXQgHHn/eeTyVAswwPDr/G11lCFqRaebe14vgbgD1Pu80/J3tE66z0LkBHyZb451zJphsrbNIavm6nylyipBwZE8O/JPTbuJUfNvUXRIXUUya8p03UUd+octBRBuFHqyEQc0tdhtA5Pz0H7C2sDV7tDFNEe9gK0gewZT2IpP8Wm8EsD7yqU0lTX2hbwTNgP9wHSbcrighhGAKliC4cOMmnqIxz6Rwf6Z7X0wwV0M2PH7KhZlJOOKeqPHFMldTVvtzfoGZnS1t5fBfeyvstXzHmF2ER47BIGMuwv8wtjNGNCYToT8DdMYTcofgml/qUKS/2ksbhMPRCenyCM0ysDP4zonU7oDev7aL+5N8VHMpL7Sw3iXrh9eoCb2oJl2Wu0iFTi13RvbIh8D67UrOy4/aF1OKVAE5cCgwkTkiTmvQaqfaak= 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 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... > > if (bdev_read_only(I_BDEV(bd_inode))) > - return generic_file_readonly_mmap(file, vma); > + return generic_file_readonly_mmap_prepare(desc); > > - return generic_file_mmap(file, vma); > + return generic_file_mmap_prepare(desc); > } > > const struct file_operations def_blk_fops = { ... > @@ -492,16 +492,17 @@ static void afs_drop_open_mmap(struct afs_vnode *vnode) > /* > * Handle setting up a memory mapping on an AFS file. > */ > -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. > int ret; > > afs_add_open_mmap(vnode); > > - ret = generic_file_mmap(file, vma); > + ret = generic_file_mmap_prepare(desc); > if (ret == 0) > - vma->vm_ops = &afs_vm_ops; > + desc->vm_ops = &afs_vm_ops; > else > afs_drop_open_mmap(vnode); > return ret; > diff --git a/fs/erofs/data.c b/fs/erofs/data.c > index 6a329c329f43..52dfd1a44c43 100644 > --- a/fs/erofs/data.c > +++ b/fs/erofs/data.c > @@ -409,20 +409,22 @@ static const struct vm_operations_struct erofs_dax_vm_ops = { > .huge_fault = erofs_dax_huge_fault, > }; > > -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... > - return generic_file_readonly_mmap(file, vma); > + return generic_file_readonly_mmap_prepare(desc); > > - if ((vma->vm_flags & VM_SHARED) && (vma->vm_flags & VM_MAYWRITE)) > + if ((desc->vm_flags & VM_SHARED) && (desc->vm_flags & VM_MAYWRITE)) > return -EINVAL; > > - vma->vm_ops = &erofs_dax_vm_ops; > - vm_flags_set(vma, VM_HUGEPAGE); > + desc->vm_ops = &erofs_dax_vm_ops; > + desc->vm_flags |= VM_HUGEPAGE; > return 0; > } ... > diff --git a/fs/smb/client/file.c b/fs/smb/client/file.c > index 9835672267d2..2ed5173cfa73 100644 > --- a/fs/smb/client/file.c > +++ b/fs/smb/client/file.c > @@ -2995,8 +2995,9 @@ static const struct vm_operations_struct cifs_file_vm_ops = { > .page_mkwrite = cifs_page_mkwrite, > }; > > -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. > > @@ -3005,16 +3006,17 @@ int cifs_file_strict_mmap(struct file *file, struct vm_area_struct *vma) > if (!CIFS_CACHE_READ(CIFS_I(inode))) > rc = cifs_zap_mapping(inode); > if (!rc) > - rc = generic_file_mmap(file, vma); > + rc = generic_file_mmap_prepare(desc); > if (!rc) > - vma->vm_ops = &cifs_file_vm_ops; > + desc->vm_ops = &cifs_file_vm_ops; > > free_xid(xid); > return rc; > } > > -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)). Honza -- Jan Kara SUSE Labs, CR