summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2018-10-30 18:10:47 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2018-10-31 11:54:17 -0400
commitf2c57d91b0d96aa13ccff4e3b178038f17b00658 (patch)
treeb703f6e9b565550cb11eb1cb9f21a33d396a6257 /mm
parentdee6da22efac451d361f5224a60be2796d847b51 (diff)
mm: Fix warning in insert_pfn()
In DAX mode a write pagefault can race with write(2) in the following way: CPU0 CPU1 write fault for mapped zero page (hole) dax_iomap_rw() iomap_apply() xfs_file_iomap_begin() - allocates blocks dax_iomap_actor() invalidate_inode_pages2_range() - invalidates radix tree entries in given range dax_iomap_pte_fault() grab_mapping_entry() - no entry found, creates empty ... xfs_file_iomap_begin() - finds already allocated block ... vmf_insert_mixed_mkwrite() - WARNs and does nothing because there is still zero page mapped in PTE unmap_mapping_pages() This race results in WARN_ON from insert_pfn() and is occasionally triggered by fstest generic/344. Note that the race is otherwise harmless as before write(2) on CPU0 is finished, we will invalidate page tables properly and thus user of mmap will see modified data from write(2) from that point on. So just restrict the warning only to the case when the PFN in PTE is not zero page. Link: http://lkml.kernel.org/r/20180824154542.26872-1-jack@suse.cz Signed-off-by: Jan Kara <jack@suse.cz> Reviewed-by: Andrew Morton <akpm@linux-foundation.org> Cc: Ross Zwisler <ross.zwisler@linux.intel.com> Cc: Dan Williams <dan.j.williams@intel.com> Cc: Dave Jiang <dave.jiang@intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/memory.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/mm/memory.c b/mm/memory.c
index 072139579d89..4ad2d293ddc2 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -1537,10 +1537,15 @@ static vm_fault_t insert_pfn(struct vm_area_struct *vma, unsigned long addr,
1537 * in may not match the PFN we have mapped if the 1537 * in may not match the PFN we have mapped if the
1538 * mapped PFN is a writeable COW page. In the mkwrite 1538 * mapped PFN is a writeable COW page. In the mkwrite
1539 * case we are creating a writable PTE for a shared 1539 * case we are creating a writable PTE for a shared
1540 * mapping and we expect the PFNs to match. 1540 * mapping and we expect the PFNs to match. If they
1541 * don't match, we are likely racing with block
1542 * allocation and mapping invalidation so just skip the
1543 * update.
1541 */ 1544 */
1542 if (WARN_ON_ONCE(pte_pfn(*pte) != pfn_t_to_pfn(pfn))) 1545 if (pte_pfn(*pte) != pfn_t_to_pfn(pfn)) {
1546 WARN_ON_ONCE(!is_zero_pfn(pte_pfn(*pte)));
1543 goto out_unlock; 1547 goto out_unlock;
1548 }
1544 entry = *pte; 1549 entry = *pte;
1545 goto out_mkwrite; 1550 goto out_mkwrite;
1546 } else 1551 } else