Users of DAX can suffer data corruption from stale mmap reads via the following sequence: - open an mmap over a 2MiB hole - read from a 2MiB hole, faulting in a 2MiB zero page - write to the hole with write(3p). The write succeeds but we incorrectly leave the 2MiB zero page mapping intact. - via the mmap, read the data that was just written. Since the zero page mapping is still intact we read back zeroes instead of the new data. We fix this by unconditionally calling invalidate_inode_pages2_range() in dax_iomap_actor() for new block allocations, and by enhancing invalidate_inode_pages2_range() so that it properly unmaps the DAX entries being removed from the radix tree. This is based on an initial patch from Jan Kara. I've written an fstest that triggers this error: http://www.spinics.net/lists/linux-mm/msg126276.html Signed-off-by: Ross Zwisler <ross.zwisler@xxxxxxxxxxxxxxx> Fixes: c6dcf52c23d2 ("mm: Invalidate DAX radix tree entries only if appropriate") Reported-by: Jan Kara <jack@xxxxxxx> Cc: <stable@xxxxxxxxxxxxxxx> [4.10+] --- Changes since v1: - Instead of unmapping each DAX entry individually in __dax_invalidate_mapping_entry(), instead unmap the whole range at once inside of invalidate_inode_pages2_range(). Each unmap requires an rmap walk so this should be less expensive, plus now we don't have to drop and re-acquire the mapping->tree_lock for each entry. (Jan) These patches apply cleanly to v4.11 and have passed an xfstest run. They also apply to v4.10.13 with a little help from git am's 3-way merger. --- fs/dax.c | 8 ++++---- mm/truncate.c | 10 ++++++++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/fs/dax.c b/fs/dax.c index 166504c..1f2c880 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -999,11 +999,11 @@ dax_iomap_actor(struct inode *inode, loff_t pos, loff_t length, void *data, 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. + * Write can allocate block for an area which has a hole page or zero + * PMD entry in the radix tree. 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) { + if (iomap->flags & IOMAP_F_NEW) { invalidate_inode_pages2_range(inode->i_mapping, pos >> PAGE_SHIFT, (end - 1) >> PAGE_SHIFT); diff --git a/mm/truncate.c b/mm/truncate.c index c537184..ad40316 100644 --- a/mm/truncate.c +++ b/mm/truncate.c @@ -683,6 +683,16 @@ int invalidate_inode_pages2_range(struct address_space *mapping, cond_resched(); index++; } + + /* + * Ensure that any DAX exceptional entries that have been invalidated + * are also unmapped. + */ + if (dax_mapping(mapping)) { + unmap_mapping_range(mapping, (loff_t)start << PAGE_SHIFT, + (loff_t)(1 + end - start) << PAGE_SHIFT, 0); + } + cleancache_invalidate_inode(mapping); return ret; } -- 2.9.3
