Commit f1981b5b authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Michael Ellerman
Browse files

powerpc/mm/hugetlb/book3s: add _PAGE_PRESENT to hugepd pointer. 



This make hugetlb directory pointer similar to other page able entries. A hugepd
entry is identified by lack of _PAGE_PTE bit set and directory size stored in
HUGEPD_SHIFT_MASK. We update that to also look at _PAGE_PRESENT

Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent da7ad366

arch/powerpc/include/asm/book3s/64/hash-4k.h

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ static inline int hash__hugepd_ok(hugepd_t hpd) 
	 * if it is not a pte and have hugepd shift mask

	 * set, then it is a hugepd directory pointer

	 */

	if (!(hpdval & _PAGE_PTE) &&

	if (!(hpdval & _PAGE_PTE) && (hpdval & _PAGE_PRESENT) &&

	    ((hpdval & HUGEPD_SHIFT_MASK) != 0))

		return true;

	return false;

arch/powerpc/include/asm/book3s/64/hugetlb.h

+3 −0
Original line number Diff line number Diff line
@@ -39,4 +39,7 @@ static inline bool gigantic_page_supported(void) 
}

#endif



/* hugepd entry valid bit */

#define HUGEPD_VAL_BITS		(0x8000000000000000UL)



#endif

arch/powerpc/mm/hugetlbpage.c

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ static int __hugepte_alloc(struct mm_struct *mm, hugepd_t *hpdp, 
			break;

		else {

#ifdef CONFIG_PPC_BOOK3S_64

			*hpdp = __hugepd(__pa(new) |

			*hpdp = __hugepd(__pa(new) | HUGEPD_VAL_BITS |

					 (shift_to_mmu_psize(pshift) << 2));

#elif defined(CONFIG_PPC_8xx)

			*hpdp = __hugepd(__pa(new) | _PMD_USER |

CRA Git | Maintained and supported by SUSTech CRA and CCSE