Commit 1601df9e authored by Anshuman Khandual's avatar Anshuman Khandual Committed by Catalin Marinas
Browse files

arm64/mm: Clear PXX_TYPE_MASK and set PXD_TYPE_SECT in [pmd|pud]_mkhuge() 



Clear PXX_TYPE_MASK in [pmd|pud]_mkhuge() while creating section mappings
instead of just the PXX_TABLE_BIT and also set PXD_TYPE_SECT. Also ensure
PTE_VALID does not get modified in these helpers, because present-invalid
entries should preserve their state across.

Cc: Will Deacon <will@kernel.org>
Cc: Ard Biesheuvel <ardb@kernel.org>
Cc: Ryan Roberts <ryan.roberts@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarAnshuman Khandual <anshuman.khandual@arm.com>
Link: https://lore.kernel.org/r/20250221044227.1145393-5-anshuman.khandual@arm.com


Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent dba95480

arch/arm64/include/asm/pgtable.h

+24 −2
Original line number Diff line number Diff line
@@ -585,7 +585,18 @@ static inline int pmd_trans_huge(pmd_t pmd) 


#define pmd_write(pmd)		pte_write(pmd_pte(pmd))



#define pmd_mkhuge(pmd)		(__pmd(pmd_val(pmd) & ~PMD_TABLE_BIT))

static inline pmd_t pmd_mkhuge(pmd_t pmd)

{

	/*

	 * It's possible that the pmd is present-invalid on entry

	 * and in that case it needs to remain present-invalid on

	 * exit. So ensure the VALID bit does not get modified.

	 */

	pmdval_t mask = PMD_TYPE_MASK & ~PTE_VALID;

	pmdval_t val = PMD_TYPE_SECT & ~PTE_VALID;



	return __pmd((pmd_val(pmd) & ~mask) | val);

}



#ifdef CONFIG_TRANSPARENT_HUGEPAGE

#define pmd_devmap(pmd)		pte_devmap(pmd_pte(pmd))
@@ -613,7 +624,18 @@ static inline pmd_t pmd_mkspecial(pmd_t pmd) 
#define pud_mkyoung(pud)	pte_pud(pte_mkyoung(pud_pte(pud)))

#define pud_write(pud)		pte_write(pud_pte(pud))



#define pud_mkhuge(pud)		(__pud(pud_val(pud) & ~PUD_TABLE_BIT))

static inline pud_t pud_mkhuge(pud_t pud)

{

	/*

	 * It's possible that the pud is present-invalid on entry

	 * and in that case it needs to remain present-invalid on

	 * exit. So ensure the VALID bit does not get modified.

	 */

	pudval_t mask = PUD_TYPE_MASK & ~PTE_VALID;

	pudval_t val = PUD_TYPE_SECT & ~PTE_VALID;



	return __pud((pud_val(pud) & ~mask) | val);

}



#define __pud_to_phys(pud)	__pte_to_phys(pud_pte(pud))

#define __phys_to_pud_val(phys)	__phys_to_pte_val(phys)