Hello, I wanted to add one more thing: The series has gathered decent amount of review so it seems to be mostly ready to go. But I'd still like some review from FUSE side (Miklos?) and then someone from pagecache / mm side checking mainly patch 3/14. Since most of the changes are in fs, I guess it makes most sense to merge this through some fs tree - either XFS, ext4, or VFS. Honza On Mon 07-06-21 16:52:10, Jan Kara wrote: > Hello, > > here is another version of my patches to address races between hole punching > and page cache filling functions for ext4 and other filesystems. The biggest > change since the last time is providing function to lock two mappings and using > it from XFS. Other changes were pretty minor. > > Out of all filesystem supporting hole punching, only GFS2 and OCFS2 remain > unresolved. GFS2 people are working on their own solution (cluster locking is > involved), OCFS2 has even bigger issues (maintainers informed, looking into > it). > > As a next step, I'd like to actually make sure all calls to > truncate_inode_pages() happen under mapping->invalidate_lock, add the assert > and then we can also get rid of i_size checks in some places (truncate can > use the same serialization scheme as hole punch). But that step is mostly > a cleanup so I'd like to get these functional fixes in first. > > Note that the first patch of the series is already in mm tree but I'm > submitting it here so that the series applies to Linus' tree cleanly. > > Changes since v6: > * Added some reviewed-by tags > * Added wrapper for taking invalidate_lock similar to inode_lock > * Renamed wrappers for taking invalidate_lock for two inodes > * Added xfs patch to make xfs_isilocked() work better even without lockdep > * Some minor documentation fixes > > Changes since v5: > * Added some reviewed-by tags > * Added functions for locking two mappings and using them from XFS where needed > * Some minor code style & comment fixes > > Changes since v4: > * Rebased onto 5.13-rc1 > * Removed shmfs conversion patches > * Fixed up zonefs changelog > * Fixed up XFS comments > * Added patch fixing up definition of file_operations in Documentation/vfs/ > * Updated documentation and comments to explain invalidate_lock is used also > to prevent changes through memory mappings to existing pages for some VFS > operations. > > Changes since v3: > * Renamed and moved lock to struct address_space > * Added conversions of tmpfs, ceph, cifs, fuse, f2fs > * Fixed error handling path in filemap_read() > * Removed .page_mkwrite() cleanup from the series for now > > Changes since v2: > * Added documentation and comments regarding lock ordering and how the lock is > supposed to be used > * Added conversions of ext2, xfs, zonefs > * Added patch removing i_mapping_sem protection from .page_mkwrite handlers > > Changes since v1: > * Moved to using inode->i_mapping_sem instead of aops handler to acquire > appropriate lock > > --- > Motivation: > > Amir has reported [1] a that ext4 has a potential issues when reads can race > with hole punching possibly exposing stale data from freed blocks or even > corrupting filesystem when stale mapping data gets used for writeout. The > problem is that during hole punching, new page cache pages can get instantiated > and block mapping from the looked up in a punched range after > truncate_inode_pages() has run but before the filesystem removes blocks from > the file. In principle any filesystem implementing hole punching thus needs to > implement a mechanism to block instantiating page cache pages during hole > punching to avoid this race. This is further complicated by the fact that there > are multiple places that can instantiate pages in page cache. We can have > regular read(2) or page fault doing this but fadvise(2) or madvise(2) can also > result in reading in page cache pages through force_page_cache_readahead(). > > There are couple of ways how to fix this. First way (currently implemented by > XFS) is to protect read(2) and *advise(2) calls with i_rwsem so that they are > serialized with hole punching. This is easy to do but as a result all reads > would then be serialized with writes and thus mixed read-write workloads suffer > heavily on ext4. Thus this series introduces inode->i_mapping_sem and uses it > when creating new pages in the page cache and looking up their corresponding > block mapping. We also replace EXT4_I(inode)->i_mmap_sem with this new rwsem > which provides necessary serialization with hole punching for ext4. > > Honza > > [1] https://lore.kernel.org/linux-fsdevel/CAOQ4uxjQNmxqmtA_VbYW0Su9rKRk2zobJmahcyeaEVOFKVQ5dw@xxxxxxxxxxxxxx/ > > Previous versions: > Link: https://lore.kernel.org/linux-fsdevel/20210208163918.7871-1-jack@xxxxxxx/ > Link: https://lore.kernel.org/r/20210413105205.3093-1-jack@xxxxxxx > Link: https://lore.kernel.org/r/20210423171010.12-1-jack@xxxxxxx > Link: https://lore.kernel.org/r/20210512101639.22278-1-jack@xxxxxxx > Link: http://lore.kernel.org/r/20210525125652.20457-1-jack@xxxxxxx -- Jan Kara <jack@xxxxxxxx> SUSE Labs, CR