Skip to content

Commit 8f51c07

Browse files
Liu Shixinmehmetb0
Liu Shixin
authored andcommitted
mm: hugetlb: independent PMD page table shared count
BugLink: https://bugs.launchpad.net/bugs/2106770 [ Upstream commit 59d9094df3d79443937add8700b2ef1a866b1081 ] The folio refcount may be increased unexpectly through try_get_folio() by caller such as split_huge_pages. In huge_pmd_unshare(), we use refcount to check whether a pmd page table is shared. The check is incorrect if the refcount is increased by the above caller, and this can cause the page table leaked: BUG: Bad page state in process sh pfn:109324 page: refcount:0 mapcount:0 mapping:0000000000000000 index:0x66 pfn:0x109324 flags: 0x17ffff800000000(node=0|zone=2|lastcpupid=0xfffff) page_type: f2(table) raw: 017ffff800000000 0000000000000000 0000000000000000 0000000000000000 raw: 0000000000000066 0000000000000000 00000000f2000000 0000000000000000 page dumped because: nonzero mapcount ... CPU: 31 UID: 0 PID: 7515 Comm: sh Kdump: loaded Tainted: G B 6.13.0-rc2master+ #7 Tainted: [B]=BAD_PAGE Hardware name: QEMU KVM Virtual Machine, BIOS 0.0.0 02/06/2015 Call trace: show_stack+0x20/0x38 (C) dump_stack_lvl+0x80/0xf8 dump_stack+0x18/0x28 bad_page+0x8c/0x130 free_page_is_bad_report+0xa4/0xb0 free_unref_page+0x3cc/0x620 __folio_put+0xf4/0x158 split_huge_pages_all+0x1e0/0x3e8 split_huge_pages_write+0x25c/0x2d8 full_proxy_write+0x64/0xd8 vfs_write+0xcc/0x280 ksys_write+0x70/0x110 __arm64_sys_write+0x24/0x38 invoke_syscall+0x50/0x120 el0_svc_common.constprop.0+0xc8/0xf0 do_el0_svc+0x24/0x38 el0_svc+0x34/0x128 el0t_64_sync_handler+0xc8/0xd0 el0t_64_sync+0x190/0x198 The issue may be triggered by damon, offline_page, page_idle, etc, which will increase the refcount of page table. 1. The page table itself will be discarded after reporting the "nonzero mapcount". 2. The HugeTLB page mapped by the page table miss freeing since we treat the page table as shared and a shared page table will not be unmapped. Fix it by introducing independent PMD page table shared count. As described by comment, pt_index/pt_mm/pt_frag_refcount are used for s390 gmap, x86 pgds and powerpc, pt_share_count is used for x86/arm64/riscv pmds, so we can reuse the field as pt_share_count. Link: https://lkml.kernel.org/r/[email protected] Fixes: 39dde65 ("[PATCH] shared page table for hugetlb page") Signed-off-by: Liu Shixin <[email protected]> Cc: Kefeng Wang <[email protected]> Cc: Ken Chen <[email protected]> Cc: Muchun Song <[email protected]> Cc: Nanyong Sun <[email protected]> Cc: Jane Chu <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Sasha Levin <[email protected]> CVE-2024-57883 Signed-off-by: Manuel Diewald <[email protected]> Signed-off-by: Mehmet Basaran <[email protected]>
1 parent 3b0fc8b commit 8f51c07

File tree

3 files changed

+38
-9
lines changed

3 files changed

+38
-9
lines changed

include/linux/mm.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3078,6 +3078,7 @@ static inline bool pagetable_pmd_ctor(struct ptdesc *ptdesc)
30783078
if (!pmd_ptlock_init(ptdesc))
30793079
return false;
30803080
__folio_set_pgtable(folio);
3081+
ptdesc_pmd_pts_init(ptdesc);
30813082
lruvec_stat_add_folio(folio, NR_PAGETABLE);
30823083
return true;
30833084
}

include/linux/mm_types.h

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,7 @@ FOLIO_MATCH(compound_head, _head_2a);
402402
* @__page_mapping: Aliases with page->mapping. Unused for page tables.
403403
* @pt_mm: Used for x86 pgds.
404404
* @pt_frag_refcount: For fragmented page table tracking. Powerpc only.
405+
* @pt_share_count: Used for HugeTLB PMD page table share count.
405406
* @_pt_pad_2: Padding to ensure proper alignment.
406407
* @ptl: Lock for the page table.
407408
* @__page_type: Same as page->page_type. Unused for page tables.
@@ -427,6 +428,9 @@ struct ptdesc {
427428
union {
428429
struct mm_struct *pt_mm;
429430
atomic_t pt_frag_refcount;
431+
#ifdef CONFIG_HUGETLB_PMD_PAGE_TABLE_SHARING
432+
atomic_t pt_share_count;
433+
#endif
430434
};
431435

432436
union {
@@ -471,6 +475,32 @@ static_assert(sizeof(struct ptdesc) <= sizeof(struct page));
471475
const struct page *: (const struct ptdesc *)(p), \
472476
struct page *: (struct ptdesc *)(p)))
473477

478+
#ifdef CONFIG_HUGETLB_PMD_PAGE_TABLE_SHARING
479+
static inline void ptdesc_pmd_pts_init(struct ptdesc *ptdesc)
480+
{
481+
atomic_set(&ptdesc->pt_share_count, 0);
482+
}
483+
484+
static inline void ptdesc_pmd_pts_inc(struct ptdesc *ptdesc)
485+
{
486+
atomic_inc(&ptdesc->pt_share_count);
487+
}
488+
489+
static inline void ptdesc_pmd_pts_dec(struct ptdesc *ptdesc)
490+
{
491+
atomic_dec(&ptdesc->pt_share_count);
492+
}
493+
494+
static inline int ptdesc_pmd_pts_count(struct ptdesc *ptdesc)
495+
{
496+
return atomic_read(&ptdesc->pt_share_count);
497+
}
498+
#else
499+
static inline void ptdesc_pmd_pts_init(struct ptdesc *ptdesc)
500+
{
501+
}
502+
#endif
503+
474504
/*
475505
* Used for sizing the vmemmap region on some architectures
476506
*/

mm/hugetlb.c

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7306,7 +7306,7 @@ pte_t *huge_pmd_share(struct mm_struct *mm, struct vm_area_struct *vma,
73067306
spte = hugetlb_walk(svma, saddr,
73077307
vma_mmu_pagesize(svma));
73087308
if (spte) {
7309-
get_page(virt_to_page(spte));
7309+
ptdesc_pmd_pts_inc(virt_to_ptdesc(spte));
73107310
break;
73117311
}
73127312
}
@@ -7321,7 +7321,7 @@ pte_t *huge_pmd_share(struct mm_struct *mm, struct vm_area_struct *vma,
73217321
(pmd_t *)((unsigned long)spte & PAGE_MASK));
73227322
mm_inc_nr_pmds(mm);
73237323
} else {
7324-
put_page(virt_to_page(spte));
7324+
ptdesc_pmd_pts_dec(virt_to_ptdesc(spte));
73257325
}
73267326
spin_unlock(&mm->page_table_lock);
73277327
out:
@@ -7333,10 +7333,6 @@ pte_t *huge_pmd_share(struct mm_struct *mm, struct vm_area_struct *vma,
73337333
/*
73347334
* unmap huge page backed by shared pte.
73357335
*
7336-
* Hugetlb pte page is ref counted at the time of mapping. If pte is shared
7337-
* indicated by page_count > 1, unmap is achieved by clearing pud and
7338-
* decrementing the ref count. If count == 1, the pte page is not shared.
7339-
*
73407336
* Called with page table lock held.
73417337
*
73427338
* returns: 1 successfully unmapped a shared pte page
@@ -7345,18 +7341,20 @@ pte_t *huge_pmd_share(struct mm_struct *mm, struct vm_area_struct *vma,
73457341
int huge_pmd_unshare(struct mm_struct *mm, struct vm_area_struct *vma,
73467342
unsigned long addr, pte_t *ptep)
73477343
{
7344+
unsigned long sz = huge_page_size(hstate_vma(vma));
73487345
pgd_t *pgd = pgd_offset(mm, addr);
73497346
p4d_t *p4d = p4d_offset(pgd, addr);
73507347
pud_t *pud = pud_offset(p4d, addr);
73517348

73527349
i_mmap_assert_write_locked(vma->vm_file->f_mapping);
73537350
hugetlb_vma_assert_locked(vma);
7354-
BUG_ON(page_count(virt_to_page(ptep)) == 0);
7355-
if (page_count(virt_to_page(ptep)) == 1)
7351+
if (sz != PMD_SIZE)
7352+
return 0;
7353+
if (!ptdesc_pmd_pts_count(virt_to_ptdesc(ptep)))
73567354
return 0;
73577355

73587356
pud_clear(pud);
7359-
put_page(virt_to_page(ptep));
7357+
ptdesc_pmd_pts_dec(virt_to_ptdesc(ptep));
73607358
mm_dec_nr_pmds(mm);
73617359
return 1;
73627360
}

0 commit comments

Comments
 (0)