Skip to content

Commit

Permalink
mm, dax: fix DAX deadlocks (COW fault)
Browse files Browse the repository at this point in the history
DAX handling of COW faults has wrong locking sequence:
	dax_fault does i_mmap_lock_read
	do_cow_fault does i_mmap_unlock_write

Ross's commit[1] missed a fix[2] that Kirill added to Matthew's
commit[3].

Original COW locking logic was introduced by Matthew here[4].

This should be applied to v4.3 as well.

[1] 0f90cc6 mm, dax: fix DAX deadlocks
[2] 52a2b53 mm, dax: use i_mmap_unlock_write() in do_cow_fault()
[3] 8431729 dax: fix race between simultaneous faults
[4] 2e4cdab mm: allow page fault handlers to perform the COW

Cc: <[email protected]>
Cc: Boaz Harrosh <[email protected]>
Cc: Alexander Viro <[email protected]>
Cc: Dave Chinner <[email protected]>
Cc: Jan Kara <[email protected]>
Cc: "Kirill A. Shutemov" <[email protected]>
Cc: Matthew Wilcox <[email protected]>
Acked-by: Ross Zwisler <[email protected]>
Signed-off-by: Yigal Korman <[email protected]>
Signed-off-by: Dan Williams <[email protected]>
  • Loading branch information
yigalk authored and djbw committed Nov 19, 2015
1 parent ee82c9e commit 0df9d41
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions mm/memory.c
Original file line number Diff line number Diff line change
Expand Up @@ -3015,9 +3015,9 @@ static int do_cow_fault(struct mm_struct *mm, struct vm_area_struct *vma,
} else {
/*
* The fault handler has no page to lock, so it holds
* i_mmap_lock for write to protect against truncate.
* i_mmap_lock for read to protect against truncate.
*/
i_mmap_unlock_write(vma->vm_file->f_mapping);
i_mmap_unlock_read(vma->vm_file->f_mapping);
}
goto uncharge_out;
}
Expand All @@ -3031,9 +3031,9 @@ static int do_cow_fault(struct mm_struct *mm, struct vm_area_struct *vma,
} else {
/*
* The fault handler has no page to lock, so it holds
* i_mmap_lock for write to protect against truncate.
* i_mmap_lock for read to protect against truncate.
*/
i_mmap_unlock_write(vma->vm_file->f_mapping);
i_mmap_unlock_read(vma->vm_file->f_mapping);
}
return ret;
uncharge_out:
Expand Down

0 comments on commit 0df9d41

Please sign in to comment.