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

arm64/mm: Simplify protection flag creation for kernel huge mappings 



Even though they have got the same value, PMD_TYPE_SECT and PUD_TYPE_SECT
get used for kernel huge mappings. But before that first the table bit gets
cleared using leaf level PTE_TABLE_BIT. Though functionally they are same,
we should use page table level specific macros to be consistent as per the
MMU specifications. Create page table level specific wrappers for kernel
huge mapping entries and just drop mk_sect_prot() which does not have any
other user.

Signed-off-by: default avatarAnshuman Khandual <anshuman.khandual@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 7b8c87b2

arch/arm64/include/asm/pgtable.h

+7 −2
Original line number Diff line number Diff line
@@ -335,9 +335,14 @@ static inline pmd_t pte_pmd(pte_t pte) 
	return __pmd(pte_val(pte));

}



static inline pgprot_t mk_sect_prot(pgprot_t prot)

static inline pgprot_t mk_pud_sect_prot(pgprot_t prot)

{

	return __pgprot(pgprot_val(prot) & ~PTE_TABLE_BIT);

	return __pgprot((pgprot_val(prot) & ~PUD_TABLE_BIT) | PUD_TYPE_SECT);

}



static inline pgprot_t mk_pmd_sect_prot(pgprot_t prot)

{

	return __pgprot((pgprot_val(prot) & ~PMD_TABLE_BIT) | PMD_TYPE_SECT);

}



#ifdef CONFIG_NUMA_BALANCING

arch/arm64/mm/mmu.c

+2 −6
Original line number Diff line number Diff line
@@ -971,9 +971,7 @@ int __init arch_ioremap_pmd_supported(void) 


int pud_set_huge(pud_t *pudp, phys_addr_t phys, pgprot_t prot)

{

	pgprot_t sect_prot = __pgprot(PUD_TYPE_SECT |

					pgprot_val(mk_sect_prot(prot)));

	pud_t new_pud = pfn_pud(__phys_to_pfn(phys), sect_prot);

	pud_t new_pud = pfn_pud(__phys_to_pfn(phys), mk_pud_sect_prot(prot));



	/* Only allow permission changes for now */

	if (!pgattr_change_is_safe(READ_ONCE(pud_val(*pudp)),
@@ -987,9 +985,7 @@ int pud_set_huge(pud_t *pudp, phys_addr_t phys, pgprot_t prot) 


int pmd_set_huge(pmd_t *pmdp, phys_addr_t phys, pgprot_t prot)

{

	pgprot_t sect_prot = __pgprot(PMD_TYPE_SECT |

					pgprot_val(mk_sect_prot(prot)));

	pmd_t new_pmd = pfn_pmd(__phys_to_pfn(phys), sect_prot);

	pmd_t new_pmd = pfn_pmd(__phys_to_pfn(phys), mk_pmd_sect_prot(prot));



	/* Only allow permission changes for now */

	if (!pgattr_change_is_safe(READ_ONCE(pmd_val(*pmdp)),

CRA Git | Maintained and supported by SUSTech CRA and CCSE