I tested this patch on qemu-aarch64. Cheers, Anders > --- >=C2=A0 arch/arm64/mm/hugetlbpage.c | 4 ++-- >=C2=A0 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c > index 9ca840527296..bed6dc7c4276 100644 > --- a/arch/arm64/mm/hugetlbpage.c > +++ b/arch/arm64/mm/hugetlbpage.c > @@ -455,9 +455,9 @@ static int __init hugetlbpage_init(void) >=C2=A0 #ifdef CONFIG_ARM64_4K_PAGES >=C2=A0 =C2=A0 =C2=A0 =C2=A0 hugetlb_add_hstate(PUD_SHIFT - PAGE_SHIFT); >=C2=A0 #endif > -=C2=A0 =C2=A0 =C2=A0 hugetlb_add_hstate(CONT_PMD_SHIFT - PAGE_SHIFT); > +=C2=A0 =C2=A0 =C2=A0 hugetlb_add_hstate((CONT_PMD_SHIFT + PMD_SHIFT) - P= AGE_SHIFT); >=C2=A0 =C2=A0 =C2=A0 =C2=A0 hugetlb_add_hstate(PMD_SHIFT - PAGE_SHIFT); > -=C2=A0 =C2=A0 =C2=A0 hugetlb_add_hstate(CONT_PTE_SHIFT - PAGE_SHIFT); > +=C2=A0 =C2=A0 =C2=A0 hugetlb_add_hstate((CONT_PTE_SHIFT + PAGE_SHIFT) - = PAGE_SHIFT); > >=C2=A0 =C2=A0 =C2=A0 =C2=A0 return 0; >=C2=A0 } > -- > 2.25.2 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel --=20 derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp derp=20 derp derp derp derp derp derp derp ---=20 You received this message because you are subscribed to the Google Groups "= derpyderpderp" group. To unsubscribe from this group and stop receiving emails from it, send an e= mail to derpyderpderp+unsubscribe@googlegroups.com. =20 ------=_Part_3893_617641698.1587592475034 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable

=20

On Wednesday, April 22, 2020, 05:52:05 PM EDT, Anders R= oxell <anders.roxell@linaro.org> wrote:

On Mon, 20 Apr 2020 at 23:43, Mike Kr= avetz <mike.kravetz@oracle.com> wrote:

> On 4/20/20 1:29 PM, Anders R= oxell wrote:

> > On Mon, 20 Apr 2020 at 20:= 23, Mike Kravetz <mike.kravetz@oracle.com> wrote:
<= /div>

> >> On 4/20/20 8:34 AM, Qian Cai wrote:
=

> >>>

> >= ;>> Reverted this series fixed many undefined behaviors on arm64 with= the config,

> >> While rearranging the = code (patch 3 in series), I made the incorrect

&g= t; >> assumption that CONT_XXX_SIZE =3D=3D (1UL << CONT_XXX_SHI= FT). However,

> >> this is not the= case. Does the following patch fix these issues?

> >>

> >> From b75cb4a= 0852e208bee8c4eb347dc076fcaa88859 Mon Sep 17 00:00:00 2001

> >> From: Mike Kravetz <mike.kravetz@orac= le.com>

> >> Date: Mon, 20 Apr 20= 20 10:41:18 -0700

> >> Subject: [PATCH] = arm64/hugetlb: fix hugetlb initialization

> &g= t;>

> >> When calling hugetlb_add_hst= ate() to initialize a new hugetlb size,

> >= > be sure to use correct huge pages size order.

> >>

> >> Signed-off-by: Mike= Kravetz <mike.kravetz@oracle.com>

> >> ---

> >> ar= ch/arm64/mm/hugetlbpage.c | 8 ++++----

> >&= gt; 1 file changed, 4 insertions(+), 4 deletions(-)

> >>

> >> diff --git a= /arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c

> >> index 9ca840527296..a02411a1f19a 100644

> >> --- a/arch/arm64/mm/hugetlbpage.c

> >> +++ b/arch/arm64/mm/hugetlbpage.c

> >> @@ -453,11 +453,11 @@ void huge_ptep_clear_flush= (struct vm_area_struct *vma,

> >> = static int __init hugetlbpage_init(void)

> >= ;> {

> >> #ifdef CONFIG_A= RM64_4K_PAGES

> >> - = hugetlb_add_hstate(PUD_SHIFT - PAGE_SHIFT);

>= ; >> + hugetlb_add_hstate(ilog2(PUD_SIZE) - PAGE= _SHIFT);

> >> #endif

> >> - hugetlb_add_hstate(CONT_P= MD_SHIFT - PAGE_SHIFT);

> >> - &nb= sp; hugetlb_add_hstate(PMD_SHIFT - PAGE_SHIFT);

> >> - hugetlb_add_hstate(CONT_PTE_S= HIFT - PAGE_SHIFT);

> >> + = hugetlb_add_hstate(ilog2(CONT_PMD_SIZE) - PAGE_SHIFT);

> >> + hugetlb_add_hstate(ilog2= (PMD_SIZE) - PAGE_SHIFT);

> >> + &= nbsp; hugetlb_add_hstate(ilog2(CONT_PTE_SIZE) - PAGE_SHIFT);

> >>

> >>&n= bsp; return 0;

> >>= ; }

> >

>= ; > I build this for an arm64 kernel and ran it in qemu and it worked.

> Thanks for tes= ting Anders!

> = Will, here is an updated version of the patch based on your suggestion.
=

> I added the () for emphasis but that may just b= e noise for some. Also,

> the naming dif= ferences and values for CONT_PTE may make some people

> look twice. Not sure if being consistent here helps?

> I have only built t= his. No testing.

> From daf833ab6b806ecc0816d84d45dcbacc052a7eec Mon Sep 17 00:00:00= 2001

> From: Mike Kravetz <mike= .kravetz@oracle.com>

> Date: Mon, 20 Ap= r 2020 13:56:15 -0700

> Subject: [PATCH] arm64= /hugetlb: fix hugetlb initialization

> When calling hugetlb_add_hstate() to initialize a n= ew hugetlb size,

> be sure to use correct huge= pages size order.

> Signed-off-by: Mike Kravetz <mike.kravetz@oracle.com>

Tested-by: Ander= s Roxell <anders.roxell@linaro.org>

I tested this patch on qemu-aarch64.

Cheers,

Anders

>= ---

> arch/arm64/mm/hugetlbpage.c | 4 += +--

> 1 file changed, 2 insertions(+), 2= deletions(-)

>= diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c
=

> index 9ca840527296..bed6dc7c4276 100644

> --- a/arch/arm64/mm/hugetlbpage.c

> +++ b/arch/arm64/mm/hugetlbpage.c

&= gt; @@ -455,9 +455,9 @@ static int __init hugetlbpage_init(void)

<= div dir=3D"ltr">> #ifdef CONFIG_ARM64_4K_PAGES

> hugetlb_add_hstate(PUD_SHIFT - PA= GE_SHIFT);

> #endif

> - hugetlb_add_hstate(CONT_PMD_SHIFT - PAGE_= SHIFT);

> + hugetlb_add_h= state((CONT_PMD_SHIFT + PMD_SHIFT) - PAGE_SHIFT);

> hugetlb_add_hstate(PMD_SHIFT - PAGE_SHIFT= );

> - hugetlb_add_hstate= (CONT_PTE_SHIFT - PAGE_SHIFT);

> + = ; hugetlb_add_hstate((CONT_PTE_SHIFT + PAGE_SHIFT) - PAGE_SHIFT);

> &= nbsp; return 0;

> }

> --

> 2.25.2

______= _________________________________________

linux-a= rm-kernel mailing list

linux-arm-kernel@lists.infradead.org

http://lists.infradead.org/mailman/listinfo/linux-arm-ke= rnel

derp

derp
<= /div>

derp

derp=

derp

de= rp

derp

<= div dir=3D"ltr">derp

derp

derp=

derp

de= rp

derp

<= div dir=3D"ltr">derp

derp

derp=

derp

de= rp

derp

<= div dir=3D"ltr">derp

derp

derp=

derp

de= rp

derp

<= div dir=3D"ltr">derp

derp

derp=

derp

de= rp

derp

<= div dir=3D"ltr">derp

derp

derp=

derp

de= rp

derp

<= div dir=3D"ltr">derp

derp

derp=

derp

derp=

derp

---

You received this message because you are subscribed to the Google Groups = "derpyderpderp" group.

To unsubscribe from this g= roup and stop receiving emails from it, send an email to derpyderpderp+unsubscribe@googlegroups.com.

------=_Part_3893_617641698.1587592475034--