On Fri, 2014-11-21 at 13:57 +0000, Mel Gorman wrote: > #ifdef CONFIG_NUMA_BALANCING > +/* > + * These work without NUMA balancing but the kernel does not care. See the > + * comment in include/asm-generic/pgtable.h > + */ > +static inline int pte_protnone(pte_t pte) > +{ > + return (pte_val(pte) & > + (_PAGE_PRESENT | _PAGE_USER)) == _PAGE_PRESENT; > +} I would add a comment clarifying that this only works for user pages, ie, this accessor will always return "true" for a kernel page on ppc. > +static inline int pmd_protnone(pmd_t pmd) > +{ > + return pte_protnone(pmd_pte(pmd)); > +} > + > static inline int pte_present(pte_t pte) > { > return pte_val(pte) & _PAGE_NUMA_MASK; > diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h > index 081d6f4..2e25780 100644 > --- a/arch/x86/include/asm/pgtable.h > +++ b/arch/x86/include/asm/pgtable.h > @@ -502,6 +502,22 @@ static inline int pmd_present(pmd_t pmd) > _PAGE_NUMA); > } > > +#ifdef CONFIG_NUMA_BALANCING > +/* > + * These work without NUMA balancing but the kernel does not care. See the > + * comment in include/asm-generic/pgtable.h > + */ > +static inline int pte_protnone(pte_t pte) > +{ > + return pte_flags(pte) & _PAGE_PROTNONE; > +} > + > +static inline int pmd_protnone(pmd_t pmd) > +{ > + return pmd_flags(pmd) & _PAGE_PROTNONE; > +} > +#endif /* CONFIG_NUMA_BALANCING */ > + > static inline int pmd_none(pmd_t pmd) > { > /* Only check low word on 32-bit platforms, since it might be > diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h > index 177d597..d497d08 100644 > --- a/include/asm-generic/pgtable.h > +++ b/include/asm-generic/pgtable.h > @@ -688,6 +688,26 @@ static inline int pmd_trans_unstable(pmd_t *pmd) > #endif > } > > +#ifndef CONFIG_NUMA_BALANCING > +/* > + * Technically a PTE can be PROTNONE even when not doing NUMA balancing but > + * the only case the kernel cares is for NUMA balancing and is only ever set > + * when the VMA is accessible. For PROT_NONE VMAs, the PTEs are not marked > + * _PAGE_PROTNONE so by by default, implement the helper as "always no". It > + * is the responsibility of the caller to distinguish between PROT_NONE > + * protections and NUMA hinting fault protections. > + */ > +static inline int pte_protnone(pte_t pte) > +{ > + return 0; > +} > + > +static inline int pmd_protnone(pmd_t pmd) > +{ > + return 0; > +} > +#endif /* CONFIG_NUMA_BALANCING */ > + > #ifdef CONFIG_NUMA_BALANCING > /* > * _PAGE_NUMA distinguishes between an unmapped page table entry, an entry that -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxx. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@xxxxxxxxx"> email@xxxxxxxxx </a>