Re: [PATCH 01/13] arm64: mm: Add p?d_large() definitions

Mark Rutland
2019-02-18T14:42:32Z

On Mon, Feb 18, 2019 at 02:11:40PM +0000, Steven Price wrote:
> On 18/02/2019 11:29, Peter Zijlstra wrote:
> > On Fri, Feb 15, 2019 at 05:02:22PM +0000, Steven Price wrote:
> >
> >> diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h
> >> index de70c1eabf33..09d308921625 100644
> >> --- a/arch/arm64/include/asm/pgtable.h
> >> +++ b/arch/arm64/include/asm/pgtable.h
> >> @@ -428,6 +428,7 @@ extern pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,
> >> PMD_TYPE_TABLE)
> >> #define pmd_sect(pmd) ((pmd_val(pmd) & PMD_TYPE_MASK) == \
> >> PMD_TYPE_SECT)
> >> +#define pmd_large(x) pmd_sect(x)
> >>
> >> #if defined(CONFIG_ARM64_64K_PAGES) || CONFIG_PGTABLE_LEVELS < 3
> >> #define pud_sect(pud) (0)
> >> @@ -435,6 +436,7 @@ extern pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,
> >> #else
> >> #define pud_sect(pud) ((pud_val(pud) & PUD_TYPE_MASK) == \
> >> PUD_TYPE_SECT)
> >> +#define pud_large(x) pud_sect(x)
> >> #define pud_table(pud) ((pud_val(pud) & PUD_TYPE_MASK) == \
> >> PUD_TYPE_TABLE)
> >> #endif
> >
> > So on x86 p*d_large() also matches p*d_huge() and thp, But it is not
> > clear to me this p*d_sect() thing does so, given your definitions.
> >
> > See here why I care:
> >
> > http://lkml.kernel.org/r/20190201124741.GE31552@hirez.programming.kicks-ass.net
> >
>
> pmd_huge()/pud_huge() unfortunately are currently defined as '0' if
> !CONFIG_HUGETLB_PAGE and for this reason I was avoiding using them.

I think that Peter means p?d_huge(x) should imply p?d_large(x), e.g.

#define pmd_large(x) \
(pmd_sect(x) || pmd_huge(x) || pmd_trans_huge(x))

... which should work regardless of CONFIG_HUGETLB_PAGE.

> While most code would reasonably not care about huge pages in that build
> configuration, the likes of the debugfs page table dump code needs to be
> able to recognise them in all build configurations. I believe the
> situation is the same on arm64 and x86.

There's a very important distinction here between:

* section mappings, which are an archtiectural construct used in
arm64-specific code (e.g. the kernel's own page tables).

* huge mappings, which are Linux logical construct for mapping
userspace memory. These are buillt using section mappings.

The existing arm64 debugfs pagetable dump code cares about section
mappings specifically in all cases, since it is not used to dump
userspace page tables.

The existing generic code doesn't care about section mappings
specifically, because they are not generic.

Thanks,
Mark.