p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

arm64: hugetlb: Handle swap entries in huge_pte_offset() for contiguous hugepages 

huge_pte_offset() was updated to correctly handle swap entries for
hugepages. With the addition of the size parameter, it is now possible
to disambiguate whether the request is for a regular hugepage or a
contiguous hugepage.

Fix huge_pte_offset() for contiguous hugepages by using the size to find
the correct page table entry.

Signed-off-by: Punit Agrawal <punit.agrawal@arm.com>
Cc: David Woods <dwoods@mellanox.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
This commit is contained in:
Punit Agrawal 2017-08-22 11:42:45 +01:00 committed by Catalin Marinas
parent d8bdcff287
commit 30f3ac00ad
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
arch/arm64/mm/hugetlbpage.c
View File

@ -221,19 +221,28 @@ pte_t *huge_pte_offset(struct mm_struct *mm,
return NULL; return NULL;
pud = pud_offset(pgd, addr); pud = pud_offset(pgd, addr);
if (pud_none(*pud)) if (sz != PUD_SIZE && pud_none(*pud))
return NULL; return NULL;
/* swap or huge page */ /* hugepage or swap? */
if (!pud_present(*pud) || pud_huge(*pud)) if (pud_huge(*pud) || !pud_present(*pud))
return (pte_t *)pud; return (pte_t *)pud;
/* table; check the next level */ /* table; check the next level */
if (sz == CONT_PMD_SIZE)
addr &= CONT_PMD_MASK;
pmd = pmd_offset(pud, addr); pmd = pmd_offset(pud, addr);
if (pmd_none(*pmd)) if (!(sz == PMD_SIZE || sz == CONT_PMD_SIZE) &&
pmd_none(*pmd))
return NULL; return NULL;
if (!pmd_present(*pmd) || pmd_huge(*pmd)) if (pmd_huge(*pmd) || !pmd_present(*pmd))
return (pte_t *)pmd; return (pte_t *)pmd;
if (sz == CONT_PTE_SIZE) {
pte_t *pte = pte_offset_kernel(pmd, (addr & CONT_PTE_MASK));
return pte;
}
return NULL; return NULL;
} }