From: Jan Kara <jack@suse.cz> To: <linux-fsdevel@vger.kernel.org> Cc: Christoph Hellwig <hch@infradead.org>, Dave Chinner <david@fromorbit.com>, ceph-devel@vger.kernel.org, Chao Yu <yuchao0@huawei.com>, Damien Le Moal <damien.lemoal@wdc.com>, "Darrick J. Wong" <darrick.wong@oracle.com>, Jaegeuk Kim <jaegeuk@kernel.org>, Jeff Layton <jlayton@kernel.org>, Johannes Thumshirn <jth@kernel.org>, linux-cifs@vger.kernel.org, <linux-ext4@vger.kernel.org>, linux-f2fs-devel@lists.sourceforge.net, <linux-mm@kvack.org>, <linux-xfs@vger.kernel.org>, Miklos Szeredi <miklos@szeredi.hu>, Steve French <sfrench@samba.org>, Ted Tso <tytso@mit.edu>, Matthew Wilcox <willy@infradead.org>, Jan Kara <jack@suse.cz> Subject: [PATCH 13/14] ceph: Fix race between hole punch and page fault Date: Mon, 7 Jun 2021 16:52:23 +0200 [thread overview] Message-ID: <20210607145236.31852-13-jack@suse.cz> (raw) In-Reply-To: <20210607144631.8717-1-jack@suse.cz> Ceph has a following race between hole punching and page fault: CPU1 CPU2 ceph_fallocate() ... ceph_zero_pagecache_range() ceph_filemap_fault() faults in page in the range being punched ceph_zero_objects() And now we have a page in punched range with invalid data. Fix the problem by using mapping->invalidate_lock similarly to other filesystems. Note that using invalidate_lock also fixes a similar race wrt ->readpage(). CC: Jeff Layton <jlayton@kernel.org> CC: ceph-devel@vger.kernel.org Reviewed-by: Jeff Layton <jlayton@kernel.org> Signed-off-by: Jan Kara <jack@suse.cz> --- fs/ceph/addr.c | 9 ++++++--- fs/ceph/file.c | 2 ++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c index c1570fada3d8..4664b93a32db 100644 --- a/fs/ceph/addr.c +++ b/fs/ceph/addr.c @@ -1401,9 +1401,11 @@ static vm_fault_t ceph_filemap_fault(struct vm_fault *vmf) ret = VM_FAULT_SIGBUS; } else { struct address_space *mapping = inode->i_mapping; - struct page *page = find_or_create_page(mapping, 0, - mapping_gfp_constraint(mapping, - ~__GFP_FS)); + struct page *page; + + filemap_invalidate_lock_shared(mapping); + page = find_or_create_page(mapping, 0, + mapping_gfp_constraint(mapping, ~__GFP_FS)); if (!page) { ret = VM_FAULT_OOM; goto out_inline; @@ -1424,6 +1426,7 @@ static vm_fault_t ceph_filemap_fault(struct vm_fault *vmf) vmf->page = page; ret = VM_FAULT_MAJOR | VM_FAULT_LOCKED; out_inline: + filemap_invalidate_unlock_shared(mapping); dout("filemap_fault %p %llu read inline data ret %x\n", inode, off, ret); } diff --git a/fs/ceph/file.c b/fs/ceph/file.c index 77fc037d5beb..e826b1b1e4af 100644 --- a/fs/ceph/file.c +++ b/fs/ceph/file.c @@ -2083,6 +2083,7 @@ static long ceph_fallocate(struct file *file, int mode, if (ret < 0) goto unlock; + filemap_invalidate_lock(inode->i_mapping); ceph_zero_pagecache_range(inode, offset, length); ret = ceph_zero_objects(inode, offset, length); @@ -2095,6 +2096,7 @@ static long ceph_fallocate(struct file *file, int mode, if (dirty) __mark_inode_dirty(inode, dirty); } + filemap_invalidate_unlock(inode->i_mapping); ceph_put_cap_refs(ci, got); unlock: -- 2.26.2
WARNING: multiple messages have this Message-ID (diff)
From: Jan Kara <jack@suse.cz> To: <linux-fsdevel@vger.kernel.org> Cc: linux-cifs@vger.kernel.org, Damien Le Moal <damien.lemoal@wdc.com>, linux-ext4@vger.kernel.org, Ted Tso <tytso@mit.edu>, "Darrick J. Wong" <darrick.wong@oracle.com>, Jeff Layton <jlayton@kernel.org>, Steve French <sfrench@samba.org>, Dave Chinner <david@fromorbit.com>, Matthew Wilcox <willy@infradead.org>, linux-f2fs-devel@lists.sourceforge.net, Christoph Hellwig <hch@infradead.org>, linux-mm@kvack.org, Miklos Szeredi <miklos@szeredi.hu>, Jan Kara <jack@suse.cz>, Jaegeuk Kim <jaegeuk@kernel.org>, ceph-devel@vger.kernel.org, Johannes Thumshirn <jth@kernel.org>, linux-xfs@vger.kernel.org Subject: [f2fs-dev] [PATCH 13/14] ceph: Fix race between hole punch and page fault Date: Mon, 7 Jun 2021 16:52:23 +0200 [thread overview] Message-ID: <20210607145236.31852-13-jack@suse.cz> (raw) In-Reply-To: <20210607144631.8717-1-jack@suse.cz> Ceph has a following race between hole punching and page fault: CPU1 CPU2 ceph_fallocate() ... ceph_zero_pagecache_range() ceph_filemap_fault() faults in page in the range being punched ceph_zero_objects() And now we have a page in punched range with invalid data. Fix the problem by using mapping->invalidate_lock similarly to other filesystems. Note that using invalidate_lock also fixes a similar race wrt ->readpage(). CC: Jeff Layton <jlayton@kernel.org> CC: ceph-devel@vger.kernel.org Reviewed-by: Jeff Layton <jlayton@kernel.org> Signed-off-by: Jan Kara <jack@suse.cz> --- fs/ceph/addr.c | 9 ++++++--- fs/ceph/file.c | 2 ++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c index c1570fada3d8..4664b93a32db 100644 --- a/fs/ceph/addr.c +++ b/fs/ceph/addr.c @@ -1401,9 +1401,11 @@ static vm_fault_t ceph_filemap_fault(struct vm_fault *vmf) ret = VM_FAULT_SIGBUS; } else { struct address_space *mapping = inode->i_mapping; - struct page *page = find_or_create_page(mapping, 0, - mapping_gfp_constraint(mapping, - ~__GFP_FS)); + struct page *page; + + filemap_invalidate_lock_shared(mapping); + page = find_or_create_page(mapping, 0, + mapping_gfp_constraint(mapping, ~__GFP_FS)); if (!page) { ret = VM_FAULT_OOM; goto out_inline; @@ -1424,6 +1426,7 @@ static vm_fault_t ceph_filemap_fault(struct vm_fault *vmf) vmf->page = page; ret = VM_FAULT_MAJOR | VM_FAULT_LOCKED; out_inline: + filemap_invalidate_unlock_shared(mapping); dout("filemap_fault %p %llu read inline data ret %x\n", inode, off, ret); } diff --git a/fs/ceph/file.c b/fs/ceph/file.c index 77fc037d5beb..e826b1b1e4af 100644 --- a/fs/ceph/file.c +++ b/fs/ceph/file.c @@ -2083,6 +2083,7 @@ static long ceph_fallocate(struct file *file, int mode, if (ret < 0) goto unlock; + filemap_invalidate_lock(inode->i_mapping); ceph_zero_pagecache_range(inode, offset, length); ret = ceph_zero_objects(inode, offset, length); @@ -2095,6 +2096,7 @@ static long ceph_fallocate(struct file *file, int mode, if (dirty) __mark_inode_dirty(inode, dirty); } + filemap_invalidate_unlock(inode->i_mapping); ceph_put_cap_refs(ci, got); unlock: -- 2.26.2 _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
next prev parent reply other threads:[~2021-06-07 14:52 UTC|newest] Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-06-07 14:52 [PATCH 0/14 v7] fs: Hole punch vs page cache filling races Jan Kara 2021-06-07 14:52 ` [f2fs-dev] " Jan Kara 2021-06-07 14:52 ` [PATCH 01/14] mm: Fix comments mentioning i_mutex Jan Kara 2021-06-07 14:52 ` [f2fs-dev] " Jan Kara 2021-06-07 15:31 ` Darrick J. Wong 2021-06-07 15:31 ` [f2fs-dev] " Darrick J. Wong 2021-06-10 9:06 ` Ming Lei 2021-06-10 9:06 ` [f2fs-dev] " Ming Lei 2021-06-10 10:40 ` Jan Kara 2021-06-10 10:40 ` [f2fs-dev] " Jan Kara 2021-06-07 14:52 ` [PATCH 02/14] documentation: Sync file_operations members with reality Jan Kara 2021-06-07 14:52 ` [f2fs-dev] " Jan Kara 2021-06-07 14:52 ` [PATCH 03/14] mm: Protect operations adding pages to page cache with invalidate_lock Jan Kara 2021-06-07 14:52 ` [f2fs-dev] " Jan Kara 2021-06-07 16:09 ` Darrick J. Wong 2021-06-07 16:09 ` [f2fs-dev] " Darrick J. Wong 2021-06-08 12:19 ` Jan Kara 2021-06-08 12:19 ` [f2fs-dev] " Jan Kara 2021-06-07 14:52 ` [PATCH 04/14] mm: Add functions to lock invalidate_lock for two mappings Jan Kara 2021-06-07 14:52 ` [f2fs-dev] " Jan Kara 2021-06-07 15:46 ` Darrick J. Wong 2021-06-07 15:46 ` [f2fs-dev] " Darrick J. Wong 2021-06-07 14:52 ` [PATCH 05/14] ext4: Convert to use mapping->invalidate_lock Jan Kara 2021-06-07 14:52 ` [f2fs-dev] " Jan Kara 2021-06-07 14:52 ` [PATCH 06/14] ext2: Convert to using invalidate_lock Jan Kara 2021-06-07 14:52 ` [f2fs-dev] " Jan Kara 2021-06-07 14:52 ` [PATCH 07/14] xfs: Refactor xfs_isilocked() Jan Kara 2021-06-07 14:52 ` [f2fs-dev] " Jan Kara 2021-06-07 15:49 ` Darrick J. Wong 2021-06-07 15:49 ` [f2fs-dev] " Darrick J. Wong 2021-06-08 22:18 ` Dave Chinner 2021-06-08 22:18 ` [f2fs-dev] " Dave Chinner 2021-06-07 14:52 ` [PATCH 08/14] xfs: Convert to use invalidate_lock Jan Kara 2021-06-07 14:52 ` [f2fs-dev] " Jan Kara 2021-06-07 15:56 ` Darrick J. Wong 2021-06-07 15:56 ` [f2fs-dev] " Darrick J. Wong 2021-06-08 12:23 ` Jan Kara 2021-06-08 12:23 ` [f2fs-dev] " Jan Kara 2021-06-07 14:52 ` [PATCH 09/14] xfs: Convert double locking of MMAPLOCK to use VFS helpers Jan Kara 2021-06-07 14:52 ` [f2fs-dev] " Jan Kara 2021-06-07 15:57 ` Darrick J. Wong 2021-06-07 15:57 ` [f2fs-dev] " Darrick J. Wong 2021-06-07 14:52 ` [PATCH 10/14] zonefs: Convert to using invalidate_lock Jan Kara 2021-06-07 14:52 ` [f2fs-dev] " Jan Kara 2021-06-07 14:52 ` [PATCH 11/14] f2fs: " Jan Kara 2021-06-07 14:52 ` [f2fs-dev] " Jan Kara 2021-06-07 14:52 ` [PATCH 12/14] fuse: " Jan Kara 2021-06-07 14:52 ` [f2fs-dev] " Jan Kara 2021-06-10 12:42 ` Miklos Szeredi 2021-06-10 12:42 ` [f2fs-dev] " Miklos Szeredi 2021-06-10 12:42 ` Miklos Szeredi 2021-06-07 14:52 ` Jan Kara [this message] 2021-06-07 14:52 ` [f2fs-dev] [PATCH 13/14] ceph: Fix race between hole punch and page fault Jan Kara 2021-06-07 14:52 ` [PATCH 14/14] cifs: " Jan Kara 2021-06-07 14:52 ` [f2fs-dev] " Jan Kara 2021-06-08 11:54 ` [PATCH 0/14 v7] fs: Hole punch vs page cache filling races Jan Kara 2021-06-08 11:54 ` [f2fs-dev] " Jan Kara 2021-06-15 9:17 [PATCH 0/14 v8] " Jan Kara 2021-06-15 9:18 ` [PATCH 13/14] ceph: Fix race between hole punch and page fault Jan Kara 2021-07-12 16:55 [PATCH 0/14 v9] fs: Hole punch vs page cache filling races Jan Kara 2021-07-12 16:56 ` [PATCH 13/14] ceph: Fix race between hole punch and page fault Jan Kara 2021-07-15 13:40 [PATCH 0/14 v10] fs: Hole punch vs page cache filling races Jan Kara 2021-07-15 13:40 ` [PATCH 13/14] ceph: Fix race between hole punch and page fault Jan Kara
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210607145236.31852-13-jack@suse.cz \ --to=jack@suse.cz \ --cc=ceph-devel@vger.kernel.org \ --cc=damien.lemoal@wdc.com \ --cc=darrick.wong@oracle.com \ --cc=david@fromorbit.com \ --cc=hch@infradead.org \ --cc=jaegeuk@kernel.org \ --cc=jlayton@kernel.org \ --cc=jth@kernel.org \ --cc=linux-cifs@vger.kernel.org \ --cc=linux-ext4@vger.kernel.org \ --cc=linux-f2fs-devel@lists.sourceforge.net \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=linux-xfs@vger.kernel.org \ --cc=miklos@szeredi.hu \ --cc=sfrench@samba.org \ --cc=tytso@mit.edu \ --cc=willy@infradead.org \ --cc=yuchao0@huawei.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.