On 08/18/2017 07:54 AM, Punit Agrawal wrote: > When walking the page tables to resolve an address that points to > !p*d_present() entry, huge_pte_offset() returns inconsistent values > depending on the level of page table (PUD or PMD). > > It returns NULL in the case of a PUD entry while in the case of a PMD > entry, it returns a pointer to the page table entry. > > A similar inconsitency exists when handling swap entries - returns NULL > for a PUD entry while a pointer to the pte_t is retured for the PMD entry. > > Update huge_pte_offset() to make the behaviour consistent - return a > pointer to the pte_t for hugepage or swap entries. Only return NULL in > instances where we have a p*d_none() entry and the size parameter > doesn't match the hugepage size at this level of the page table. > > Document the behaviour to clarify the expected behaviour of this function. > This is to set clear semantics for architecture specific implementations > of huge_pte_offset(). > > Signed-off-by: Punit Agrawal <punit.agrawal@xxxxxxx> > Cc: Catalin Marinas <catalin.marinas@xxxxxxx> > Cc: Naoya Horiguchi <n-horiguchi@xxxxxxxxxxxxx> > Cc: Steve Capper <steve.capper@xxxxxxx> > Cc: Will Deacon <will.deacon@xxxxxxx> > Cc: Kirill A. Shutemov <kirill.shutemov@xxxxxxxxxxxxxxx> > Cc: Michal Hocko <mhocko@xxxxxxxx> > Cc: Mike Kravetz <mike.kravetz@xxxxxxxxxx> > --- > > Hi Andrew, > > From discussions on the arm64 implementation of huge_pte_offset()[0] > we realised that there is benefit from returning a pte_t* in the case > of p*d_none(). > > The fault handling code in hugetlb_fault() can handle p*d_none() > entries and saves an extra round trip to huge_pte_alloc(). Other > callers of huge_pte_offset() should be ok as well. Yes, this change would eliminate that call to huge_pte_alloc() in hugetlb_fault(). However, huge_pte_offset() is now returning a pointer to a p*d_none() pte in some instances where it would have previously returned NULL. Correct? I went through the callers, and like you am fairly confident that they can handle this situation. But, returning p*d_none() instead of NULL does change the execution path in several routines such as copy_hugetlb_page_range, __unmap_hugepage_range hugetlb_change_protection, and follow_hugetlb_page. If huge_pte_alloc() returns NULL to these routines, they do a quick continue, exit, etc. If they are returned a pointer, they typically lock the page table(s) and then check for p*d_none() before continuing, exiting, etc. So, it appears that these routines could potentially slow down a bit with this change (in the specific case of p*d_none). I 'think' one could argue that the the fault case is more important. So, the savings there would outweigh any potential slowdown in the other routines. IMO, this new version of the patch has more potential for issues than the previous version. It would be helpful if others could take a look. One thing I am still 'thinking' about is how this patch could potentially change behavior in huge_pmd_share. With the patch, pmd sharing could potentially be set up in situations (pmd_none) where it previously would not have been set up. I don't think this is an issue, but any changes to this concerns me. -- Mike Kravetz > > Apologies for sending a late update but I thought if we are defining > the semantics, it's worth getting them right. > > Could you please pick this version please? > > Thanks, > Punit > > [0] http://www.spinics.net/lists/linux-mm/msg133699.html > > v2: > > mm/hugetlb.c | 24 +++++++++++++++++++++--- > 1 file changed, 21 insertions(+), 3 deletions(-) > > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index 31e207cb399b..1d54a131bdd5 100644 > --- a/mm/hugetlb.c > +++ b/mm/hugetlb.c > @@ -4600,6 +4600,15 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, > return pte; > } > > +/* > + * huge_pte_offset() - Walk the page table to resolve the hugepage > + * entry at address @addr > + * > + * Return: Pointer to page table or swap entry (PUD or PMD) for > + * address @addr, or NULL if a p*d_none() entry is encountered and the > + * size @sz doesn't match the hugepage size at this level of the page > + * table. > + */ > pte_t *huge_pte_offset(struct mm_struct *mm, > unsigned long addr, unsigned long sz) > { > @@ -4614,13 +4623,22 @@ pte_t *huge_pte_offset(struct mm_struct *mm, > p4d = p4d_offset(pgd, addr); > if (!p4d_present(*p4d)) > return NULL; > + > pud = pud_offset(p4d, addr); > - if (!pud_present(*pud)) > + if (sz != PUD_SIZE && pud_none(*pud)) > return NULL; > - if (pud_huge(*pud)) > + /* hugepage or swap? */ > + if (pud_huge(*pud) || !pud_present(*pud)) > return (pte_t *)pud; > + > pmd = pmd_offset(pud, addr); > - return (pte_t *) pmd; > + if (sz != PMD_SIZE && pmd_none(*pmd)) > + return NULL; > + /* hugepage or swap? */ > + if (pmd_huge(*pmd) || !pmd_present(*pmd)) > + return (pte_t *)pmd; > + > + return NULL; > } > > #endif /* CONFIG_ARCH_WANT_GENERAL_HUGETLB */ > -- 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>
