Skip to content

Commit b3b4e23

Browse files
MiaoheLinSasha Levin
authored andcommitted
fork: defer linking file vma until vma is fully initialized
commit 35e3517 upstream. Thorvald reported a WARNING [1]. And the root cause is below race: CPU 1 CPU 2 fork hugetlbfs_fallocate dup_mmap hugetlbfs_punch_hole i_mmap_lock_write(mapping); vma_interval_tree_insert_after -- Child vma is visible through i_mmap tree. i_mmap_unlock_write(mapping); hugetlb_dup_vma_private -- Clear vma_lock outside i_mmap_rwsem! i_mmap_lock_write(mapping); hugetlb_vmdelete_list vma_interval_tree_foreach hugetlb_vma_trylock_write -- Vma_lock is cleared. tmp->vm_ops->open -- Alloc new vma_lock outside i_mmap_rwsem! hugetlb_vma_unlock_write -- Vma_lock is assigned!!! i_mmap_unlock_write(mapping); hugetlb_dup_vma_private() and hugetlb_vm_op_open() are called outside i_mmap_rwsem lock while vma lock can be used in the same time. Fix this by deferring linking file vma until vma is fully initialized. Those vmas should be initialized first before they can be used. Link: https://lkml.kernel.org/r/20240410091441.3539905-1-linmiaohe@huawei.com Fixes: 8d9bfb2 ("hugetlb: add vma based lock for pmd sharing") Signed-off-by: Miaohe Lin <linmiaohe@huawei.com> Reported-by: Thorvald Natvig <thorvald@google.com> Closes: https://lore.kernel.org/linux-mm/20240129161735.6gmjsswx62o4pbja@revolver/T/ [1] Reviewed-by: Jane Chu <jane.chu@oracle.com> Cc: Christian Brauner <brauner@kernel.org> Cc: Heiko Carstens <hca@linux.ibm.com> Cc: Kent Overstreet <kent.overstreet@linux.dev> Cc: Liam R. Howlett <Liam.Howlett@oracle.com> Cc: Mateusz Guzik <mjguzik@gmail.com> Cc: Matthew Wilcox (Oracle) <willy@infradead.org> Cc: Miaohe Lin <linmiaohe@huawei.com> Cc: Muchun Song <muchun.song@linux.dev> Cc: Oleg Nesterov <oleg@redhat.com> Cc: Peng Zhang <zhangpeng.00@bytedance.com> Cc: Tycho Andersen <tandersen@netflix.com> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Miaohe Lin <linmiaohe@huawei.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent ff6d500 commit b3b4e23

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

kernel/fork.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -727,6 +727,15 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
727727
} else if (anon_vma_fork(tmp, mpnt))
728728
goto fail_nomem_anon_vma_fork;
729729
vm_flags_clear(tmp, VM_LOCKED_MASK);
730+
/*
731+
* Copy/update hugetlb private vma information.
732+
*/
733+
if (is_vm_hugetlb_page(tmp))
734+
hugetlb_dup_vma_private(tmp);
735+
736+
if (tmp->vm_ops && tmp->vm_ops->open)
737+
tmp->vm_ops->open(tmp);
738+
730739
file = tmp->vm_file;
731740
if (file) {
732741
struct address_space *mapping = file->f_mapping;
@@ -743,12 +752,6 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
743752
i_mmap_unlock_write(mapping);
744753
}
745754

746-
/*
747-
* Copy/update hugetlb private vma information.
748-
*/
749-
if (is_vm_hugetlb_page(tmp))
750-
hugetlb_dup_vma_private(tmp);
751-
752755
/* Link the vma into the MT */
753756
if (vma_iter_bulk_store(&vmi, tmp))
754757
goto fail_nomem_vmi_store;
@@ -757,9 +760,6 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
757760
if (!(tmp->vm_flags & VM_WIPEONFORK))
758761
retval = copy_page_range(tmp, mpnt);
759762

760-
if (tmp->vm_ops && tmp->vm_ops->open)
761-
tmp->vm_ops->open(tmp);
762-
763763
if (retval)
764764
goto loop_out;
765765
}

0 commit comments

Comments
 (0)