Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1514951 > unrolled thread

Re: [PATCH 1/2] arm64: hugetlb: remove the wrong pmd check in find_num_contig()

Started byCatalin Marinas <catalin.marinas@arm.com>
First post2016-11-04 01:20 +0100
Last post2016-11-04 16:50 +0100
Articles 2 — 1 participant

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.


Contents

  Re: [PATCH 1/2] arm64: hugetlb: remove the wrong pmd check in  find_num_contig() Catalin Marinas <catalin.marinas@arm.com> - 2016-11-04 01:20 +0100
    Re: [PATCH 1/2] arm64: hugetlb: remove the wrong pmd check in  find_num_contig() Catalin Marinas <catalin.marinas@arm.com> - 2016-11-04 16:50 +0100

#1514951 — Re: [PATCH 1/2] arm64: hugetlb: remove the wrong pmd check in find_num_contig()

FromCatalin Marinas <catalin.marinas@arm.com>
Date2016-11-04 01:20 +0100
SubjectRe: [PATCH 1/2] arm64: hugetlb: remove the wrong pmd check in find_num_contig()
Message-ID<szAoG-2F9-9@gated-at.bofh.it>
On Thu, Nov 03, 2016 at 10:27:38AM +0800, Huang Shijie wrote:
> diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c
> index 2e49bd2..4811ef1 100644
> --- a/arch/arm64/mm/hugetlbpage.c
> +++ b/arch/arm64/mm/hugetlbpage.c
> @@ -61,10 +61,6 @@ static int find_num_contig(struct mm_struct *mm, unsigned long addr,
>  		return 1;
>  	}
>  	pmd = pmd_offset(pud, addr);
> -	if (!pmd_present(*pmd)) {
> -		VM_BUG_ON(!pmd_present(*pmd));
> -		return 1;
> -	}
>  	if ((pte_t *)pmd == ptep) {
>  		*pgsize = PMD_SIZE;
>  		return CONT_PMDS;

BTW, for the !pud_present() and !pgd_present() cases, shouldn't
find_num_contig() actually return 0? These are more likely real bugs, so
no point in setting the huge pte.

-- 
Catalin

[toc] | [next] | [standalone]


#1515261

FromCatalin Marinas <catalin.marinas@arm.com>
Date2016-11-04 16:50 +0100
Message-ID<szOUF-3Dx-1@gated-at.bofh.it>
In reply to#1514951
On Fri, Nov 04, 2016 at 10:52:17AM +0800, Huang Shijie wrote:
> On Thu, Nov 03, 2016 at 06:16:16PM -0600, Catalin Marinas wrote:
> > On Thu, Nov 03, 2016 at 10:27:38AM +0800, Huang Shijie wrote:
> > > diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c
> > > index 2e49bd2..4811ef1 100644
> > > --- a/arch/arm64/mm/hugetlbpage.c
> > > +++ b/arch/arm64/mm/hugetlbpage.c
> > > @@ -61,10 +61,6 @@ static int find_num_contig(struct mm_struct *mm, unsigned long addr,
> > >  		return 1;
> > >  	}
> > >  	pmd = pmd_offset(pud, addr);
> > > -	if (!pmd_present(*pmd)) {
> > > -		VM_BUG_ON(!pmd_present(*pmd));
> > > -		return 1;
> > > -	}
> > >  	if ((pte_t *)pmd == ptep) {
> > >  		*pgsize = PMD_SIZE;
> > >  		return CONT_PMDS;
> > 
> > BTW, for the !pud_present() and !pgd_present() cases, shouldn't
> > find_num_contig() actually return 0? These are more likely real bugs, so
> > no point in setting the huge pte.
> 
> The kernel will not call the find_num_contig() if the PGD/PUD are empty.
> Please see the code in the hugetlb_fault().
> 
>    ------------------------------------------------------
> 	ptep = huge_pte_offset(mm, address);
> 	if (ptep) {
> 	    ...............................
> 	} else {
> 		ptep = huge_pte_alloc(mm, address, huge_page_size(h));
> 		if (!ptep)
> 			return VM_FAULT_OOM;
> 	}
>    ------------------------------------------------------

Exactly. So what is the reason for returning 1 if !pgd_present()? Would
removing the checks entirely or adding BUG() be a better option?

-- 
Catalin

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web