openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

powerpc: Update find_linux_pte_or_hugepte to handle transparent hugepages 

Reviewed-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Aneesh Kumar K.V 2013-06-20 14:30:17 +05:30 committed by Benjamin Herrenschmidt
parent 29409997f8
commit ac52ae4721
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
arch/powerpc/mm/hugetlbpage.c
View File

@ -936,30 +936,50 @@ pte_t *find_linux_pte_or_hugepte(pgd_t *pgdir, unsigned long ea, unsigned *shift
pg = pgdir + pgd_index(ea); pg = pgdir + pgd_index(ea);
if (pgd_huge(*pg)) { /*
* we should first check for none. That takes care of a
* a parallel hugetlb or THP pagefault moving none entries
* to respective types.
*/
if (pgd_none(*pg))
return NULL;
else if (pgd_huge(*pg)) {
ret_pte = (pte_t *) pg; ret_pte = (pte_t *) pg;
goto out; goto out;
} else if (is_hugepd(pg)) } else if (is_hugepd(pg))
hpdp = (hugepd_t *)pg; hpdp = (hugepd_t *)pg;
else if (!pgd_none(*pg)) { else {
pdshift = PUD_SHIFT; pdshift = PUD_SHIFT;
pu = pud_offset(pg, ea); pu = pud_offset(pg, ea);
if (pud_huge(*pu)) { if (pud_none(*pu))
return NULL;
else if (pud_huge(*pu)) {
ret_pte = (pte_t *) pu; ret_pte = (pte_t *) pu;
goto out; goto out;
} else if (is_hugepd(pu)) } else if (is_hugepd(pu))
hpdp = (hugepd_t *)pu; hpdp = (hugepd_t *)pu;
else if (!pud_none(*pu)) { else {
pdshift = PMD_SHIFT; pdshift = PMD_SHIFT;
pm = pmd_offset(pu, ea); pm = pmd_offset(pu, ea);
/*
* A hugepage collapse is captured by pmd_none, because
* it mark the pmd none and do a hpte invalidate.
*
* A hugepage split is captured by pmd_trans_splitting
* because we mark the pmd trans splitting and do a
* hpte invalidate
*
*/
if (pmd_none(*pm) || pmd_trans_splitting(*pm))
return NULL;
if (pmd_huge(*pm)) { if (pmd_huge(*pm) || pmd_large(*pm)) {
ret_pte = (pte_t *) pm; ret_pte = (pte_t *) pm;
goto out; goto out;
} else if (is_hugepd(pm)) } else if (is_hugepd(pm))
hpdp = (hugepd_t *)pm; hpdp = (hugepd_t *)pm;
else if (!pmd_none(*pm)) else
return pte_offset_kernel(pm, ea); return pte_offset_kernel(pm, ea);
} }
} }