Skip to content

Commit 14967a9

Browse files
jchu314atgithubakpm00
authored andcommitted
mm/hugetlb: fix copy_hugetlb_page_range() to use ->pt_share_count
commit 59d9094 ("mm: hugetlb: independent PMD page table shared count") introduced ->pt_share_count dedicated to hugetlb PMD share count tracking, but omitted fixing copy_hugetlb_page_range(), leaving the function relying on page_count() for tracking that no longer works. When lazy page table copy for hugetlb is disabled, that is, revert commit bcd51a3 ("hugetlb: lazy page table copies in fork()") fork()'ing with hugetlb PMD sharing quickly lockup - [ 239.446559] watchdog: BUG: soft lockup - CPU#75 stuck for 27s! [ 239.446611] RIP: 0010:native_queued_spin_lock_slowpath+0x7e/0x2e0 [ 239.446631] Call Trace: [ 239.446633] <TASK> [ 239.446636] _raw_spin_lock+0x3f/0x60 [ 239.446639] copy_hugetlb_page_range+0x258/0xb50 [ 239.446645] copy_page_range+0x22b/0x2c0 [ 239.446651] dup_mmap+0x3e2/0x770 [ 239.446654] dup_mm.constprop.0+0x5e/0x230 [ 239.446657] copy_process+0xd17/0x1760 [ 239.446660] kernel_clone+0xc0/0x3e0 [ 239.446661] __do_sys_clone+0x65/0xa0 [ 239.446664] do_syscall_64+0x82/0x930 [ 239.446668] ? count_memcg_events+0xd2/0x190 [ 239.446671] ? syscall_trace_enter+0x14e/0x1f0 [ 239.446676] ? syscall_exit_work+0x118/0x150 [ 239.446677] ? arch_exit_to_user_mode_prepare.constprop.0+0x9/0xb0 [ 239.446681] ? clear_bhb_loop+0x30/0x80 [ 239.446684] ? clear_bhb_loop+0x30/0x80 [ 239.446686] entry_SYSCALL_64_after_hwframe+0x76/0x7e There are two options to resolve the potential latent issue: 1. warn against PMD sharing in copy_hugetlb_page_range(), 2. fix it. This patch opts for the second option. While at it, simplify the comment, the details are not actually relevant anymore. Link: https://lkml.kernel.org/r/[email protected] Fixes: 59d9094 ("mm: hugetlb: independent PMD page table shared count") Signed-off-by: Jane Chu <[email protected]> Reviewed-by: Harry Yoo <[email protected]> Acked-by: Oscar Salvador <[email protected]> Acked-by: David Hildenbrand <[email protected]> Cc: Jann Horn <[email protected]> Cc: Liu Shixin <[email protected]> Cc: Muchun Song <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent 7b73876 commit 14967a9

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

include/linux/mm_types.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -631,6 +631,11 @@ static inline int ptdesc_pmd_pts_count(struct ptdesc *ptdesc)
631631
{
632632
return atomic_read(&ptdesc->pt_share_count);
633633
}
634+
635+
static inline bool ptdesc_pmd_is_shared(struct ptdesc *ptdesc)
636+
{
637+
return !!ptdesc_pmd_pts_count(ptdesc);
638+
}
634639
#else
635640
static inline void ptdesc_pmd_pts_init(struct ptdesc *ptdesc)
636641
{

mm/hugetlb.c

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5594,18 +5594,13 @@ int copy_hugetlb_page_range(struct mm_struct *dst, struct mm_struct *src,
55945594
break;
55955595
}
55965596

5597-
/*
5598-
* If the pagetables are shared don't copy or take references.
5599-
*
5600-
* dst_pte == src_pte is the common case of src/dest sharing.
5601-
* However, src could have 'unshared' and dst shares with
5602-
* another vma. So page_count of ptep page is checked instead
5603-
* to reliably determine whether pte is shared.
5604-
*/
5605-
if (page_count(virt_to_page(dst_pte)) > 1) {
5597+
#ifdef CONFIG_HUGETLB_PMD_PAGE_TABLE_SHARING
5598+
/* If the pagetables are shared, there is nothing to do */
5599+
if (ptdesc_pmd_is_shared(virt_to_ptdesc(dst_pte))) {
56065600
addr |= last_addr_mask;
56075601
continue;
56085602
}
5603+
#endif
56095604

56105605
dst_ptl = huge_pte_lock(h, dst, dst_pte);
56115606
src_ptl = huge_pte_lockptr(h, src, src_pte);
@@ -7602,7 +7597,7 @@ int huge_pmd_unshare(struct mm_struct *mm, struct vm_area_struct *vma,
76027597
hugetlb_vma_assert_locked(vma);
76037598
if (sz != PMD_SIZE)
76047599
return 0;
7605-
if (!ptdesc_pmd_pts_count(virt_to_ptdesc(ptep)))
7600+
if (!ptdesc_pmd_is_shared(virt_to_ptdesc(ptep)))
76067601
return 0;
76077602

76087603
pud_clear(pud);

0 commit comments

Comments
 (0)