Skip to content

Commit 034a52b

Browse files
thejhgregkh
authored andcommitted
mm/hugetlb: fix huge_pmd_unshare() vs GUP-fast race
commit 1013af4 upstream. huge_pmd_unshare() drops a reference on a page table that may have previously been shared across processes, potentially turning it into a normal page table used in another process in which unrelated VMAs can afterwards be installed. If this happens in the middle of a concurrent gup_fast(), gup_fast() could end up walking the page tables of another process. While I don't see any way in which that immediately leads to kernel memory corruption, it is really weird and unexpected. Fix it with an explicit broadcast IPI through tlb_remove_table_sync_one(), just like we do in khugepaged when removing page tables for a THP collapse. Link: https://lkml.kernel.org/r/20250528-hugetlb-fixes-splitrace-v2-2-1329349bad1a@google.com Link: https://lkml.kernel.org/r/20250527-hugetlb-fixes-splitrace-v1-2-f4136f5ec58a@google.com Fixes: 39dde65 ("[PATCH] shared page table for hugetlb page") Signed-off-by: Jann Horn <jannh@google.com> Reviewed-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com> Cc: Liam Howlett <liam.howlett@oracle.com> Cc: Muchun Song <muchun.song@linux.dev> Cc: Oscar Salvador <osalvador@suse.de> Cc: Vlastimil Babka <vbabka@suse.cz> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent acbe159 commit 034a52b

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

mm/hugetlb.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7252,6 +7252,13 @@ int huge_pmd_unshare(struct mm_struct *mm, struct vm_area_struct *vma,
72527252
return 0;
72537253

72547254
pud_clear(pud);
7255+
/*
7256+
* Once our caller drops the rmap lock, some other process might be
7257+
* using this page table as a normal, non-hugetlb page table.
7258+
* Wait for pending gup_fast() in other threads to finish before letting
7259+
* that happen.
7260+
*/
7261+
tlb_remove_table_sync_one();
72557262
ptdesc_pmd_pts_dec(virt_to_ptdesc(ptep));
72567263
mm_dec_nr_pmds(mm);
72577264
return 1;

0 commit comments

Comments
 (0)