Commit e3fce68c authored by Jan Kara's avatar Jan Kara Committed by Dan Williams
Browse files

dax: Avoid page invalidation races and unnecessary radix tree traversals 



Currently dax_iomap_rw() takes care of invalidating page tables and
evicting hole pages from the radix tree when write(2) to the file
happens. This invalidation is only necessary when there is some block
allocation resulting from write(2). Furthermore in current place the
invalidation is racy wrt page fault instantiating a hole page just after
we have invalidated it.

So perform the page invalidation inside dax_iomap_actor() where we can
do it only when really necessary and after blocks have been allocated so
nobody will be instantiating new hole pages anymore.

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarRoss Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent c6dcf52c

fs/dax.c

+11 −17
Original line number Diff line number Diff line
@@ -985,6 +985,17 @@ dax_iomap_actor(struct inode *inode, loff_t pos, loff_t length, void *data, 
	if (WARN_ON_ONCE(iomap->type != IOMAP_MAPPED))

		return -EIO;



	/*

	 * Write can allocate block for an area which has a hole page mapped

	 * into page tables. We have to tear down these mappings so that data

	 * written by write(2) is visible in mmap.

	 */

	if ((iomap->flags & IOMAP_F_NEW) && inode->i_mapping->nrpages) {

		invalidate_inode_pages2_range(inode->i_mapping,

					      pos >> PAGE_SHIFT,

					      (end - 1) >> PAGE_SHIFT);

	}



	while (pos < end) {

		unsigned offset = pos & (PAGE_SIZE - 1);

		struct blk_dax_ctl dax = { 0 };
@@ -1043,23 +1054,6 @@ dax_iomap_rw(struct kiocb *iocb, struct iov_iter *iter, 
	if (iov_iter_rw(iter) == WRITE)

		flags |= IOMAP_WRITE;



	/*

	 * Yes, even DAX files can have page cache attached to them:  A zeroed

	 * page is inserted into the pagecache when we have to serve a write

	 * fault on a hole.  It should never be dirtied and can simply be

	 * dropped from the pagecache once we get real data for the page.

	 *

	 * XXX: This is racy against mmap, and there's nothing we can do about

	 * it. We'll eventually need to shift this down even further so that

	 * we can check if we allocated blocks over a hole first.

	 */

	if (mapping->nrpages) {

		ret = invalidate_inode_pages2_range(mapping,

				pos >> PAGE_SHIFT,

				(pos + iov_iter_count(iter) - 1) >> PAGE_SHIFT);

		WARN_ON_ONCE(ret);

	}



	while (iov_iter_count(iter)) {

		ret = iomap_apply(inode, pos, iov_iter_count(iter), flags, ops,

				iter, dax_iomap_actor);

CRA Git | Maintained and supported by SUSTech CRA and CCSE