powerpc/mm: move setting pte specific flags to pfn_pmd
Subsystems (2)
PATCH 1/1 powerpc/mm: move setting pte specific flags to pfn_pmd
powerpc used to set the pte specific flags in set_pte_at(). This is different from other architectures. To be consistent with other architecture powerpc updated pfn_pte to set _PAGE_PTE with
commit 379c926d6334 ("powerpc/mm: move setting pte specific flags to pfn_pte")
The commit didn't do the same w.r.t pfn_pmd because we expect pmd_mkhuge to do that. But as per Linus that is a bad rule [1].
Hence update pfn_pmd to set _PAGE_PTE.
[1]
" The rule that you must use "pmd_mkhuge()" seems _completely_ wrong. It's insane. The only valid use to ever make a pmd out of a pfn is to make a huge-page."
message-id: CAHk-=whG+Z2mBFTT026PZAdjn=gSsLk9bk0wnYJ5peyuVGfwyg@mail.gmail.com
--- arch/powerpc/include/asm/book3s/64/pgtable.h | 17 ++++++++++++++++- arch/powerpc/mm/book3s64/pgtable.c | 8 +++++++- 2 files changed, 23 insertions(+), 2 deletions(-)
arch/powerpc/include/asm/book3s/64/pgtable.h +16 -1
@@ -1231,13 +1231,28 @@ static inline int pmd_same(pmd_t pmd_a, pmd_t pmd_b)return hash__pmd_same (pmd_a, pmd_b); } -static inline pmd_t pmd_mkhuge (pmd_t pmd) +static inline pmd_t __pmd_mkhuge (pmd_t pmd) {if (radix_enabled ())return radix__pmd_mkhuge (pmd);return hash__pmd_mkhuge (pmd); } +/* +* pfn_pmd return a pmd_t that can be used as pmd pte entry. +*/ +static inline pmd_t pmd_mkhuge (pmd_t pmd) +{ +#ifdef CONFIG_DEBUG_VM +if (radix_enabled ()) +WARN_ON ((pmd_raw (pmd) &cpu_to_be64 (_PAGE_PTE)) ==0 ); +else +WARN_ON ((pmd_raw (pmd) &cpu_to_be64 (_PAGE_PTE |H_PAGE_THP_HUGE )) != +cpu_to_be64 (_PAGE_PTE |H_PAGE_THP_HUGE )); +#endif +return pmd; +} +#define __HAVE_ARCH_PMDP_SET_ACCESS_FLAGS extern int pmdp_set_access_flags(struct vm_area_struct *vma, unsigned long address, pmd_t *pmdp,
arch/powerpc/mm/book3s64/pgtable.c +7 -1
@@ -136,12 +136,18 @@ static pmd_t pmd_set_protbits(pmd_t pmd, pgprot_t pgprot)return __pmd (pmd_val (pmd) |pgprot_val (pgprot)); } +/* +* At some point we should be able to get rid of +* pmd_mkhuge() and mk_huge_pmd() when we update all the +* other archs to mark the pmd huge in pfn_pmd() +*/ pmd_t pfn_pmd (unsigned long pfn,pgprot_t pgprot) {unsigned long pmdv; pmdv = (pfn <<PAGE_SHIFT ) &PTE_RPN_MASK ; -return pmd_set_protbits (__pmd (pmdv), pgprot); + +return __pmd_mkhuge (pmd_set_protbits (__pmd (pmdv), pgprot)); }pmd_t mk_pmd (struct page *page,pgprot_t pgprot)
Signature · 1 line
2.26.2
Michael Ellerman
AppliedQuoted 10 lines · Aneesh Kumar K.V
powerpc used to set the pte specific flags in
set_pte_at(). This is different from other architectures. To be consistent with other architecture powerpc updatedpfn_pteto set_PAGE_PTEwith
commit379c926d6334("powerpc/mm: move setting pte specific flags topfn_pte")The commit didn't do the same w.r.t
pfn_pmdbecause we expectpmd_mkhugeto do that. But as per Linus that is a bad rule [1].
Hence updatepfn_pmdto set_PAGE_PTE.[...]
Applied to powerpc/next.
[1/1] powerpc/mm: Move setting PTE specific flags to pfn_pmd()
https://git.kernel.org/powerpc/c/53f45ecc9cd04b4b963f3040f2a54c3baf03b229
cheers