Skip to content

Commit 7f42466

Browse files
Huang ShijieAlex Shi
authored andcommitted
arm64: hugetlb: remove the wrong pmd check in find_num_contig()
The find_num_contig() will return 1 when the pmd is not present. It will cause a kernel dead loop in the following scenaro: 1.) pmd entry is not present. 2.) the page fault occurs: ... hugetlb_fault() --> hugetlb_no_page() --> set_huge_pte_at() 3.) set_huge_pte_at() will only set the first PMD entry, since the find_num_contig just return 1 in this case. So the PMD entries are all empty except the first one. 4.) when kernel accesses the address mapped by the second PMD entry, a new page fault occurs: ... hugetlb_fault() --> huge_ptep_set_access_flags() The second PMD entry is still empty now. 5.) When the kernel returns, the access will cause a page fault again. The kernel will run like the "4)" above. We will see a dead loop since here. The dead loop is caught in the 32M hugetlb page (2M PMD + Contiguous bit). This patch removes wrong pmd check, and fixes this dead loop. This patch also removes the redundant checks for PGD/PUD in the find_num_contig(). Acked-by: Steve Capper <steve.capper@arm.com> Signed-off-by: Huang Shijie <shijie.huang@arm.com> Reviewed-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> (cherry picked from commit 20156ce2365d61beaa6f5a78a7a789044e0e7acc) Signed-off-by: Alex Shi <alex.shi@linaro.org>
1 parent 7841412 commit 7f42466

1 file changed

Lines changed: 0 additions & 12 deletions

File tree

arch/arm64/mm/hugetlbpage.c

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,20 +51,8 @@ static int find_num_contig(struct mm_struct *mm, unsigned long addr,
5151
*pgsize = PAGE_SIZE;
5252
if (!pte_cont(pte))
5353
return 1;
54-
if (!pgd_present(*pgd)) {
55-
VM_BUG_ON(!pgd_present(*pgd));
56-
return 1;
57-
}
5854
pud = pud_offset(pgd, addr);
59-
if (!pud_present(*pud)) {
60-
VM_BUG_ON(!pud_present(*pud));
61-
return 1;
62-
}
6355
pmd = pmd_offset(pud, addr);
64-
if (!pmd_present(*pmd)) {
65-
VM_BUG_ON(!pmd_present(*pmd));
66-
return 1;
67-
}
6856
if ((pte_t *)pmd == ptep) {
6957
*pgsize = PMD_SIZE;
7058
return CONT_PMDS;

0 commit comments

Comments
 (0)